diff options
2198 files changed, 54899 insertions, 32823 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 59348b7b27aa6..7b0659a9d0270 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -11,9 +11,6 @@ # This also holds true for GitHub teams. Since almost none of our teams have write # permissions, you need to list all members of the team with commit access individually. -# This file -/.github/CODEOWNERS @edolstra - # GitHub actions /.github/workflows @NixOS/Security @Mic92 @zowoq /.github/workflows/merge-staging @FRidh @@ -22,15 +19,14 @@ /.editorconfig @Mic92 @zowoq # Libraries -/lib @edolstra @infinisil +/lib @infinisil /lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs -/lib/generators.nix @infinisil @edolstra @Profpatsch -/lib/cli.nix @infinisil @edolstra @Profpatsch -/lib/debug.nix @infinisil @edolstra @Profpatsch -/lib/asserts.nix @infinisil @edolstra @Profpatsch +/lib/generators.nix @infinisil @Profpatsch +/lib/cli.nix @infinisil @Profpatsch +/lib/debug.nix @infinisil @Profpatsch +/lib/asserts.nix @infinisil @Profpatsch /lib/path.* @infinisil @fricklerhandwerk /lib/fileset @infinisil -/doc/functions/fileset.section.md @infinisil # Nixpkgs Internals /default.nix @Ericson2314 @@ -121,13 +117,13 @@ /pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell -/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn -/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn -/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn -/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn -/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn +/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @ncfavier +/maintainers/scripts/haskell @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/development/haskell-modules @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/test/haskell @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/top-level/release-haskell.nix @cdepillabout @sternenseemann @maralorn @ncfavier +/pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @ncfavier # Perl /pkgs/development/interpreters/perl @stigtsp @zakame @dasJ diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 258c85f9dde8c..ab576c98b6e05 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -39,3 +39,10 @@ Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. [user@system:~]$ nix-shell -p nix-info --run "nix-info -m" output here ``` + +### Priorities + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md index dd6d681775ac3..ce56a198d452c 100644 --- a/.github/ISSUE_TEMPLATE/build_failure.md +++ b/.github/ISSUE_TEMPLATE/build_failure.md @@ -37,3 +37,10 @@ Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. [user@system:~]$ nix-shell -p nix-info --run "nix-info -m" output here ``` + +### Priorities + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index 3018b6b994489..fea51087a2af5 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -30,3 +30,9 @@ assignees: '' [open documentation issues]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22 [open documentation pull requests]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22 +### Priorities + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index 2735534b0bc9b..7c446a8e9b337 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -26,3 +26,10 @@ There's a high chance that you'll have the new version right away while helping ----- Note for maintainers: Please tag this issue in your PR. + +**Priorities** + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/packaging_request.md b/.github/ISSUE_TEMPLATE/packaging_request.md index a76741fa8e6a0..f85b391b9de3c 100644 --- a/.github/ISSUE_TEMPLATE/packaging_request.md +++ b/.github/ISSUE_TEMPLATE/packaging_request.md @@ -17,3 +17,10 @@ assignees: '' * source URL: * license: mit, bsd, gpl2+ , ... * platforms: unix, linux, darwin, ... + +**Priorities** + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md index 8046e809a214b..4b1c322c1153d 100644 --- a/.github/ISSUE_TEMPLATE/unreproducible_package.md +++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md @@ -85,3 +85,10 @@ nix log $(nix path-info --derivation nixpkgs#<package>) (please share the relevant fragment of the diffoscope output here, and any additional analysis you may have done) + +### Priorities + +Add a :+1: [reaction] to [issues you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a7d8a17865622..42c2f78d52abe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -40,3 +40,10 @@ Thanks a lot if you do! List of open PRs: https://github.com/NixOS/nixpkgs/pulls Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions --> + +### Priorities + +Add a :+1: [reaction] to [pull requests you find important]. + +[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ +[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/labeler.yml b/.github/labeler.yml index c05c496cb1022..582260312274b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -37,6 +37,11 @@ "6.topic: fetch": - pkgs/build-support/fetch*/**/* +"6.topic: flakes": + - '**/flake.nix' + - lib/systems/flake-systems.nix + - nixos/modules/config/nix-flakes.nix + "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - nixos/modules/services/desktops/gnome/**/* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f204758e7be8e..0270094961a8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -322,6 +322,8 @@ All the review template samples provided in this section are generic and meant a To get more information about how to review specific parts of Nixpkgs, refer to the documents linked to in the [overview section][overview]. +If a pull request contains documentation changes that might require feedback from the documentation team, ping @NixOS/documentation-team on the pull request. + If you consider having enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic. They will give you information about the reviewing process. The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests to see who reviewed or git-blaming the code to see who committed to that topic can give some hints. Container system, boot system and library changes are some examples of the pull requests fitting this category. @@ -512,34 +514,19 @@ To get a sense for what changes are considered mass rebuilds, see [previously me - If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case. Use `git rebase -i`. -- Format the commit messages in the following way: - - ``` - (pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc) - - (Motivation for change. Link to release notes. Additional information.) - ``` - - For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). +- For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message). - Examples: - - * nginx: init at 2.0.1 - * firefox: 54.0.1 -> 55.0 - - https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ - * nixos/hydra: add bazBaz option - - Dual baz behavior is needed to do foo. - * nixos/nginx: refactor config generation - - The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). - - When adding yourself as maintainer, in the same pull request, make a separate +- When adding yourself as maintainer in the same pull request, make a separate commit with the message `maintainers: add <handle>`. Add the commit before those making changes to the package or module. See [Nixpkgs Maintainers](./maintainers/README.md) for details. +- Make sure you read about any commit conventions specific to the area you're touching. See: + - [Commit conventions](./pkgs/README.md#commit-conventions) for changes to `pkgs`. + - [Commit conventions](./lib/README.md#commit-conventions) for changes to `lib`. + - [Commit conventions](./nixos/README.md#commit-conventions) for changes to `nixos`. + - [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual. + ### Writing good commit messages In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. diff --git a/doc/README.md b/doc/README.md index 3f9aff1a38a6d..9dee2d30d7305 100644 --- a/doc/README.md +++ b/doc/README.md @@ -114,3 +114,24 @@ pear watermelon : green fruit with red flesh ``` + +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- If creating a commit purely for documentation changes, format the commit message in the following way: + + ``` + doc: (documentation summary) + + (Motivation for change, relevant links, additional information.) + ``` + + Examples: + + * doc: update the kernel config documentation to use `nix-shell` + * doc: add information about `nix-update-script` + + Closes #216321. + +- If the commit contains more than just documentation changes, follow the commit message format relevant for the rest of the changes. diff --git a/doc/functions.md b/doc/functions.md index 551ba522a9041..09033c9e3c199 100644 --- a/doc/functions.md +++ b/doc/functions.md @@ -8,5 +8,4 @@ functions/generators.section.md functions/debug.section.md functions/prefer-remote-fetch.section.md functions/nix-gitignore.section.md -functions/fileset.section.md ``` diff --git a/doc/functions/fileset.section.md b/doc/functions/fileset.section.md deleted file mode 100644 index c42337feaba4f..0000000000000 --- a/doc/functions/fileset.section.md +++ /dev/null @@ -1,48 +0,0 @@ -<!-- TODO: Render this document in front of function documentation in case https://github.com/nix-community/nixdoc/issues/19 is ever supported --> - -# File sets {#sec-fileset} - -The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. -A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. -File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. - -See the [function reference](#sec-functions-library-fileset) for function-specific documentation. - -## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} - -All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. -Such path arguments are implicitly coerced to file sets containing all files under that path: -- A path to a file turns into a file set containing that single file. -- A path to a directory turns into a file set containing all files _recursively_ in that directory. - -If the path points to a non-existent location, an error is thrown. - -::: {.note} -Just like in Git, file sets cannot represent empty directories. -Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. -::: - -:::{.note} -File set coercion does _not_ add any of the files under the coerced paths to the store. -Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. -This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. -::: - -### Example {#sec-fileset-path-coercion-example} - -Assume we are in a local directory with a file hierarchy like this: -``` -├─ a/ -│ ├─ x (file) -│ └─ b/ -│ └─ y (file) -└─ c/ - └─ d/ -``` - -Here's a listing of which files get included when different path expressions get coerced to file sets: -- `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). -- `./a` as a file set contains both `a/x` and `a/b/y`. -- `./a/x` as a file set contains only `a/x`. -- `./a/b` as a file set contains only `a/b/y`. -- `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 363d627e52582..1534ef85ccb9b 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -25,7 +25,6 @@ perl.section.md pkg-config.section.md postgresql-test-hook.section.md python.section.md -qt-4.section.md scons.section.md tetex-tex-live.section.md unzip.section.md diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index fd7779e6468f6..3a7fb50320827 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -1,25 +1,83 @@ # Meson {#meson} -Overrides the configure phase to run meson to generate Ninja files. To run these files, you should accompany Meson with ninja. By default, `enableParallelBuilding` is enabled as Meson supports parallel building almost everywhere. +[Meson](https://mesonbuild.com/) is an open source meta build system meant to be +fast and user-friendly. -## Variables controlling Meson {#variables-controlling-meson} +In Nixpkgs, meson comes with a setup hook that overrides the configure, check, +and install phases. -### `mesonFlags` {#mesonflags} +Being a meta build system, meson needs an accompanying backend. In the context +of Nixpkgs, the typical companion backend is [Ninja](#ninja), that provides a +setup hook registering ninja-based build and install phases. -Controls the flags passed to meson. +## Variables controlling Meson {#meson-variables-controlling} -### `mesonBuildType` {#mesonbuildtype} +### Meson Exclusive Variables {#meson-exclusive-variables} -Which [`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to pass to Meson. We default to `plain`. +#### `mesonFlags` {#meson-flags} -### `mesonAutoFeatures` {#mesonautofeatures} +Controls the flags passed to `meson setup` during configure phase. -What value to set [`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `enabled`. +#### `mesonWrapMode` {#meson-wrap-mode} -### `mesonWrapMode` {#mesonwrapmode} +Which value is passed as +[`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) +to. In Nixpkgs the default value is `nodownload`, so that no subproject will be +downloaded (since network access is already disabled during deployment in +Nixpkgs). -What value to set [`-Dwrap_mode=`](https://mesonbuild.com/Builtin-options.html#core-options) to. We default to `nodownload` as we disallow network access. +Note: Meson allows pre-population of subprojects that would otherwise be +downloaded. -### `dontUseMesonConfigure` {#dontusemesonconfigure} +#### `mesonBuildType` {#meson-build-type} -Disables using Meson’s `configurePhase`. +Which value is passed as +[`--buildtype`](https://mesonbuild.com/Builtin-options.html#core-options) to +`meson setup` during configure phase. In Nixpkgs the default value is `plain`. + +#### `mesonAutoFeatures` {#meson-auto-features} + +Which value is passed as +[`-Dauto_features=`](https://mesonbuild.com/Builtin-options.html#core-options) +to `meson setup` during configure phase. In Nixpkgs the default value is +`enabled`, meaning that every feature declared as "auto" by the meson scripts +will be enabled. + +#### `mesonCheckFlags` {#meson-check-flags} + +Controls the flags passed to `meson test` during check phase. + +#### `mesonInstallFlags` {#meson-install-flags} + +Controls the flags passed to `meson install` during install phase. + +#### `mesonInstallTags` {#meson-install-tags} + +A list of installation tags passed to Meson's commandline option +[`--tags`](https://mesonbuild.com/Installing.html#installation-tags) during +install phase. + +Note: `mesonInstallTags` should be a list of strings, that will be converted to +a comma-separated string that is recognized to `--tags`. +Example: `mesonInstallTags = [ "emulator" "assembler" ];` will be converted to +`--tags emulator,assembler`. + +#### `dontUseMesonConfigure` {#dont-use-meson-configure} + +When set to true, don't use the predefined `mesonConfigurePhase`. + +#### `dontUseMesonCheck` {#dont-use-meson-check} + +When set to true, don't use the predefined `mesonCheckPhase`. + +#### `dontUseMesonInstall` {#dont-use-meson-install} + +When set to true, don't use the predefined `mesonInstallPhase`. + +### Honored variables {#meson-honored-variables} + +The following variables commonly used by `stdenv.mkDerivation` are honored by +Meson setup hook. + +- `prefixKey` +- `enableParallelBuilding` diff --git a/doc/hooks/ninja.section.md b/doc/hooks/ninja.section.md index 4b0e33feb5c39..bbc9481088041 100644 --- a/doc/hooks/ninja.section.md +++ b/doc/hooks/ninja.section.md @@ -1,3 +1,5 @@ # ninja {#ninja} Overrides the build, install, and check phase to run ninja instead of make. You can disable this behavior with the `dontUseNinjaBuild`, `dontUseNinjaInstall`, and `dontUseNinjaCheck`, respectively. Parallel building is enabled by default in Ninja. + +Note that if the [Meson setup hook](#meson) is also active, Ninja's install and check phases will be disabled in favor of Meson's. diff --git a/doc/hooks/qt-4.section.md b/doc/hooks/qt-4.section.md deleted file mode 100644 index 4b704df495973..0000000000000 --- a/doc/hooks/qt-4.section.md +++ /dev/null @@ -1,3 +0,0 @@ -# Qt 4 {#qt-4} - -Sets the `QTDIR` environment variable to Qt’s path. diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md index 7322a61687dde..83567ab17ace1 100644 --- a/doc/languages-frameworks/dhall.section.md +++ b/doc/languages-frameworks/dhall.section.md @@ -323,7 +323,7 @@ $ nix-shell -p haskellPackages.dhall-nixpkgs nix-prefetch-git ``` :::{.note} -`nix-prefetch-git` has to be in `$PATH` for `dhall-to-nixpkgs` to work. +`nix-prefetch-git` is added to the `nix-shell -p` invocation above, because it has to be in `$PATH` for `dhall-to-nixpkgs` to work. ::: The utility takes care of automatically detecting remote imports and converting diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 9ba0fef2a27bb..978ec07cb961e 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -138,7 +138,9 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`. + # File generated with `nix-build -A package.passthru.fetch-deps`. + # To run fetch-deps when this file does not yet exist, set nugetDeps to null + nugetDeps = ./deps.nix; projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 59856b92c9edf..884ebcebf7f2a 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -20,7 +20,7 @@ In the following is an example expression using `buildGoModule`, the following a To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)). - `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. -- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash` (or `vendorSha256`). Note that if you change this attribute, you need to update `vendorHash` (or `vendorSha256`) attribute. +- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`. Note that if you change this attribute, you need to update `vendorHash` attribute. ```nix pet = buildGoModule rec { diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 0bb9959a5105b..152974b465a54 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -210,6 +210,7 @@ In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json * `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`. * `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`. * `nodejs`: The `nodejs` package to build against, using the corresponding `npm` shipped with that version of `node`. Defaults to `pkgs.nodejs`. +* `npmDeps`: The dependencies used to build the npm package. Especially useful to not have to recompute workspace depedencies. #### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps} diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 2ba846dc492d9..8b1ed92a450c1 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -98,24 +98,30 @@ Release 23.11 ships with a new interface that will eventually replace `texlive.c ## Custom packages {#sec-language-texlive-custom-packages} -You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`. +You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its `"tex"` output, according to the [TeX Directory Structure](https://tug.ctan.org/tds/tds.html). Dependencies on other TeX packages can be listed in the attribute `tlDeps`. -Such derivation must then be listed in the attribute `pkgs` of an attribute set passed to `texlive.combine`, for instance by passing `extraPkgs = { pkgs = [ custom_package ]; };`. Within Nixpkgs, `pkgs` should be part of the derivation itself, allowing users to call `texlive.combine { inherit (texlive) scheme-small; inherit some_tex_package; }`. +The functions `texlive.combine` and `texlive.withPackages` recognise the following outputs: -Here is a (very verbose) example where the attribute `pkgs` is attached to the derivation itself, which requires creating a fixed point. See also the packages `auctex`, `eukleides`, `mftrace` for more examples. +- `"out"`: contents are linked in the TeX Live environment, and binaries in the `$out/bin` folder are wrapped; +- `"tex"`: linked in `$TEXMFDIST`; files should follow the TDS (for instance `$tex/tex/latex/foiltex/foiltex.cls`); +- `"texdoc"`, `"texsource"`: ignored by default, treated as `"tex"`; +- `"tlpkg"`: linked in `$TEXMFROOT/tlpkg`; +- `"man"`, `"info"`, ...: the other outputs are combined into separate outputs. + +When using `pkgFilter`, `texlive.combine` will assign `tlType` respectively `"bin"`, `"run"`, `"doc"`, `"source"`, `"tlpkg"` to the above outputs. + +Here is a (very verbose) example. See also the packages `auctex`, `eukleides`, `mftrace` for more examples. ```nix with import <nixpkgs> {}; let - foiltex = stdenvNoCC.mkDerivation (finalAttrs: { + foiltex = stdenvNoCC.mkDerivation { pname = "latex-foiltex"; version = "2.1.4b"; - passthru = { - pkgs = [ finalAttrs.finalPackage ]; - tlDeps = with texlive; [ latex ]; - tlType = "run"; - }; + + outputs = [ "tex" "texdoc" ]; + passthru.tlDeps = with texlive; [ latex ]; srcs = [ (fetchurl { @@ -138,7 +144,13 @@ let runHook postUnpack ''; - nativeBuildInputs = [ texlive.combined.scheme-small ]; + nativeBuildInputs = [ + (texliveSmall.withPackages (ps: with ps; [ cm-super hypdoc latexmk ])) + # multiple-outputs.sh fails if $out is not defined + (writeShellScript "force-tex-output.sh" '' + out="''${tex-}" + '') + ]; dontConfigure = true; @@ -148,15 +160,23 @@ let # Generate the style files latex foiltex.ins + # Generate the documentation + export HOME=. + latexmk -pdf foiltex.dtx + runHook postBuild ''; installPhase = '' runHook preInstall - path="$out/tex/latex/foiltex" + path="$tex/tex/latex/foiltex" + mkdir -p "$path" + cp *.{cls,def,clo,sty} "$path/" + + path="$texdoc/doc/tex/latex/foiltex" mkdir -p "$path" - cp *.{cls,def,clo} "$path/" + cp *.pdf "$path/" runHook postInstall ''; @@ -167,12 +187,9 @@ let maintainers = with maintainers; [ veprbl ]; platforms = platforms.all; }; - }); - - latex_with_foiltex = texlive.combine { - inherit (texlive) scheme-small; - inherit foiltex; }; + + latex_with_foiltex = texliveSmall.withPackages (_: [ foiltex ]); in runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 26c43bd9e943c..03bb8a9ff790e 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -119,13 +119,18 @@ phases="${prePhases[*]:-} unpackPhase patchPhase" genericBuild ``` Then, run more phases up until the failure is reached. -For example, if the failure is in the build phase, the following phases would be required: +If the failure is in the build or check phase, the following phases would be required: ```bash -phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase" genericBuild +phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase" genericBuild ``` -Re-run a single phase as many times as necessary to examine the failure like so: +Use this command to run all install phases: +```bash +phases="${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase" genericBuild +``` + +Single phase can be re-run as many times as necessary to examine the failure like so: ```bash phases="buildPhase" genericBuild diff --git a/lib/README.md b/lib/README.md index 627086843db7c..220940bc21224 100644 --- a/lib/README.md +++ b/lib/README.md @@ -74,3 +74,23 @@ path/tests/prop.sh # Run the lib.fileset tests fileset/tests.sh ``` + +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + lib.(section): (init | add additional argument | refactor | etc) + + (Motivation for change. Additional information.) + ``` + + Examples: + + * lib.getExe': check arguments + * lib.fileset: Add an additional argument in the design docs + + Closes #264537 + diff --git a/lib/attrsets.nix b/lib/attrsets.nix index b0460ab139e8f..bf6c90bf1be60 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,5 +1,5 @@ +/* Operations on attribute sets. */ { lib }: -# Operations on attribute sets. let inherit (builtins) head tail length; diff --git a/lib/customisation.nix b/lib/customisation.nix index c7d40339d05f5..08fc5db0614de 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -76,19 +76,22 @@ rec { Type: makeOverridable :: (AttrSet -> a) -> AttrSet -> a */ - makeOverridable = f: lib.setFunctionArgs - (origArgs: let + makeOverridable = f: + let + # Creates a functor with the same arguments as f + mirrorArgs = lib.mirrorFunctionArgs f; + in + mirrorArgs (origArgs: + let result = f origArgs; - # Creates a functor with the same arguments as f - copyArgs = g: lib.setFunctionArgs g (lib.functionArgs f); # Changes the original arguments with (potentially a function that returns) a set of new attributes overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs); # Re-call the function but with different arguments - overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs)); + overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs)); # Change the result of the function call by applying g to it - overrideResult = g: makeOverridable (copyArgs (args: g (f args))) origArgs; + overrideResult = g: makeOverridable (mirrorArgs (args: g (f args))) origArgs; in if builtins.isAttrs result then result // { @@ -102,8 +105,7 @@ rec { lib.setFunctionArgs result (lib.functionArgs result) // { override = overrideArgs; } - else result) - (lib.functionArgs f); + else result); /* Call the package function in the file `fn` with the required diff --git a/lib/default.nix b/lib/default.nix index fe737a125e680..a2958e561cf32 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -74,7 +74,7 @@ let importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum info showWarnings nixpkgsVersion version isInOldestRelease mod compare splitByAndCompare - functionArgs setFunctionArgs isFunction toFunction + functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs toHexString toBaseDigits inPureEvalMode; inherit (self.fixedPoints) fix fix' converge extends composeExtensions composeManyExtensions makeExtensible makeExtensibleWithCustomName; @@ -92,7 +92,7 @@ let concatMap flatten remove findSingle findFirst any all count optional optionals toList range replicate partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take - drop sublist last init crossLists unique intersectLists + drop sublist last init crossLists unique allUnique intersectLists subtractLists mutuallyExclusive groupBy groupBy'; inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep diff --git a/lib/fileset/README.md b/lib/fileset/README.md index 8518d88a7d642..14b6877a9065c 100644 --- a/lib/fileset/README.md +++ b/lib/fileset/README.md @@ -238,10 +238,22 @@ Arguments: And it would be unclear how the library should behave if the one file wouldn't be added to the store: `toSource { root = ./file.nix; fileset = <empty>; }` has no reasonable result because returing an empty store path wouldn't match the file type, and there's no way to have an empty file store path, whatever that would mean. +### `fileFilter` takes a path + +The `fileFilter` function takes a path, and not a file set, as its second argument. + +- (-) Makes it harder to compose functions, since the file set type, the return value, can't be passed to the function itself like `fileFilter predicate fileset` + - (+) It's still possible to use `intersection` to filter on file sets: `intersection fileset (fileFilter predicate ./.)` + - (-) This does need an extra `./.` argument that's not obvious + - (+) This could always be `/.` or the project directory, `intersection` will make it lazy +- (+) In the future this will allow `fileFilter` to support a predicate property like `subpath` and/or `components` in a reproducible way. + This wouldn't be possible if it took a file set, because file sets don't have a predictable absolute path. + - (-) What about the base path? + - (+) That can change depending on which files are included, so if it's used for `fileFilter` + it would change the `subpath`/`components` value depending on which files are included. +- (+) If necessary, this restriction can be relaxed later, the opposite wouldn't be possible + ## To update in the future Here's a list of places in the library that need to be updated in the future: -- > The file set library is currently somewhat limited but is being expanded to include more functions over time. - - in [the manual](../../doc/functions/fileset.section.md) - If/Once a function exists that can optionally include a path depending on whether it exists, the error message for the path not existing in `_coerce` should mention the new function diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 372d445269f55..2cb361ec9ba19 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -1,3 +1,94 @@ +/* + <!-- This anchor is here for backwards compatibity --> + []{#sec-fileset} + + The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. + A file set is a (mathematical) set of local files that can be added to the Nix store for use in Nix derivations. + File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. + + ## Overview {#sec-fileset-overview} + + Basics: + - [Implicit coercion from paths to file sets](#sec-fileset-path-coercion) + + - [`lib.fileset.trace`](#function-library-lib.fileset.trace)/[`lib.fileset.traceVal`](#function-library-lib.fileset.trace): + + Pretty-print file sets for debugging. + + - [`lib.fileset.toSource`](#function-library-lib.fileset.toSource): + + Add files in file sets to the store to use as derivation sources. + + Combinators: + - [`lib.fileset.union`](#function-library-lib.fileset.union)/[`lib.fileset.unions`](#function-library-lib.fileset.unions): + + Create a larger file set from all the files in multiple file sets. + + - [`lib.fileset.intersection`](#function-library-lib.fileset.intersection): + + Create a smaller file set from only the files in both file sets. + + - [`lib.fileset.difference`](#function-library-lib.fileset.difference): + + Create a smaller file set containing all files that are in one file set, but not another one. + + Filtering: + - [`lib.fileset.fileFilter`](#function-library-lib.fileset.fileFilter): + + Create a file set from all files that satisisfy a predicate in a directory. + + Utilities: + - [`lib.fileset.fromSource`](#function-library-lib.fileset.fromSource): + + Create a file set from a `lib.sources`-based value. + + - [`lib.fileset.gitTracked`](#function-library-lib.fileset.gitTracked)/[`lib.fileset.gitTrackedWith`](#function-library-lib.fileset.gitTrackedWith): + + Create a file set from all tracked files in a local Git repository. + + If you need more file set functions, + see [this issue](https://github.com/NixOS/nixpkgs/issues/266356) to request it. + + + ## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} + + All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. + Such path arguments are implicitly coerced to file sets containing all files under that path: + - A path to a file turns into a file set containing that single file. + - A path to a directory turns into a file set containing all files _recursively_ in that directory. + + If the path points to a non-existent location, an error is thrown. + + ::: {.note} + Just like in Git, file sets cannot represent empty directories. + Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. + ::: + + :::{.note} + File set coercion does _not_ add any of the files under the coerced paths to the store. + Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. + This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. + ::: + + ### Example {#sec-fileset-path-coercion-example} + + Assume we are in a local directory with a file hierarchy like this: + ``` + ├─ a/ + │ ├─ x (file) + │ └─ b/ + │ └─ y (file) + └─ c/ + └─ d/ + ``` + + Here's a listing of which files get included when different path expressions get coerced to file sets: + - `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). + - `./a` as a file set contains both `a/x` and `a/b/y`. + - `./a/x` as a file set contains only `a/x`. + - `./a/b` as a file set contains only `a/b/y`. + - `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. +*/ { lib }: let @@ -12,14 +103,18 @@ let _printFileset _intersection _difference + _mirrorStorePath + _fetchGitSubmodulesMinver ; inherit (builtins) + isBool isList isPath pathExists seq typeOf + nixVersion ; inherit (lib.lists) @@ -34,6 +129,7 @@ let inherit (lib.strings) isStringLike + versionOlder ; inherit (lib.filesystem) @@ -47,11 +143,102 @@ let inherit (lib.trivial) isFunction pipe + inPureEvalMode ; in { /* + Incrementally evaluate and trace a file set in a pretty way. + This function is only intended for debugging purposes. + The exact tracing format is unspecified and may change. + + This function takes a final argument to return. + In comparison, [`traceVal`](#function-library-lib.fileset.traceVal) returns + the given file set argument. + + This variant is useful for tracing file sets in the Nix repl. + + Type: + trace :: FileSet -> Any -> Any + + Example: + trace (unions [ ./Makefile ./src ./tests/run.sh ]) null + => + trace: /home/user/src/myProject + trace: - Makefile (regular) + trace: - src (all files in directory) + trace: - tests + trace: - run.sh (regular) + null + */ + trace = + /* + The file set to trace. + + This argument can also be a path, + which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + */ + fileset: + let + # "fileset" would be a better name, but that would clash with the argument name, + # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 + actualFileset = _coerce "lib.fileset.trace: Argument" fileset; + in + seq + (_printFileset actualFileset) + (x: x); + + /* + Incrementally evaluate and trace a file set in a pretty way. + This function is only intended for debugging purposes. + The exact tracing format is unspecified and may change. + + This function returns the given file set. + In comparison, [`trace`](#function-library-lib.fileset.trace) takes another argument to return. + + This variant is useful for tracing file sets passed as arguments to other functions. + + Type: + traceVal :: FileSet -> FileSet + + Example: + toSource { + root = ./.; + fileset = traceVal (unions [ + ./Makefile + ./src + ./tests/run.sh + ]); + } + => + trace: /home/user/src/myProject + trace: - Makefile (regular) + trace: - src (all files in directory) + trace: - tests + trace: - run.sh (regular) + "/nix/store/...-source" + */ + traceVal = + /* + The file set to trace and return. + + This argument can also be a path, + which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + */ + fileset: + let + # "fileset" would be a better name, but that would clash with the argument name, + # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 + actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset; + in + seq + (_printFileset actualFileset) + # We could also return the original fileset argument here, + # but that would then duplicate work for consumers of the fileset, because then they have to coerce it again + actualFileset; + + /* Add the local files contained in `fileset` to the store as a single [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) rooted at `root`. The result is the store path as a string-like value, making it usable e.g. as the `src` of a derivation, or in string interpolation: @@ -188,7 +375,7 @@ in { - Set `root` to ${toString fileset._internalBase} or any directory higher up. This changes the layout of the resulting store path. - Set `fileset` to a file set that cannot contain files outside the `root` (${toString root}). This could change the files included in the result.'' else - builtins.seq sourceFilter + seq sourceFilter cleanSourceWith { name = "source"; src = root; @@ -196,75 +383,6 @@ in { }; /* - Create a file set with the same files as a `lib.sources`-based value. - This does not import any of the files into the store. - - This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`. - - A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource). - - :::{.note} - File sets cannot represent empty directories. - Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories. - ::: - - Type: - fromSource :: SourceLike -> FileSet - - Example: - # There's no cleanSource-like function for file sets yet, - # but we can just convert cleanSource to a file set and use it that way - toSource { - root = ./.; - fileset = fromSource (lib.sources.cleanSource ./.); - } - - # Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`), - # but removing a subdirectory using file set functions - difference - (fromSource (lib.sources.sourceByRegex ./. [ - "^README\.md$" - # This regex includes everything in ./doc - "^doc(/.*)?$" - ]) - ./doc/generated - - # Use cleanSource, but limit it to only include ./Makefile and files under ./src - intersection - (fromSource (lib.sources.cleanSource ./.)) - (unions [ - ./Makefile - ./src - ]); - */ - fromSource = source: - let - # This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`, - # which are technically internal to lib.sources, - # but we'll allow this since both libraries are in the same code base - # and this function is a bridge between them. - isFiltered = source ? _isLibCleanSourceWith; - path = if isFiltered then source.origSrc else source; - in - # We can only support sources created from paths - if ! isPath path then - if isStringLike path then - throw '' - lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. - Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' - else - throw '' - lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' - else if ! pathExists path then - throw '' - lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.'' - else if isFiltered then - _fromSourceFilter path source.filter - else - # If there's no filter, no need to run the expensive conversion, all subpaths will be included - _singleton path; - - /* 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), but takes just two file sets instead of a list. @@ -357,56 +475,6 @@ in { ]; /* - Filter a file set to only contain files matching some predicate. - - Type: - fileFilter :: - ({ - name :: String, - type :: String, - ... - } -> Bool) - -> FileSet - -> FileSet - - Example: - # Include all regular `default.nix` files in the current directory - fileFilter (file: file.name == "default.nix") ./. - - # Include all non-Nix files from the current directory - fileFilter (file: ! hasSuffix ".nix" file.name) ./. - - # Include all files that start with a "." in the current directory - fileFilter (file: hasPrefix "." file.name) ./. - - # Include all regular files (not symlinks or others) in the current directory - fileFilter (file: file.type == "regular") - */ - fileFilter = - /* - The predicate function to call on all files contained in given file set. - A file is included in the resulting file set if this function returns true for it. - - This function is called with an attribute set containing these attributes: - - - `name` (String): The name of the file - - - `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file. - This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path. - - Other attributes may be added in the future. - */ - predicate: - # The file set to filter based on the predicate function - fileset: - if ! isFunction predicate then - throw '' - lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function.'' - else - _fileFilter predicate - (_coerce "lib.fileset.fileFilter: Second argument" fileset); - - /* The file set containing all files that are in both of two given file sets. See also [Intersection (set theory)](https://en.wikipedia.org/wiki/Intersection_(set_theory)). @@ -498,92 +566,238 @@ in { (elemAt filesets 1); /* - Incrementally evaluate and trace a file set in a pretty way. - This function is only intended for debugging purposes. - The exact tracing format is unspecified and may change. + Filter a file set to only contain files matching some predicate. - This function takes a final argument to return. - In comparison, [`traceVal`](#function-library-lib.fileset.traceVal) returns - the given file set argument. + Type: + fileFilter :: + ({ + name :: String, + type :: String, + ... + } -> Bool) + -> Path + -> FileSet - This variant is useful for tracing file sets in the Nix repl. + Example: + # Include all regular `default.nix` files in the current directory + fileFilter (file: file.name == "default.nix") ./. + + # Include all non-Nix files from the current directory + fileFilter (file: ! hasSuffix ".nix" file.name) ./. + + # Include all files that start with a "." in the current directory + fileFilter (file: hasPrefix "." file.name) ./. + + # Include all regular files (not symlinks or others) in the current directory + fileFilter (file: file.type == "regular") ./. + */ + fileFilter = + /* + The predicate function to call on all files contained in given file set. + A file is included in the resulting file set if this function returns true for it. + + This function is called with an attribute set containing these attributes: + + - `name` (String): The name of the file + + - `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file. + This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path. + + Other attributes may be added in the future. + */ + predicate: + # The path whose files to filter + path: + if ! isFunction predicate then + throw '' + lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' + else if ! isPath path then + if path._type or "" == "fileset" then + throw '' + lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. + If you need to filter files in a file set, use `intersection fileset (fileFilter pred ./.)` instead.'' + else + throw '' + lib.fileset.fileFilter: Second argument is of type ${typeOf path}, but it should be a path instead.'' + else if ! pathExists path then + throw '' + lib.fileset.fileFilter: Second argument (${toString path}) is a path that does not exist.'' + else + _fileFilter predicate path; + + /* + Create a file set with the same files as a `lib.sources`-based value. + This does not import any of the files into the store. + + This can be used to gradually migrate from `lib.sources`-based filtering to `lib.fileset`. + + A file set can be turned back into a source using [`toSource`](#function-library-lib.fileset.toSource). + + :::{.note} + File sets cannot represent empty directories. + Turning the result of this function back into a source using `toSource` will therefore not preserve empty directories. + ::: + + Type: + fromSource :: SourceLike -> FileSet + + Example: + # There's no cleanSource-like function for file sets yet, + # but we can just convert cleanSource to a file set and use it that way + toSource { + root = ./.; + fileset = fromSource (lib.sources.cleanSource ./.); + } + + # Keeping a previous sourceByRegex (which could be migrated to `lib.fileset.unions`), + # but removing a subdirectory using file set functions + difference + (fromSource (lib.sources.sourceByRegex ./. [ + "^README\.md$" + # This regex includes everything in ./doc + "^doc(/.*)?$" + ]) + ./doc/generated + + # Use cleanSource, but limit it to only include ./Makefile and files under ./src + intersection + (fromSource (lib.sources.cleanSource ./.)) + (unions [ + ./Makefile + ./src + ]); + */ + fromSource = source: + let + # This function uses `._isLibCleanSourceWith`, `.origSrc` and `.filter`, + # which are technically internal to lib.sources, + # but we'll allow this since both libraries are in the same code base + # and this function is a bridge between them. + isFiltered = source ? _isLibCleanSourceWith; + path = if isFiltered then source.origSrc else source; + in + # We can only support sources created from paths + if ! isPath path then + if isStringLike path then + throw '' + lib.fileset.fromSource: The source origin of the argument is a string-like value ("${toString path}"), but it should be a path instead. + Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.'' + else + throw '' + lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' + else if ! pathExists path then + throw '' + lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' + else if isFiltered then + _fromSourceFilter path source.filter + else + # If there's no filter, no need to run the expensive conversion, all subpaths will be included + _singleton path; + + /* + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + + This function behaves like [`gitTrackedWith { }`](#function-library-lib.fileset.gitTrackedWith) - using the defaults. Type: - trace :: FileSet -> Any -> Any + gitTracked :: Path -> FileSet Example: - trace (unions [ ./Makefile ./src ./tests/run.sh ]) null - => - trace: /home/user/src/myProject - trace: - Makefile (regular) - trace: - src (all files in directory) - trace: - tests - trace: - run.sh (regular) - null + # Include all files tracked by the Git repository in the current directory + gitTracked ./. + + # Include only files tracked by the Git repository in the parent directory + # that are also in the current directory + intersection ./. (gitTracked ../.) */ - trace = + gitTracked = /* - The file set to trace. - - This argument can also be a path, - which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. */ - fileset: + path: + # See the gitTrackedWith implementation for more explanatory comments let - # "fileset" would be a better name, but that would clash with the argument name, - # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.trace: Argument" fileset; + fetchResult = builtins.fetchGit path; in - seq - (_printFileset actualFileset) - (x: x); + if inPureEvalMode then + throw "lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isPath path then + throw "lib.fileset.gitTracked: Expected the argument to be a path, but it's a ${typeOf path} instead." + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTracked: Expected the argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; /* - Incrementally evaluate and trace a file set in a pretty way. - This function is only intended for debugging purposes. - The exact tracing format is unspecified and may change. + Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository. + The first argument allows configuration with an attribute set, + while the second argument is the path to the Git working tree. + If you don't need the configuration, + you can use [`gitTracked`](#function-library-lib.fileset.gitTracked) instead. - This function returns the given file set. - In comparison, [`trace`](#function-library-lib.fileset.trace) takes another argument to return. + This is equivalent to the result of [`unions`](#function-library-lib.fileset.unions) on all files returned by [`git ls-files`](https://git-scm.com/docs/git-ls-files) + (which uses [`--cached`](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt--c) by default). - This variant is useful for tracing file sets passed as arguments to other functions. + :::{.warning} + Currently this function is based on [`builtins.fetchGit`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchGit) + As such, this function causes all Git-tracked files to be unnecessarily added to the Nix store, + without being re-usable by [`toSource`](#function-library-lib.fileset.toSource). + + This may change in the future. + ::: Type: - traceVal :: FileSet -> FileSet + gitTrackedWith :: { recurseSubmodules :: Bool ? false } -> Path -> FileSet Example: - toSource { - root = ./.; - fileset = traceVal (unions [ - ./Makefile - ./src - ./tests/run.sh - ]); - } - => - trace: /home/user/src/myProject - trace: - Makefile (regular) - trace: - src (all files in directory) - trace: - tests - trace: - run.sh (regular) - "/nix/store/...-source" + # Include all files tracked by the Git repository in the current directory + # and any submodules under it + gitTracked { recurseSubmodules = true; } ./. */ - traceVal = + gitTrackedWith = + { + /* + (optional, default: `false`) Whether to recurse into [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to also include their tracked files. + + If `true`, this is equivalent to passing the [--recurse-submodules](https://git-scm.com/docs/git-ls-files#Documentation/git-ls-files.txt---recurse-submodules) flag to `git ls-files`. + */ + recurseSubmodules ? false, + }: /* - The file set to trace and return. - - This argument can also be a path, - which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + The [path](https://nixos.org/manual/nix/stable/language/values#type-path) to the working directory of a local Git repository. + This directory must contain a `.git` file or subdirectory. */ - fileset: + path: let - # "fileset" would be a better name, but that would clash with the argument name, - # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 - actualFileset = _coerce "lib.fileset.traceVal: Argument" fileset; + # This imports the files unnecessarily, which currently can't be avoided + # because `builtins.fetchGit` is the only function exposing which files are tracked by Git. + # With the [lazy trees PR](https://github.com/NixOS/nix/pull/6530), + # the unnecessarily import could be avoided. + # However a simpler alternative still would be [a builtins.gitLsFiles](https://github.com/NixOS/nix/issues/2944). + fetchResult = builtins.fetchGit { + url = path; + + # This is the only `fetchGit` parameter that makes sense in this context. + # We can't just pass `submodules = recurseSubmodules` here because + # this would fail for Nix versions that don't support `submodules`. + ${if recurseSubmodules then "submodules" else null} = true; + }; in - seq - (_printFileset actualFileset) - # We could also return the original fileset argument here, - # but that would then duplicate work for consumers of the fileset, because then they have to coerce it again - actualFileset; + if inPureEvalMode then + throw "lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292." + else if ! isBool recurseSubmodules then + throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead." + else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then + throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used." + else if ! isPath path then + throw "lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it's a ${typeOf path} instead." + # We can identify local working directories by checking for .git, + # see https://git-scm.com/docs/gitrepository-layout#_description. + # Note that `builtins.fetchGit` _does_ work for bare repositories (where there's no `.git`), + # even though `git ls-files` wouldn't return any files in that case. + else if ! pathExists (path + "/.git") then + throw "lib.fileset.gitTrackedWith: Expected the second argument (${toString path}) to point to a local working tree of a Git repository, but it's not." + else + _mirrorStorePath path fetchResult.outPath; } diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 717253f45715b..23d7b847204c9 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -381,7 +381,7 @@ rec { # Turn a fileset into a source filter function suitable for `builtins.path` # Only directories recursively containing at least one files are recursed into - # Type: Path -> fileset -> (String -> String -> Bool) + # Type: fileset -> (String -> String -> Bool) _toSourceFilter = fileset: let # Simplify the tree, necessary to make sure all empty directories are null @@ -753,9 +753,9 @@ rec { resultingTree = _differenceTree - positive._internalBase - positive._internalTree - negativeTreeWithPositiveBase; + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; in # If the first file set is empty, we can never have any files in the result if positive._internalIsEmptyWithoutBase then @@ -786,29 +786,66 @@ rec { _differenceTree (path + "/${name}") lhsValue (rhs.${name} or null) ) (_directoryEntries path lhs); - _fileFilter = predicate: fileset: + # Filters all files in a path based on a predicate + # Type: ({ name, type, ... } -> Bool) -> Path -> FileSet + _fileFilter = predicate: root: let - recurse = path: tree: - mapAttrs (name: subtree: - if isAttrs subtree || subtree == "directory" then - recurse (path + "/${name}") subtree - else if - predicate { - inherit name; - type = subtree; - # To ensure forwards compatibility with more arguments being added in the future, - # adding an attribute which can't be deconstructed :) - "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null; - } - then - subtree + # Check the predicate for a single file + # Type: String -> String -> filesetTree + fromFile = name: type: + if + predicate { + inherit name type; + # To ensure forwards compatibility with more arguments being added in the future, + # adding an attribute which can't be deconstructed :) + "lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null; + } + then + type + else + null; + + # Check the predicate for all files in a directory + # Type: Path -> filesetTree + fromDir = path: + mapAttrs (name: type: + if type == "directory" then + fromDir (path + "/${name}") else - null - ) (_directoryEntries path tree); + fromFile name type + ) (readDir path); + + rootType = pathType root; in - if fileset._internalIsEmptyWithoutBase then - _emptyWithoutBase + if rootType == "directory" then + _create root (fromDir root) else - _create fileset._internalBase - (recurse fileset._internalBase fileset._internalTree); + # Single files are turned into a directory containing that file or nothing. + _create (dirOf root) { + ${baseNameOf root} = + fromFile (baseNameOf root) rootType; + }; + + # Support for `builtins.fetchGit` with `submodules = true` was introduced in 2.4 + # https://github.com/NixOS/nix/commit/55cefd41d63368d4286568e2956afd535cb44018 + _fetchGitSubmodulesMinver = "2.4"; + + # Mirrors the contents of a Nix store path relative to a local path as a file set. + # Some notes: + # - The store path is read at evaluation time. + # - The store path must not include files that don't exist in the respective local path. + # + # Type: Path -> String -> FileSet + _mirrorStorePath = localPath: storePath: + let + recurse = focusedStorePath: + mapAttrs (name: type: + if type == "directory" then + recurse (focusedStorePath + "/${name}") + else + type + ) (builtins.readDir focusedStorePath); + in + _create localPath + (recurse storePath); } diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 796a03b52f0e4..06f92f297d88d 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -43,15 +43,29 @@ crudeUnquoteJSON() { cut -d \" -f2 } -prefixExpression='let - lib = import <nixpkgs/lib>; - internal = import <nixpkgs/lib/fileset/internal.nix> { - inherit lib; - }; -in -with lib; -with internal; -with lib.fileset;' +prefixExpression() { + echo 'let + lib = + (import <nixpkgs/lib>) + ' + if [[ "${1:-}" == "--simulate-pure-eval" ]]; then + echo ' + .extend (final: prev: { + trivial = prev.trivial // { + inPureEvalMode = true; + }; + })' + fi + echo ' + ; + internal = import <nixpkgs/lib/fileset/internal.nix> { + inherit lib; + }; + in + with lib; + with internal; + with lib.fileset;' +} # Check that two nix expression successfully evaluate to the same value. # The expressions have `lib.fileset` in scope. @@ -60,7 +74,7 @@ expectEqual() { local actualExpr=$1 local expectedExpr=$2 if actualResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/actualStderr \ - --expr "$prefixExpression ($actualExpr)"); then + --expr "$(prefixExpression) ($actualExpr)"); then actualExitCode=$? else actualExitCode=$? @@ -68,7 +82,7 @@ expectEqual() { actualStderr=$(< "$tmp"/actualStderr) if expectedResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/expectedStderr \ - --expr "$prefixExpression ($expectedExpr)"); then + --expr "$(prefixExpression) ($expectedExpr)"); then expectedExitCode=$? else expectedExitCode=$? @@ -95,8 +109,9 @@ expectEqual() { # Usage: expectStorePath NIX expectStorePath() { local expr=$1 - if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace \ - --expr "$prefixExpression ($expr)"); then + if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace 2>"$tmp"/stderr \ + --expr "$(prefixExpression) ($expr)"); then + cat "$tmp/stderr" >&2 die "$expr failed to evaluate, but it was expected to succeed" fi # This is safe because we assume to get back a store path in a string @@ -108,10 +123,16 @@ expectStorePath() { # The expression has `lib.fileset` in scope. # Usage: expectFailure NIX REGEX expectFailure() { + if [[ "$1" == "--simulate-pure-eval" ]]; then + maybePure="--simulate-pure-eval" + shift + else + maybePure="" + fi local expr=$1 local expectedErrorRegex=$2 if result=$(nix-instantiate --eval --strict --read-write-mode --show-trace 2>"$tmp/stderr" \ - --expr "$prefixExpression $expr"); then + --expr "$(prefixExpression $maybePure) $expr"); then die "$expr evaluated successfully to $result, but it was expected to fail" fi stderr=$(<"$tmp/stderr") @@ -128,12 +149,12 @@ expectTrace() { local expectedTrace=$2 nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTrace \ - --expr "$prefixExpression trace ($expr)" || true + --expr "$(prefixExpression) trace ($expr)" || true actualTrace=$(sed -n 's/^trace: //p' "$tmp/stderrTrace") nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTraceVal \ - --expr "$prefixExpression traceVal ($expr)" || true + --expr "$(prefixExpression) traceVal ($expr)" || true actualTraceVal=$(sed -n 's/^trace: //p' "$tmp/stderrTraceVal") @@ -810,10 +831,18 @@ checkFileset 'difference ./. ./b' ## File filter +# The first argument needs to be a function +expectFailure 'fileFilter null (abort "this is not needed")' 'lib.fileset.fileFilter: First argument is of type null, but it should be a function instead.' + +# 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.' +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.' + # The predicate is not called when there's no files tree=() checkFileset 'fileFilter (file: abort "this is not needed") ./.' -checkFileset 'fileFilter (file: abort "this is not needed") _emptyWithoutBase' # The predicate must be able to handle extra attributes touch a @@ -875,6 +904,18 @@ checkFileset 'union ./c/a (fileFilter (file: assert file.name != "a"; true) ./.) # but here we need to use ./c checkFileset 'union (fileFilter (file: assert file.name != "a"; true) ./.) ./c' +# Make sure single files are filtered correctly +tree=( + [a]=1 + [b]=0 +) +checkFileset 'fileFilter (file: assert file.name == "a"; true) ./a' +tree=( + [a]=0 + [b]=0 +) +checkFileset 'fileFilter (file: assert file.name == "a"; false) ./a' + ## Tracing # The second trace argument is returned @@ -1023,13 +1064,18 @@ rm -rf -- * ## lib.fileset.fromSource # Check error messages -expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# 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.' +# 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.' expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# fromSource on non-existent paths gives an error +expectFailure 'fromSource ./a' 'lib.fileset.fromSource: The source origin \('"$work"'/a\) of the argument is a path that does not exist.' + # fromSource on a path works and is the same as coercing that path mkdir a touch a/b c @@ -1231,6 +1277,179 @@ expectEqual 'trace (intersection ./a (fromSource (lib.cleanSourceWith { }))) null' 'trace ./a/b null' rm -rf -- * +## lib.fileset.gitTracked/gitTrackedWith + +# The first/second argument has to be a path +expectFailure 'gitTracked null' 'lib.fileset.gitTracked: Expected the argument to be a path, but it'\''s a null instead.' +expectFailure 'gitTrackedWith {} null' 'lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it'\''s a null instead.' + +# The path has to contain a .git directory +expectFailure 'gitTracked ./.' 'lib.fileset.gitTracked: Expected the argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' +expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.' + +# recurseSubmodules has to be a boolean +expectFailure 'gitTrackedWith { recurseSubmodules = null; } ./.' 'lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it'\''s a null instead.' + +# recurseSubmodules = true is not supported on all Nix versions +if [[ "$(nix-instantiate --eval --expr "$(prefixExpression) (versionAtLeast builtins.nixVersion _fetchGitSubmodulesMinver)")" == true ]]; then + fetchGitSupportsSubmodules=1 +else + fetchGitSupportsSubmodules= + expectFailure 'gitTrackedWith { recurseSubmodules = true; } ./.' 'lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version 2.4 and after, but Nix version [0-9.]+ is used.' +fi + +# Checks that `gitTrackedWith` contains the same files as `git ls-files` +# for the current working directory. +# If --recurse-submodules is passed, the flag is passed through to `git ls-files` +# and as `recurseSubmodules` to `gitTrackedWith` +checkGitTrackedWith() { + if [[ "${1:-}" == "--recurse-submodules" ]]; then + gitLsFlags="--recurse-submodules" + gitTrackedArg="{ recurseSubmodules = true; }" + else + gitLsFlags="" + gitTrackedArg="{ }" + fi + + # All files listed by `git ls-files` + expectedFiles=() + while IFS= read -r -d $'\0' file; do + # If there are submodules but --recurse-submodules isn't passed, + # `git ls-files` lists them as empty directories, + # we need to filter that out since we only want to check/count files + if [[ -f "$file" ]]; then + expectedFiles+=("$file") + fi + done < <(git ls-files -z $gitLsFlags) + + storePath=$(expectStorePath 'toSource { root = ./.; fileset = gitTrackedWith '"$gitTrackedArg"' ./.; }') + + # Check that each expected file is also in the store path with the same content + for expectedFile in "${expectedFiles[@]}"; do + if [[ ! -e "$storePath"/"$expectedFile" ]]; then + die "Expected file $expectedFile to exist in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + if ! diff "$expectedFile" "$storePath"/"$expectedFile"; then + die "Expected file $expectedFile to have the same contents as in $storePath, but it doesn't.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi + done + + # This is a cheap way to verify the inverse: That all files in the store path are also expected + # We just count the number of files in both and verify they're the same + actualFileCount=$(find "$storePath" -type f -printf . | wc -c) + if [[ "${#expectedFiles[@]}" != "$actualFileCount" ]]; then + die "Expected ${#expectedFiles[@]} files in $storePath, but got $actualFileCount.\nGit status:\n$(git status)\nStore path contents:\n$(find "$storePath")" + fi +} + + +# Runs checkGitTrackedWith with and without --recurse-submodules +# Allows testing both variants together +checkGitTracked() { + checkGitTrackedWith + if [[ -n "$fetchGitSupportsSubmodules" ]]; then + checkGitTrackedWith --recurse-submodules + fi +} + +createGitRepo() { + git init -q "$1" + # Only repo-local config + git -C "$1" config user.name "Nixpkgs" + git -C "$1" config user.email "nixpkgs@nixos.org" + # Get at least a HEAD commit, needed for older Nix versions + git -C "$1" commit -q --allow-empty -m "Empty commit" +} + +# Check the error message for pure eval mode +createGitRepo . +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTracked ./.; }' 'lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +expectFailure --simulate-pure-eval 'toSource { root = ./.; fileset = gitTrackedWith {} ./.; }' 'lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292.' +rm -rf -- * + +# Go through all stages of Git files +# See https://www.git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository + +# Empty repository +createGitRepo . +checkGitTracked + +# Untracked file +echo a > a +checkGitTracked + +# Staged file +git add a +checkGitTracked + +# Committed file +git commit -q -m "Added a" +checkGitTracked + +# Edited file +echo b > a +checkGitTracked + +# Removed file +git rm -f -q a +checkGitTracked + +rm -rf -- * + +# gitignored file +createGitRepo . +echo a > .gitignore +touch a +git add -A +checkGitTracked + +# Add it regardless (needs -f) +git add -f a +checkGitTracked +rm -rf -- * + +# Directory +createGitRepo . +mkdir -p d1/d2/d3 +touch d1/d2/d3/a +git add d1 +checkGitTracked +rm -rf -- * + +# Submodules +createGitRepo . +createGitRepo sub + +# Untracked submodule +git -C sub commit -q --allow-empty -m "Empty commit" +checkGitTracked + +# Tracked submodule +git submodule add ./sub sub >/dev/null +checkGitTracked + +# Untracked file +echo a > sub/a +checkGitTracked + +# Staged file +git -C sub add a +checkGitTracked + +# Committed file +git -C sub commit -q -m "Add a" +checkGitTracked + +# Changed file +echo b > sub/b +checkGitTracked + +# Removed file +git -C sub rm -f -q a +checkGitTracked + +rm -rf -- * + # TODO: Once we have combinators and a property testing library, derive property tests from https://en.wikipedia.org/wiki/Algebra_of_sets echo >&2 tests ok diff --git a/lib/filesystem.nix b/lib/filesystem.nix index f5bb8e9b59503..5569b8ac80fd1 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -1,5 +1,7 @@ -# Functions for querying information about the filesystem -# without copying any files to the Nix store. +/* + Functions for querying information about the filesystem + without copying any files to the Nix store. +*/ { lib }: # Tested in lib/tests/filesystem.sh diff --git a/lib/gvariant.nix b/lib/gvariant.nix index 3142ffc5f1494..708213224d3e3 100644 --- a/lib/gvariant.nix +++ b/lib/gvariant.nix @@ -1,16 +1,17 @@ +/* + A partial and basic implementation of GVariant formatted strings. + See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details. + + :::{.warning} + This API is not considered fully stable and it might therefore + change in backwards incompatible ways without prior notice. + ::: +*/ + # This file is based on https://github.com/nix-community/home-manager # Copyright (c) 2017-2022 Home Manager contributors -# - - { lib }: -/* A partial and basic implementation of GVariant formatted strings. - See https://docs.gtk.org/glib/gvariant-format-strings.html for detauls. - - Note, this API is not considered fully stable and it might therefore - change in backwards incompatible ways without prior notice. -*/ let inherit (lib) concatMapStringsSep concatStrings escape head replaceStrings; diff --git a/lib/lists.nix b/lib/lists.nix index 3835e3ba69cb8..a56667ec9c388 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,5 +1,4 @@ -# General list operations. - +/* General list operations. */ { lib }: let inherit (lib.strings) toInt; @@ -821,6 +820,19 @@ rec { */ unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) []; + /* Check if list contains only unique elements. O(n^2) complexity. + + Type: allUnique :: [a] -> bool + + Example: + allUnique [ 3 2 3 4 ] + => false + allUnique [ 3 2 4 1 ] + => true + */ + allUnique = list: (length (unique list) == length list); + + /* Intersects list 'e' and another list. O(nm) complexity. Example: diff --git a/lib/options.nix b/lib/options.nix index 7821924873dc6..9c10dfc8b36a4 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -1,4 +1,4 @@ -# Nixpkgs/NixOS option handling. +/* Nixpkgs/NixOS option handling. */ { lib }: let diff --git a/lib/path/default.nix b/lib/path/default.nix index 1a55a2a7be8dd..ab8a9e2202e95 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -1,4 +1,5 @@ -# Functions for working with paths, see ./path.md +/* Functions for working with path values. */ +# See ./README.md for internal docs { lib }: let diff --git a/lib/path/tests/default.nix b/lib/path/tests/default.nix index 50d40cdfa476e..93aea798acca6 100644 --- a/lib/path/tests/default.nix +++ b/lib/path/tests/default.nix @@ -6,16 +6,19 @@ overlays = []; inherit system; }, + nixVersions ? import ../../tests/nix-for-tests.nix { inherit pkgs; }, libpath ? ../.., # Random seed seed ? null, }: + pkgs.runCommand "lib-path-tests" { - nativeBuildInputs = with pkgs; [ - nix + nativeBuildInputs = [ + nixVersions.stable + ] ++ (with pkgs; [ jq bc - ]; + ]); } '' # Needed to make Nix evaluation work export TEST_ROOT=$(pwd)/test-tmp diff --git a/lib/sources.nix b/lib/sources.nix index 8b7cd5c84f62d..f61ea306aec56 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -1,4 +1,4 @@ -# Functions for copying sources to the Nix store. +/* Functions for copying sources to the Nix store. */ { lib }: # Tested in lib/tests/sources.sh diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 2790ea08d9701..ada8c66e3618b 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -43,6 +43,10 @@ rec { elaborate = args': let args = if lib.isString args' then { system = args'; } else args'; + + # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. + rust = assert !(args ? rust && args ? rustc); args.rust or args.rustc or {}; + final = { # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (if args ? config then args.config else args.system); @@ -159,9 +163,101 @@ rec { ({ linux-kernel = args.linux-kernel or {}; gcc = args.gcc or {}; - rustc = args.rustc or {}; } // platforms.select final) - linux-kernel gcc rustc; + linux-kernel gcc; + + # TODO: remove after 23.05 is EOL, with an error pointing to the rust.* attrs. + rustc = args.rustc or {}; + + rust = rust // { + # Once args.rustc.platform.target-family is deprecated and + # removed, there will no longer be any need to modify any + # values from args.rust.platform, so we can drop all the + # "args ? rust" etc. checks, and merge args.rust.platform in + # /after/. + platform = rust.platform or {} // { + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch + arch = + /**/ if rust ? platform then rust.platform.arch + else if final.isAarch32 then "arm" + else if final.isMips64 then "mips64" # never add "el" suffix + else if final.isPower64 then "powerpc64" # never add "le" suffix + else final.parsed.cpu.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os + os = + /**/ if rust ? platform then rust.platform.os or "none" + else if final.isDarwin then "macos" + else final.parsed.kernel.name; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family + target-family = + /**/ if args ? rust.platform.target-family then args.rust.platform.target-family + else if args ? rustc.platform.target-family + then + ( + # Since https://github.com/rust-lang/rust/pull/84072 + # `target-family` is a list instead of single value. + let + f = args.rustc.platform.target-family; + in + if builtins.isList f then f else [ f ] + ) + else lib.optional final.isUnix "unix" + ++ lib.optional final.isWindows "windows"; + + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + vendor = let + inherit (final.parsed) vendor; + in rust.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + }; + + # The name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. + rustcTarget = let + inherit (final.parsed) cpu kernel abi; + cpu_ = rust.platform.arch or { + "armv7a" = "armv7"; + "armv7l" = "armv7"; + "armv6l" = "arm"; + "armv5tel" = "armv5te"; + "riscv64" = "riscv64gc"; + }.${cpu.name} or cpu.name; + vendor_ = final.rust.platform.vendor; + in rust.config + or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + + # The name of the rust target if it is standard, or the json file + # containing the custom target spec. + rustcTargetSpec = + /**/ if rust ? platform + then builtins.toFile (final.rust.rustcTarget + ".json") (builtins.toJSON rust.platform) + else final.rust.rustcTarget; + + # The name of the rust target if it is standard, or the + # basename of the file containing the custom target spec, + # without the .json extension. + # + # This is the name used by Cargo for target subdirectories. + cargoShortTarget = + lib.removeSuffix ".json" (baseNameOf "${final.rust.rustcTargetSpec}"); + + # When used as part of an environment variable name, triples are + # uppercased and have all hyphens replaced by underscores: + # + # https://github.com/rust-lang/cargo/pull/9169 + # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 + cargoEnvVarTarget = + lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.toUpper final.rust.cargoShortTarget); + + # True if the target is no_std + # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 + isNoStdTarget = + builtins.any (t: lib.hasInfix t final.rust.rustcTarget) ["-none" "nvptx" "switch" "-uefi"]; + }; linuxArch = if final.isAarch32 then "arm" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 0d30e93aafb9d..06cb5e763e2c2 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -726,6 +726,15 @@ runTests { expected = 7; }; + testAllUnique_true = { + expr = allUnique [ 3 2 4 1 ]; + expected = true; + }; + testAllUnique_false = { + expr = allUnique [ 3 2 3 4 ]; + expected = false; + }; + # ATTRSETS testConcatMapAttrs = { diff --git a/lib/tests/nix-for-tests.nix b/lib/tests/nix-for-tests.nix new file mode 100644 index 0000000000000..69dedece38740 --- /dev/null +++ b/lib/tests/nix-for-tests.nix @@ -0,0 +1,17 @@ +{ pkgs +}: + +# The aws-sdk-cpp tests are flaky. Since pull requests to staging +# cause nix to be rebuilt, this means that staging PRs end up +# getting false CI failures due to whatever is flaky in the AWS +# SDK tests. Since none of our CI needs to (or should be able to) +# contact AWS S3, let's just omit it all from the Nix that runs +# CI. Bonus: the tests build way faster. +# +# See also: https://github.com/NixOS/nix/issues/7582 + +builtins.mapAttrs (_: pkg: + if builtins.isAttrs pkg + then pkg.override { withAWS = false; } + else pkg) + pkgs.nixVersions diff --git a/lib/tests/release.nix b/lib/tests/release.nix index c8d6b810122ec..843180490bb2b 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,8 +1,9 @@ { # The pkgs used for dependencies for the testing itself # Don't test properties of pkgs.lib, but rather the lib in the parent directory pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; }, - nix ? pkgs.nix, - nixVersions ? [ pkgs.nixVersions.minimum nix pkgs.nixVersions.unstable ], + nix ? pkgs-nixVersions.stable, + nixVersions ? [ pkgs-nixVersions.minimum nix pkgs-nixVersions.unstable ], + pkgs-nixVersions ? import ./nix-for-tests.nix { inherit pkgs; }, }: let @@ -25,11 +26,13 @@ let ]; 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 diff --git a/lib/trivial.nix b/lib/trivial.nix index c23fc6070be46..a89c1aa25b1f7 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -449,6 +449,40 @@ rec { (f ? __functor && isFunction (f.__functor f)); /* + `mirrorFunctionArgs f g` creates a new function `g'` with the same behavior as `g` (`g' x == g x`) + but its function arguments mirroring `f` (`lib.functionArgs g' == lib.functionArgs f`). + + Type: + mirrorFunctionArgs :: (a -> b) -> (a -> c) -> (a -> c) + + Example: + addab = {a, b}: a + b + addab { a = 2; b = 4; } + => 6 + lib.functionArgs addab + => { a = false; b = false; } + addab1 = attrs: addab attrs + 1 + addab1 { a = 2; b = 4; } + => 7 + lib.functionArgs addab1 + => { } + addab1' = lib.mirrorFunctionArgs addab addab1 + addab1' { a = 2; b = 4; } + => 7 + lib.functionArgs addab1' + => { a = false; b = false; } + */ + mirrorFunctionArgs = + # Function to provide the argument metadata + f: + let + fArgs = functionArgs f; + in + # Function to set the argument metadata to + g: + setFunctionArgs g fArgs; + + /* Turns any non-callable values into constant functions. Returns callable values as is. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a45a827946c53..921a34671df07 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -371,6 +371,15 @@ githubId = 124545; name = "Anthony Cowley"; }; + acuteenvy = { + matrix = "@acuteenvy:matrix.org"; + github = "acuteenvy"; + githubId = 126529524; + name = "Lena"; + keys = [{ + fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; + }]; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -1216,6 +1225,11 @@ githubId = 81317317; name = "Anna Aurora"; }; + a-n-n-a-l-e-e = { + github = "a-n-n-a-l-e-e"; + githubId = 150648636; + name = "annalee"; + }; anoa = { matrix = "@andrewm:amorgan.xyz"; email = "andrew@amorgan.xyz"; @@ -1516,6 +1530,11 @@ fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; }]; }; + arthsmn = { + name = "Arthur Cerqueira"; + github = "arthsmn"; + githubId = 150680976; + }; arthur = { email = "me@arthur.li"; github = "arthurl"; @@ -2468,6 +2487,12 @@ githubId = 50839; name = "Brian Jones"; }; + boltzmannrain = { + email = "boltzmannrain@gmail.com"; + github = "boltzmannrain"; + githubId = 150560585; + name = "Dmitry Ivankov"; + }; booklearner = { name = "booklearner"; email = "booklearner@proton.me"; @@ -2536,6 +2561,12 @@ githubId = 4621; name = "Brad Ediger"; }; + brahyerr = { + name = "Bryant Pham"; + email = "bp@1829847@gmail.com"; + github = "brahyerr"; + githubId = 120991075; + }; brainrape = { email = "martonboros@gmail.com"; github = "brainrake"; @@ -2596,6 +2627,12 @@ github = "brianmcgee"; githubId = 1173648; }; + brianmcgillion = { + name = "Brian McGillion"; + email = "bmg.avoin@gmail.com"; + github = "brianmcgillion"; + githubId = 1044263; + }; brodes = { email = "me@brod.es"; github = "brhoades"; @@ -2667,6 +2704,12 @@ githubId = 61636; name = "Brad Langhorst"; }; + bycEEE = { + email = "bycEEE@gmail.com"; + github = "bycEEE"; + githubId = 8891115; + name = "Brian Choy"; + }; bzizou = { email = "Bruno@bzizou.net"; github = "bzizou"; @@ -2851,6 +2894,13 @@ githubId = 686190; name = "Carlos D'Agostino"; }; + carlossless = { + email = "contact@carlossless.io"; + matrix = "@carlossless:matrix.org"; + github = "carlossless"; + githubId = 498906; + name = "Karolis Stasaitis"; + }; carlsverre = { email = "accounts@carlsverre.com"; github = "carlsverre"; @@ -3079,6 +3129,12 @@ githubId = 1689801; name = "Mikhail Chekan"; }; + chen = { + email = "i@cuichen.cc"; + github = "cu1ch3n"; + githubId = 80438676; + name = "Chen Cui"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -4187,6 +4243,15 @@ githubId = 156239; name = "D Anzorge"; }; + defelo = { + name = "Defelo"; + matrix = "@defelo:matrix.defelo.de"; + github = "Defelo"; + githubId = 41747605; + keys = [{ + fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; + }]; + }; deifactor = { name = "Ash Zahlen"; email = "ext0l@riseup.net"; @@ -5982,13 +6047,6 @@ githubId = 92793; name = "Friedrich von Never"; }; - fortuneteller2k = { - email = "lythe1107@gmail.com"; - matrix = "@fortuneteller2k:matrix.org"; - github = "fortuneteller2k"; - githubId = 20619776; - name = "fortuneteller2k"; - }; fpletz = { email = "fpletz@fnordicwalking.de"; github = "fpletz"; @@ -6097,6 +6155,10 @@ github = "frogamic"; githubId = 10263813; name = "Dominic Shelton"; + matrix = "@frogamic:beeper.com"; + keys = [{ + fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; + }]; }; frontsideair = { email = "photonia@gmail.com"; @@ -7775,6 +7837,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan770 = { + email = "ivan@ivan770.me"; + github = "ivan770"; + githubId = 14003886; + name = "Ivan Leshchenko"; + }; ivan-babrou = { email = "nixpkgs@ivan.computer"; name = "Ivan Babrou"; @@ -8289,11 +8357,14 @@ githubId = 18501; name = "Julien Langlois"; }; - jfrankenau = { - email = "johannes@frankenau.net"; - github = "jfrankenau"; - githubId = 2736480; - name = "Johannes Frankenau"; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; }; jfroche = { name = "Jean-François Roche"; @@ -10005,6 +10076,15 @@ githubId = 887072; name = "Alexander Lebedev"; }; + lecoqjacob = { + name = "Jacob LeCoq"; + email = "lecoqjacob@gmail.com"; + githubId = 9278174; + github = "lecoqjacob"; + keys = [{ + fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; + }]; + }; ledif = { email = "refuse@gmail.com"; github = "ledif"; @@ -10941,6 +11021,12 @@ githubId = 1651325; name = "maralorn"; }; + marcovergueira = { + email = "vergueira.marco@gmail.com"; + github = "marcovergueira"; + githubId = 929114; + name = "Marco Vergueira"; + }; marcus7070 = { email = "marcus@geosol.com.au"; github = "marcus7070"; @@ -11203,6 +11289,12 @@ githubId = 11810057; name = "Matt Snider"; }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -11714,6 +11806,12 @@ githubId = 34864484; name = "Mikael Fangel"; }; + mikecm = { + email = "mikecmcleod@gmail.com"; + github = "MaxwellDupre"; + githubId = 14096356; + name = "Michael McLeod"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -12049,6 +12147,13 @@ github = "ribosomerocker"; githubId = 46468162; }; + moni = { + email = "lythe1107@gmail.com"; + matrix = "@fortuneteller2k:matrix.org"; + github = "moni"; + githubId = 20619776; + name = "moni"; + }; monsieurp = { email = "monsieurp@gentoo.org"; github = "monsieurp"; @@ -12454,6 +12559,11 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + nadir-ishiguro = { + github = "nadir-ishiguro"; + githubId = 23151917; + name = "nadir-ishiguro"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "Nadrieril"; @@ -12707,6 +12817,12 @@ githubId = 13920346; name = "Sébastien Iooss"; }; + netthier = { + email = "netthier@proton.me"; + name = "nett_hier"; + github = "netthier"; + githubId = 66856670; + }; networkexception = { name = "networkException"; email = "nix@nwex.de"; @@ -13984,6 +14100,12 @@ githubId = 301903; name = "Chip Collier"; }; + phrogg = { + name = "Phil Roggenbuck"; + email = "nixpkgs@phrogg.de"; + github = "phrogg"; + githubId = 1367949; + }; phryneas = { email = "mail@lenzw.de"; github = "phryneas"; @@ -14639,6 +14761,12 @@ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; + qdlmcfresh = { + name = "Philipp Urlbauer"; + email = "qdlmcfresh@gmail.com"; + github = "qdlmcfresh"; + githubId = 10837173; + }; qjoly = { email = "github@thoughtless.eu"; github = "qjoly"; @@ -14753,6 +14881,12 @@ githubId = 1016742; name = "Rafael García"; }; + rafaelrc = { + email = "contact@rafaelrc.com"; + name = "Rafael Carvalho"; + github = "rafaelrc7"; + githubId = 5376043; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; @@ -16159,6 +16293,13 @@ githubId = 75371; name = "Stig Palmquist"; }; + sg-qwt = { + email = "hello@edgerunners.eu.org"; + matrix = "@dhl:edgerunners.eu.org"; + github = "sg-qwt"; + name = "sg-qwt"; + githubId = 115715554; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; @@ -16513,6 +16654,11 @@ githubId = 158321; name = "Stewart Mackenzie"; }; + skovati = { + github = "skovati"; + githubId = 49844593; + name = "skovati"; + }; skykanin = { github = "skykanin"; githubId = 3789764; @@ -19245,12 +19391,6 @@ githubId = 168610; name = "Ricardo M. Correia"; }; - wjlroe = { - email = "willroe@gmail.com"; - github = "wjlroe"; - githubId = 43315; - name = "William Roe"; - }; wladmis = { email = "dev@wladmis.org"; github = "wladmis"; @@ -19541,6 +19681,12 @@ github = "yanganto"; githubId = 10803111; }; + yannip = { + email = "yPapandreou7@gmail.com"; + github = "YanniPapandreou"; + githubId = 15948162; + name = "Yanni Papandreou"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -19585,6 +19731,13 @@ fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; }]; }; + YellowOnion = { + name = "Daniel Hill"; + email = "daniel@gluo.nz"; + github = "YellowOnion"; + githubId = 364160; + matrix = "@woobilicious:matrix.org"; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index a3dac082ddb72..78cfca24d96b1 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,9 +1,9 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn bit32,,,,5.3.0-1,5.1,lblasc -argparse,https://github.com/luarocks/argparse.git,,,,, -basexx,https://github.com/teto/basexx.git,,,,, -binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat +argparse,,,,,, +basexx,,,,,, +binaryheap,,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque cldr,,,,,,alerque @@ -12,8 +12,7 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyan,,,,,, -cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, +digestif,https://github.com/astoff/digestif.git,,,,5.3, dkjson,,,,,, fennel,,,,,,misterio77 fifo,,,,,, @@ -24,7 +23,7 @@ http,,,,0.3-0,,vcunat inspect,,,,,, jsregexp,,,,,, ldbus,,,http://luarocks.org/dev,,, -ldoc,https://github.com/stevedonovan/LDoc.git,,,,, +ldoc,,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,5.1,lblasc @@ -40,7 +39,7 @@ lrexlib-posix,,,,,, lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, -lua-iconv,,,,,, +lua-ffi-zlib,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -83,30 +82,30 @@ luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn +lua-iconv,,,,7.0.0,, luuid,,,,,, luv,,,,1.44.2-1,, lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc -magick,,,,,,donovanglover +magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn -nui-nvim,,,,,,mrcjkb +nui.nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, rest.nvim,,,,,5.1,teto -readline,,,,,, rustaceanvim,,,,,,mrcjkb say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 44a445875d918..cc0f4ef742d11 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -26,7 +26,7 @@ import urllib.parse import urllib.request import xml.etree.ElementTree as ET from dataclasses import asdict, dataclass -from datetime import datetime +from datetime import UTC, datetime from functools import wraps from multiprocessing.dummy import Pool from pathlib import Path @@ -788,14 +788,12 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: - from datetime import date - try: repo = git.Repo(os.getcwd()) - updated = date.today().strftime('%m-%d-%Y') + updated = datetime.now(tz=UTC).strftime('%Y-%m-%d') print(args.outfile) commit(repo, - f"{editor.attr_path}: updated the {updated}", [args.outfile] + f"{editor.attr_path}: update on {updated}", [args.outfile] ) except git.InvalidGitRepositoryError as e: print(f"Not in a git repository: {e}", file=sys.stderr) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 3ad43f2a34e42..1998b96050a6e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -219,7 +219,6 @@ with lib.maintainers; { cole-h grahamc hoverbear - lheckemann ]; scope = "Group registration for packages maintained by Determinate Systems."; shortName = "Determinate Systems employees"; @@ -398,6 +397,7 @@ with lib.maintainers; { cdepillabout expipiplus1 maralorn + ncfavier sternenseemann ]; githubTeams = [ @@ -677,18 +677,6 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - numtide = { - members = [ - mic92 - flokli - jfroche - tazjin - zimbatm - ]; - scope = "Group registration for Numtide team members who collectively maintain packages."; - shortName = "Numtide team"; - }; - ocaml = { members = [ alizter @@ -916,7 +904,6 @@ with lib.maintainers; { tts = { members = [ - hexa mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; diff --git a/nixos/README.md b/nixos/README.md index d0257e12d9333..07e82bf0ad938 100644 --- a/nixos/README.md +++ b/nixos/README.md @@ -8,6 +8,27 @@ https://nixos.org/nixos and in the manual in doc/manual. You can add new module to your NixOS configuration file (usually it’s `/etc/nixos/configuration.nix`). And do `sudo nixos-rebuild test -I nixpkgs=<path to your local nixpkgs folder> --fast`. +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + nixos/(module): (init module | add setting | refactor | etc) + + (Motivation for change. Link to release notes. Additional information.) + ``` + + Examples: + + * nixos/hydra: add bazBaz option + + Dual baz behavior is needed to do foo. + * nixos/nginx: refactor config generation + + The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). + ## Reviewing contributions When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people’s installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from \@edolstra. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 0b54b8b32a35b..21c798b3b4a46 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -660,5 +660,5 @@ If reloading the module is not an option, proceed to [Nuclear option](#sec-relea #### Nuclear option {#sec-release-23.05-migration-pipewire-nuclear} If all else fails, you can still manually copy the contents of the default configuration file -from `${pkgs.pipewire.lib}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. +from `${pkgs.pipewire}/share/pipewire` to `/etc/pipewire` and edit it to fully override the default. However, this should be done only as a last resort. Please talk to the Pipewire maintainers if you ever need to do this. diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d838d33e35dc0..4b6335c007190 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -30,6 +30,9 @@ [`sudo-rs`]: https://github.com/memorysafety/sudo-rs/ +- `linuxPackages_testing_bcachefs` is now soft-deprecated by `linuxPackages_testing`. + - Please consider changing your NixOS configuration's `boot.kernelPackages` to `linuxPackages_testing` until a stable kernel with bcachefs support is released. + - All [ROCm](https://rocm.docs.amd.com/en/latest/) packages have been updated to 5.7.0. - [ROCm](https://rocm.docs.amd.com/en/latest/) package attribute sets are versioned: `rocmPackages` -> `rocmPackages_5`. @@ -104,6 +107,8 @@ - [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable). +- [forgejo](https://forgejo.org/), a git forge. Previously deployed as a drop-in replacement package in the [gitea module](#opt-services.gitea.package). Available as [services.forgejo](#opt-services.forgejo.enable). See migration instructions in the [NixOS manual](#module-forgejo) on how to migrate your forgejo instance using [`services.gitea.package = pkgs.forgejo`](#opt-services.gitea.package) to [`services.forgejo`](#opt-services.forgejo.enable). + - hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable). - [zwave-js](https://github.com/zwave-js/zwave-js-server), a small server wrapper around Z-Wave JS to access it via a WebSocket. Available as [services.zwave-js](#opt-services.zwave-js.enable). @@ -127,6 +132,8 @@ - [ZITADEL](https://zitadel.com), a turnkey identity and access management platform. Available as [services.zitadel](#opt-services.zitadel.enable). +- [exportarr](https://github.com/onedr0p/exportarr), Prometheus Exporters for Bazarr, Lidarr, Prowlarr, Radarr, Readarr, and Sonarr. Available as [services.prometheus.exporters.exportarr-bazarr](#opt-services.prometheus.exporters.exportarr-bazarr.enable)/[services.prometheus.exporters.exportarr-lidarr](#opt-services.prometheus.exporters.exportarr-lidarr.enable)/[services.prometheus.exporters.exportarr-prowlarr](#opt-services.prometheus.exporters.exportarr-prowlarr.enable)/[services.prometheus.exporters.exportarr-radarr](#opt-services.prometheus.exporters.exportarr-radarr.enable)/[services.prometheus.exporters.exportarr-readarr](#opt-services.prometheus.exporters.exportarr-readarr.enable)/[services.prometheus.exporters.exportarr-sonarr](#opt-services.prometheus.exporters.exportarr-sonarr.enable). + - [netclient](https://github.com/gravitl/netclient), an automated WireGuard® Management Client. Available as [services.netclient](#opt-services.netclient.enable). - [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web @@ -141,6 +148,9 @@ ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- `services.postgresql.ensurePermissions` has been deprecated in favor of `services.postgresql.ensureUsers.*.ensureDBOwnership` which simplifies the setup of database owned by a certain system user + in local database contexts (which make use of peer authentication via UNIX sockets), migration guidelines were provided in the NixOS manual, please refer to them if you are affected by a PostgreSQL 15 changing the way `GRANT ALL PRIVILEGES` is working. `services.postgresql.ensurePermissions` will be removed in 24.05. All NixOS modules were migrated using one of the strategy, e.g. `ensureDBOwnership` or `postStart`. More about this situation can be learnt in https://github.com/NixOS/nixpkgs/pull/266270. + - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. Workarounds for this can be removed. @@ -152,6 +162,8 @@ - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. +- `services.mastodon` doesn't support providing a TCP port to its `streaming` component anymore, as upstream implemented parallelization by running multiple instances instead of running multiple processes in one instance. Please create a PR if you are interested in this feature. + - The `services.hostapd` module was rewritten to support `passwordFile` like options, WPA3-SAE, and management of multiple interfaces. This breaks compatibility with older configurations. - `hostapd` is now started with additional systemd sandbox/hardening options for better security. - `services.hostapd.interface` was replaced with a per-radio and per-bss configuration scheme using [services.hostapd.radios](#opt-services.hostapd.radios). @@ -187,6 +199,8 @@ - JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools` +- The `waagent` service does provisioning now + - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though: - The option [`services.matrix-synapse.package`](#opt-services.matrix-synapse.package) is now read-only. For modifying the package, use an overlay which modifies `matrix-synapse-unwrapped` instead. More on that below. - The `enableSystemd` & `enableRedis` arguments have been removed and `matrix-synapse` has been renamed to `matrix-synapse-unwrapped`. Also, several optional dependencies (such as `psycopg2` or `authlib`) have been removed. @@ -264,6 +278,18 @@ - `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be. +- `fuse3` has been updated from 3.11.0 to 3.16.2; see [ChangeLog.rst](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3162-2023-10-10) for an overview of the changes. + + Unsupported mount options are no longer silently accepted [(since 3.15.0)](https://github.com/libfuse/libfuse/blob/fuse-3.16.2/ChangeLog.rst#libfuse-3150-2023-06-09). The [affected mount options](https://github.com/libfuse/libfuse/commit/dba6b3983af34f30de01cf532dff0b66f0ed6045) are: `atime`, `diratime`, `lazytime`, `nolazytime`, `relatime`, `norelatime`, `strictatime`. + + For example, + + ```bash + $ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime` + ``` + + would previously terminate successfully with the mount point established, now it outputs the error message ``fuse: unknown option(s): `-o atime'`` and terminates with exit status 1. + - `nixos-rebuild {switch,boot,test,dry-activate}` now runs the system activation inside `systemd-run`, creating an ephemeral systemd service and protecting the system switch against issues like network disconnections during remote (e.g. SSH) sessions. This has the side effect of running the switch in an isolated environment, that could possible break post-switch scripts that depends on things like environment variables being set. If you want to opt-out from this behavior for now, you may set the `NIXOS_SWITCH_USE_DIRTY_ENV` environment variable before running `nixos-rebuild`. However, keep in mind that this option will be removed in the future. - The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192). @@ -300,7 +326,7 @@ - The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped. -- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. +- `pharo` has been updated to latest stable (PharoVM 10.0.8), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. - Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`. @@ -321,6 +347,8 @@ - Package `pash` was removed due to being archived upstream. Use `powershell` as an alternative. +- The option `services.plausible.releaseCookiePath` has been removed: Plausible does not use any distributed Erlang features, and does not plan to (see [discussion](https://github.com/NixOS/nixpkgs/pull/130297#issuecomment-1805851333)), so NixOS now disables them, and the Erlang cookie becomes unnecessary. You may delete the file that `releaseCookiePath` was set to. + - `security.sudo.extraRules` now includes `root`'s default rule, with ordering priority 400. This is functionally identical for users not specifying rule order, or relying on `mkBefore` and `mkAfter`, but may impact users calling @@ -365,6 +393,8 @@ - The `prayer` package as well as `services.prayer` have been removed because it's been unmaintained for several years and the author's website has vanished. +- The `chrony` NixOS module now tracks the Real-Time Clock drift from the System Clock with `rtcfile` and automatically adjusts it with `rtcautotrim` when it exceeds the maximum error specified in `services.chrony.autotrimThreshold` (default 30 seconds). If you enabled `rtcsync` in `extraConfig`, you should remove RTC related options from `extraConfig`. If you do not want chrony configured to keep the RTC in check, you can set `services.chrony.enableRTCTrimming = false;` + ## Other Notable Changes {#sec-release-23.11-notable-changes} - A new option `system.switch.enable` was added. By default, this is option is @@ -398,6 +428,8 @@ - `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0). +- The iptables firewall module now installs the `nixos-firewall-tool` which allows the user to easily temporarily open ports through the firewall. + - Elixir now defaults to version [v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/). @@ -519,8 +551,16 @@ The module update takes care of the new config syntax and the data itself (user - The Home Assistant module now offers support for installing custom components and lovelace modules. Available at [`services.home-assistant.customComponents`](#opt-services.home-assistant.customComponents) and [`services.home-assistant.customLovelaceModules`](#opt-services.home-assistant.customLovelaceModules). +- The argument `vendorSha256` of `buildGoModule` is deprecated. Use `vendorHash` instead. ([\#259999](https://github.com/NixOS/nixpkgs/pull/259999)) + +- TeX Live environments can now be built with the new `texlive.withPackages`. The procedure for creating custom TeX packages has been changed, see the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#sec-language-texlive-custom-packages) for more details. + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} +- Node.js v14, v16 has been removed as they were end of life. Any dependent packages that contributors were not able to reasonably upgrade were dropped after a month of notice to their maintainers, were **removed**. + - This includes VSCode Server. + - This includes Kibana 7 as the ELK stack is unmaintained in nixpkgs and is marked for slow removal. + - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. - The `django` alias in the python package set was upgraded to Django 4.x. @@ -563,4 +603,6 @@ The module update takes care of the new config syntax and the data itself (user - The Linux kernel module `msr` (see [`msr(4)`](https://man7.org/linux/man-pages/man4/msr.4.html)), which provides an interface to read and write the model-specific registers (MSRs) of an x86 CPU, can now be configured via `hardware.cpu.x86.msr`. +- Docker now defaults to 24, as 20.10 is stopping to receive security updates and bug fixes after [December 10, 2023](https://github.com/moby/moby/discussions/45104). + - There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2. diff --git a/nixos/lib/systemd-network-units.nix b/nixos/lib/systemd-network-units.nix index 8bda1a8bfdcf6..1d5f823f3678d 100644 --- a/nixos/lib/systemd-network-units.nix +++ b/nixos/lib/systemd-network-units.nix @@ -23,6 +23,12 @@ in { '' + optionalString (def.vlanConfig != { }) '' [VLAN] ${attrsToSection def.vlanConfig} + '' + optionalString (def.ipvlanConfig != { }) '' + [IPVLAN] + ${attrsToSection def.ipvlanConfig} + '' + optionalString (def.ipvtapConfig != { }) '' + [IPVTAP] + ${attrsToSection def.ipvtapConfig} '' + optionalString (def.macvlanConfig != { }) '' [MACVLAN] ${attrsToSection def.macvlanConfig} diff --git a/nixos/modules/config/stevenblack.nix b/nixos/modules/config/stevenblack.nix index 30ef7ff259f09..7e6235169847a 100644 --- a/nixos/modules/config/stevenblack.nix +++ b/nixos/modules/config/stevenblack.nix @@ -30,5 +30,5 @@ in ++ optionals (activatedHosts == [ ]) [ "${pkgs.stevenblack-blocklist}/hosts" ]; }; - meta.maintainers = [ maintainers.fortuneteller2k maintainers.artturin ]; + meta.maintainers = [ maintainers.moni maintainers.artturin ]; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 71737cd8ebc41..2f9edba4f0c9c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -257,6 +257,7 @@ foreach my $path (glob "/sys/class/{block,mmc_host}/*") { # Add bcache module, if needed. my @bcacheDevices = glob("/dev/bcache*"); +@bcacheDevices = grep(!qr#dev/bcachefs.*#, @bcacheDevices); if (scalar @bcacheDevices > 0) { push @initrdAvailableKernelModules, "bcache"; } @@ -467,6 +468,19 @@ EOF # boot.tmp.useTmpfs option in configuration.nix (managed declaratively). next if ($mountPoint eq "/tmp" && $fsType eq "tmpfs"); + # This should work for single and multi-device systems. + # still needs subvolume support + if ($fsType eq "bcachefs") { + my ($status, @info) = runCommand("bcachefs fs usage $rootDir$mountPoint"); + my $UUID = $info[0]; + + if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) { + $stableDevPath = "UUID=$1"; + } else { + print STDERR "warning: can't find bcachefs mount UUID falling back to device-path"; + } + } + # Emit the filesystem. $fileSystems .= <<EOF; fileSystems.\"$mountPoint\" = diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 00da639929516..f4ca96d2ca161 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -799,6 +799,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/ocsinventory-agent.nix ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix @@ -880,6 +881,7 @@ ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix ./services/networking/blocky.nix + ./services/networking/centrifugo.nix ./services/networking/cgit.nix ./services/networking/charybdis.nix ./services/networking/chisel-server.nix @@ -1147,7 +1149,6 @@ ./services/search/elasticsearch-curator.nix ./services/search/elasticsearch.nix ./services/search/hound.nix - ./services/search/kibana.nix ./services/search/meilisearch.nix ./services/search/opensearch.nix ./services/search/qdrant.nix @@ -1241,7 +1242,6 @@ ./services/web-apps/changedetection-io.nix ./services/web-apps/chatgpt-retrieval-plugin.nix ./services/web-apps/cloudlog.nix - ./services/web-apps/code-server.nix ./services/web-apps/convos.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 932bf3e791159..7cc302969fb6d 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -345,6 +345,10 @@ let serviceConfig = commonServiceConfig // { Group = data.group; + # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour. + # This avoids eating them all up if something is misconfigured upon the first try. + RestartSec = 15 * 60; + # Keep in mind that these directories will be deleted if the user runs # systemctl clean --what=state # acme/.lego/${cert} is listed for this reason. diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 333b648014263..461b9ffe7ee0b 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; @@ -49,7 +49,7 @@ with lib; }; script = '' - ${pkgs.udev}/bin/udevadm settle + ${config.systemd.package}/bin/udevadm settle echo -n 1 >/proc/sys/kernel/modules_disabled ''; }; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index ff912dec5073f..3dd5d2e525d91 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -192,10 +192,12 @@ in ###### implementation config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.package.pname != "sudo-rs"; - message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } - ]; + assertions = [ { + assertion = cfg.package.pname != "sudo-rs"; + message = '' + NixOS' `sudo` module does not support `sudo-rs`; see `security.sudo-rs` instead. + ''; + } ]; security.sudo.extraRules = let diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index e18e61eb6d44b..77a0e74af9ca2 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/nixos/modules/services/audio/navidrome.nix @@ -28,10 +28,17 @@ in { ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to open the TCP port in the firewall"; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [cfg.settings.Port]; + systemd.services.navidrome = { description = "Navidrome Media Server"; after = [ "network.target" ]; diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 9fbc68b71364e..cdd9d551c501f 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -54,7 +54,7 @@ in { serviceConfig = { User = "slimserver"; # Issue 40589: Disable broken image/video support (audio still works!) - ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; + ExecStart = "${lib.getExe cfg.package} --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo"; }; }; diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index d65d9616e2f2d..e5e0b7efec29a 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -39,6 +39,125 @@ By default, PostgreSQL stores its databases in {file}`/var/lib/postgresql/$psqlS services.postgresql.dataDir = "/data/postgresql"; ``` +## Initializing {#module-services-postgres-initializing} + +As of NixOS 23.11, +`services.postgresql.ensureUsers.*.ensurePermissions` has been +deprecated, after a change to default permissions in PostgreSQL 15 +invalidated most of its previous use cases: + +- In psql < 15, `ALL PRIVILEGES` used to include `CREATE TABLE`, where + in psql >= 15 that would be a separate permission +- psql >= 15 instead gives only the database owner create permissions +- Even on psql < 15 (or databases migrated to >= 15), it is + recommended to manually assign permissions along these lines + - https://www.postgresql.org/docs/release/15.0/ + - https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PRIV + +### Assigning ownership {#module-services-postgres-initializing-ownership} + +Usually, the database owner should be a database user of the same +name. This can be done with +`services.postgresql.ensureUsers.*.ensureDBOwnership = true;`. + +If the database user name equals the connecting system user name, +postgres by default will accept a passwordless connection via unix +domain socket. This makes it possible to run many postgres-backed +services without creating any database secrets at all + +### Assigning extra permissions {#module-services-postgres-initializing-extra-permissions} + +For many cases, it will be enough to have the database user be the +owner. Until `services.postgresql.ensureUsers.*.ensurePermissions` has +been re-thought, if more users need access to the database, please use +one of the following approaches: + +**WARNING:** `services.postgresql.initialScript` is not recommended +for `ensurePermissions` replacement, as that is *only run on first +start of PostgreSQL*. + +**NOTE:** all of these methods may be obsoleted, when `ensure*` is +reworked, but it is expected that they will stay viable for running +database migrations. + +**NOTE:** please make sure that any added migrations are idempotent (re-runnable). + +#### as superuser {#module-services-postgres-initializing-extra-permissions-superuser} + +**Advantage:** compatible with postgres < 15, because it's run +as the database superuser `postgres`. + +##### in database `postStart` {#module-services-postgres-initializing-extra-permissions-superuser-post-start} + +**Disadvantage:** need to take care of ordering yourself. In this +example, `mkAfter` ensures that permissions are assigned after any +databases from `ensureDatabases` and `extraUser1` from `ensureUsers` +are already created. + +```nix + systemd.services.postgresql.postStart = lib.mkAfter '' + $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; +``` + +##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-superuser-oneshot} + +```nix + systemd.services."migrate-service1-db1" = { + serviceConfig.Type = "oneshot"; + requiredBy = "service1.service"; + before = "service1.service"; + after = "postgresql.service"; + serviceConfig.User = "postgres"; + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + script = '' + $PSQL service1 -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL service1 -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; + }; +``` + +#### as service user {#module-services-postgres-initializing-extra-permissions-service-user} + +**Advantage:** re-uses systemd's dependency ordering; + +**Disadvantage:** relies on service user having grant permission. To be combined with `ensureDBOwnership`. + +##### in service `preStart` {#module-services-postgres-initializing-extra-permissions-service-user-pre-start} + +```nix + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + systemd.services."service1".preStart = '' + $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; +``` + +##### in intermediate oneshot service {#module-services-postgres-initializing-extra-permissions-service-user-oneshot} + +```nix + systemd.services."migrate-service1-db1" = { + serviceConfig.Type = "oneshot"; + requiredBy = "service1.service"; + before = "service1.service"; + after = "postgresql.service"; + serviceConfig.User = "service1"; + environment.PSQL = "psql --port=${toString services.postgresql.port}"; + path = [ postgresql ]; + script = '' + $PSQL -c 'GRANT SELECT ON ALL TABLES IN SCHEMA public TO "extraUser1"' + $PSQL -c 'GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO "extraUser1"' + # .... + ''; + }; +``` + ## Upgrading {#module-services-postgres-upgrading} ::: {.note} diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index af4db5c9611f6..d69ffff7b47b6 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -168,7 +168,12 @@ 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 @@ -187,6 +192,16 @@ in ''; }; + ensureDBOwnership = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Grants the user ownership to a database with the same name. + This database must be defined manually in + [](#opt-services.postgresql.ensureDatabases). + ''; + }; + ensureClauses = mkOption { description = lib.mdDoc '' An attrset of clauses to grant to the user. Under the hood this uses the @@ -338,26 +353,21 @@ in }); default = []; description = lib.mdDoc '' - Ensures that the specified users exist and have at least the ensured permissions. + Ensures that the specified users exist. The PostgreSQL users will be identified using peer authentication. This authenticates the Unix user with the same name only, and that without the need for a password. - This option will never delete existing users or remove permissions, especially not when the value of this - option is changed. This means that users created and permissions assigned once through this option or - otherwise have to be removed manually. + This option will never delete existing users or remove DB ownership of databases + once granted with `ensureDBOwnership = true;`. This means that this must be + cleaned up manually when changing after changing the config in here. ''; example = literalExpression '' [ { name = "nextcloud"; - ensurePermissions = { - "DATABASE nextcloud" = "ALL PRIVILEGES"; - }; } { name = "superuser"; - ensurePermissions = { - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ] ''; @@ -445,6 +455,27 @@ in config = mkIf cfg.enable { + assertions = map ({ name, ensureDBOwnership, ... }: { + assertion = ensureDBOwnership -> builtins.elem name cfg.ensureDatabases; + message = '' + For each database user defined with `services.postgresql.ensureUsers` and + `ensureDBOwnership = true;`, a database with the same name must be defined + in `services.postgresql.ensureDatabases`. + + 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 = { hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}"; @@ -556,12 +587,15 @@ in ${ concatMapStrings (user: - let + 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}";' ''; filteredClauses = filterAttrs (name: value: value != null) user.ensureClauses; @@ -572,6 +606,8 @@ in $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' ${userPermissions} ${userClauses} + + ${dbOwnershipStmt} '' ) cfg.ensureUsers diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index ae695baf42c60..07ca2727cf48e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -115,8 +115,7 @@ in { environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.jack.enable jack-libs; - systemd.packages = [ cfg.package ] - ++ lib.optional cfg.pulse.enable cfg.package.pulse; + systemd.packages = [ cfg.package ]; # PipeWire depends on DBUS but doesn't list it. Without this booting # into a terminal results in the service crashing with an error. @@ -130,9 +129,13 @@ in { systemd.user.sockets.pipewire.enable = !cfg.systemWide; systemd.user.services.pipewire.enable = !cfg.systemWide; + # 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; + systemd.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; - systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; + systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; services.udev.packages = [ cfg.package ]; @@ -140,14 +143,14 @@ in { environment.etc."alsa/conf.d/49-pipewire-modules.conf" = mkIf cfg.alsa.enable { text = '' pcm_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; + libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} } ctl_type.pipewire { - libs.native = ${cfg.package.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; + libs.native = ${cfg.package}/lib/alsa-lib/libasound_module_ctl_pipewire.so ; ${optionalString enable32BitAlsaPlugins - "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire}/lib/alsa-lib/libasound_module_ctl_pipewire.so ;"} } ''; }; diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix index 7dd143eebf12f..d24ed24ef3956 100644 --- a/nixos/modules/services/development/zammad.nix +++ b/nixos/modules/services/development/zammad.nix @@ -204,7 +204,7 @@ in assertions = [ { - assertion = cfg.database.createLocally -> cfg.database.user == "zammad"; + assertion = cfg.database.createLocally -> cfg.database.user == "zammad" && cfg.database.name == "zammad"; message = "services.zammad.database.user must be set to \"zammad\" if services.zammad.database.createLocally is set to true"; } { @@ -231,7 +231,7 @@ in ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/finance/odoo.nix b/nixos/modules/services/finance/odoo.nix index eec7c4e30cc48..b8574ed09af9c 100644 --- a/nixos/modules/services/finance/odoo.nix +++ b/nixos/modules/services/finance/odoo.nix @@ -121,7 +121,7 @@ in ensureDatabases = [ "odoo" ]; ensureUsers = [{ name = "odoo"; - ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; }); diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 7a938459d0cb5..7b6c336bd2211 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -187,13 +187,20 @@ in { # fwupd-refresh expects a user that we do not create, so just run with DynamicUser # instead and ensure we take ownership of /var/lib/fwupd services.fwupd-refresh.serviceConfig = { - DynamicUser = true; StateDirectory = "fwupd"; + # Better for debugging, upstream sets stderr to null for some reason.. + StandardError = "inherit"; }; timers.fwupd-refresh.wantedBy = [ "timers.target" ]; }; + users.users.fwupd-refresh = { + isSystemUser = true; + group = "fwupd-refresh"; + }; + users.groups.fwupd-refresh = {}; + security.polkit.enable = true; }; diff --git a/nixos/modules/services/hardware/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix index 9466ea26995b8..d05ad3af8b127 100644 --- a/nixos/modules/services/hardware/usbmuxd.nix +++ b/nixos/modules/services/hardware/usbmuxd.nix @@ -77,7 +77,7 @@ in serviceConfig = { # Trigger the udev rule manually. This doesn't require replugging the # device when first enabling the option to get it to work - ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; + ExecStartPre = "${config.systemd.package}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; }; }; diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix index 11b2a5186229b..cea1bc9560815 100644 --- a/nixos/modules/services/mail/listmonk.nix +++ b/nixos/modules/services/mail/listmonk.nix @@ -168,7 +168,7 @@ in { ensureUsers = [{ name = "listmonk"; - ensurePermissions = { "DATABASE listmonk" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; ensureDatabases = [ "listmonk" ]; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 22a4e3c451ab1..4e29f567ed92c 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -179,14 +179,22 @@ in }; }; + assertions = [ + { + assertion = localDB -> cfg.database.username == cfg.database.dbname; + message = '' + When setting up a DB and its owner user, the owner and the DB name must be + equal! + ''; + } + ]; + services.postgresql = mkIf localDB { enable = true; ensureDatabases = [ cfg.database.dbname ]; ensureUsers = [ { name = cfg.database.username; - ensurePermissions = { - "DATABASE ${cfg.database.username}" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index 7a5047b2bea54..04ae46f66eeaf 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -218,7 +218,7 @@ in default = null; example = "/run/keys/sympa-dbpassword"; description = lib.mdDoc '' - A file containing the password for {option}`services.sympa.database.user`. + A file containing the password for {option}`services.sympa.database.name`. ''; }; @@ -342,6 +342,7 @@ in db_type = cfg.database.type; db_name = cfg.database.name; + db_user = cfg.database.name; } // (optionalAttrs (cfg.database.host != null) { db_host = cfg.database.host; @@ -355,9 +356,6 @@ in // (optionalAttrs (cfg.database.port != null) { db_port = cfg.database.port; }) - // (optionalAttrs (cfg.database.user != null) { - db_user = cfg.database.user; - }) // (optionalAttrs (cfg.mta.type == "postfix") { sendmail_aliases = "${dataDir}/sympa_transport"; aliases_program = "${pkgs.postfix}/bin/postmap"; @@ -393,7 +391,7 @@ in users.groups.${group} = {}; assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.sympa.database.user must be set to ${user} if services.sympa.database.createLocally is set to true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -579,7 +577,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/matrix/matrix-sliding-sync.nix b/nixos/modules/services/matrix/matrix-sliding-sync.nix index 9807cde409197..84bb38f35aeb0 100644 --- a/nixos/modules/services/matrix/matrix-sliding-sync.nix +++ b/nixos/modules/services/matrix/matrix-sliding-sync.nix @@ -74,9 +74,9 @@ in services.postgresql = lib.optionalAttrs cfg.createDatabase { enable = true; ensureDatabases = [ "matrix-sliding-sync" ]; - ensureUsers = [ rec { + ensureUsers = [ { name = "matrix-sliding-sync"; - ensurePermissions."DATABASE \"${name}\"" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 671040500df84..d7cf024bb8077 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -135,9 +135,7 @@ in { ensureDatabases = ["mautrix-facebook"]; ensureUsers = [{ name = "mautrix-facebook"; - ensurePermissions = { - "DATABASE \"mautrix-facebook\"" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 0be79e759c319..02e44c73d87a6 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -33,19 +33,22 @@ in { }; config = mkIf cfg.enable { + # See https://github.com/aws/amazon-ssm-agent/blob/mainline/packaging/linux/amazon-ssm-agent.service systemd.services.amazon-ssm-agent = { inherit (cfg.package.meta) description; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = [ fake-lsb-release pkgs.coreutils ]; + serviceConfig = { ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; KillMode = "process"; # We want this restating pretty frequently. It could be our only means # of accessing the instance. Restart = "always"; - RestartSec = "1min"; + RestartPreventExitStatus = 194; + RestartSec = "90"; }; }; @@ -70,7 +73,7 @@ in { group = "ssm-user"; }; - environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template"; + environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/etc/amazon/ssm/seelog.xml.template"; environment.etc."amazon/ssm/amazon-ssm-agent.json".source = "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template"; diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index 8d2c1b5242ffa..2d6ffc510ce55 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -73,9 +73,7 @@ in enable = true; ensureUsers = [{ name = "atuin"; - ensurePermissions = { - "DATABASE atuin" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; }]; ensureDatabases = [ "atuin" ]; }; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 55ab15ff003d1..723b67e8bb6bc 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -74,7 +74,7 @@ in config = mkIf cfg.enable { - boot.kernelModules = [ "autofs4" ]; + boot.kernelModules = [ "autofs" ]; systemd.services.autofs = { description = "Automounts filesystems on demand"; diff --git a/nixos/modules/services/misc/forgejo.md b/nixos/modules/services/misc/forgejo.md new file mode 100644 index 0000000000000..3df8bc20976ad --- /dev/null +++ b/nixos/modules/services/misc/forgejo.md @@ -0,0 +1,79 @@ +# Forgejo {#module-forgejo} + +Forgejo is a soft-fork of gitea, with strong community focus, as well +as on self-hosting and federation. [Codeberg](https://codeberg.org) is +deployed from it. + +See [upstream docs](https://forgejo.org/docs/latest/). + +The method of choice for running forgejo is using [`services.forgejo`](#opt-services.forgejo.enable). + +::: {.warning} +Running forgejo using `services.gitea.package = pkgs.forgejo` is no longer +recommended. +If you experience issues with your instance using `services.gitea`, +**DO NOT** report them to the `services.gitea` module maintainers. +**DO** report them to the `services.forgejo` module maintainers instead. +::: + +## Migration from Gitea {#module-forgejo-migration-gitea} + +::: {.note} +Migrating is, while not strictly necessary at this point, highly recommended. +Both modules and projects are likely to divide further with each release. +Which might lead to an even more involved migration. +::: + +### Full-Migration {#module-forgejo-migration-gitea-default} + +This will migrate the state directory (data), rename and chown the database and +delete the gitea user. + +::: {.note} +This will also change the git remote ssh-url user from `gitea@` to `forgejo@`, +when using the host's openssh server (default) instead of the integrated one. +::: + +Instructions for PostgreSQL (default). Adapt accordingly for other databases: + +```sh +systemctl stop gitea +mv /var/lib/gitea /var/lib/forgejo +runuser -u postgres -- psql -c ' + ALTER USER gitea RENAME TO forgejo; + ALTER DATABASE gitea RENAME TO forgejo; +' +nixos-rebuild switch +systemctl stop forgejo +chown -R forgejo:forgejo /var/lib/forgejo +systemctl restart forgejo +``` + +### Alternatively, keeping the gitea user {#module-forgejo-migration-gitea-impersonate} + +Alternatively, instead of renaming the database, copying the state folder and +changing the user, the forgejo module can be set up to re-use the old storage +locations and database, instead of having to copy or rename them. +Make sure to disable `services.gitea`, when doing this. + +```nix +services.gitea.enable = false; + +services.forgejo = { + enable = true; + user = "gitea"; + group = "gitea"; + stateDir = "/var/lib/gitea"; + database.name = "gitea"; + database.user = "gitea"; +}; + +users.users.gitea = { + home = "/var/lib/gitea"; + useDefaultShell = true; + group = "gitea"; + isSystemUser = true; +}; + +users.groups.gitea = {}; +``` diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 90b5f16f4189b..454febda58938 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -357,6 +357,14 @@ in assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; message = "services.forgejo.database.user must match services.forgejo.user if the database is to be automatically provisioned"; } + { assertion = cfg.database.createDatabase && usePostgresql -> cfg.database.user == cfg.database.name; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.forgejo.createDatabase` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.forgejo.settings = { @@ -423,22 +431,11 @@ in ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; - # Work around 'pq: permission denied for schema public' with postgres v15, until a - # solution for `services.postgresql.ensureUsers` is found. - # See https://github.com/NixOS/nixpkgs/issues/216989 - systemd.services.postgresql.postStart = lib.mkIf ( - usePostgresql - && cfg.database.createDatabase - && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" - ) (lib.mkAfter '' - $PSQL -tAc 'ALTER DATABASE "${cfg.database.name}" OWNER TO "${cfg.database.user}";' - ''); - services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) { enable = mkDefault true; package = mkDefault pkgs.mariadb; @@ -677,5 +674,6 @@ in }; }; + meta.doc = ./forgejo.md; meta.maintainers = with lib.maintainers; [ bendlas emilylange ]; } diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 3f690f85d623b..be528a2989918 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -394,6 +394,14 @@ in { assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; message = "services.gitea.database.user must match services.gitea.user if the database is to be automatically provisioned"; } + { assertion = cfg.database.createDatabase && usePostgresql -> cfg.database.user == cfg.database.name; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.gitea.createDatabase` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.gitea.settings = { @@ -461,7 +469,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index a296fd3816bbb..20fa71507b6b0 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -267,7 +267,7 @@ in { assertion = cfg.database.passwordFile != null || cfg.database.socket != null; message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set"; } - { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; + { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user && cfg.database.user == cfg.database.name; message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.socket != null; @@ -315,7 +315,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix index 18c2f5effc5a5..f08d5eb468719 100644 --- a/nixos/modules/services/misc/sourcehut/service.nix +++ b/nixos/modules/services/misc/sourcehut/service.nix @@ -249,10 +249,13 @@ in ensureDatabases = [ srvCfg.postgresql.database ]; ensureUsers = map (name: { inherit name; - ensurePermissions = { "DATABASE \"${srvCfg.postgresql.database}\"" = "ALL PRIVILEGES"; }; + # We don't use it because we have a special default database name with dots. + # TODO(for maintainers of sourcehut): migrate away from custom preStart script. + ensureDBOwnership = false; }) [srvCfg.user]; }; + services.sourcehut.settings = mkMerge [ { "${srv}.sr.ht".origin = mkDefault "https://${srv}.${cfg.settings."sr.ht".global-domain}"; @@ -378,10 +381,11 @@ in extraService ])) extraServices) - # Work around 'pq: permission denied for schema public' with postgres v15, until a - # solution for `services.postgresql.ensureUsers` is found. + # Work around 'pq: permission denied for schema public' with postgres v15. # See https://github.com/NixOS/nixpkgs/issues/216989 # Workaround taken from nixos/forgejo: https://github.com/NixOS/nixpkgs/pull/262741 + # TODO(to maintainers of sourcehut): please migrate away from this workaround + # by migrating away from database name defaults with dots. (lib.mkIf ( cfg.postgresql.enable && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0" diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 5e21407042b6a..f84d677f14d85 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1841,6 +1841,7 @@ in serviceConfig = { WorkingDirectory = cfg.dataDir; User = "grafana"; + Restart = "on-failure"; RuntimeDirectory = "grafana"; RuntimeDirectoryMode = "0755"; # Hardening diff --git a/nixos/modules/services/monitoring/ocsinventory-agent.md b/nixos/modules/services/monitoring/ocsinventory-agent.md new file mode 100644 index 0000000000000..50e246fb6531b --- /dev/null +++ b/nixos/modules/services/monitoring/ocsinventory-agent.md @@ -0,0 +1,33 @@ +# OCS Inventory Agent {#module-services-ocsinventory-agent} + +[OCS Inventory NG](https://ocsinventory-ng.org/) or Open Computers and Software inventory +is an application designed to help IT administrator to keep track of the hardware and software +configurations of computers that are installed on their network. + +OCS Inventory collects information about the hardware and software of networked machines +through the **OCS Inventory Agent** program. + +This NixOS module enables you to install and configure this agent so that it sends information from your computer to the OCS Inventory server. + +For more technical information about OCS Inventory Agent, refer to [the Wiki documentation](https://wiki.ocsinventory-ng.org/03.Basic-documentation/Setting-up-the-UNIX-agent-manually-on-client-computers/). + + +## Basic Usage {#module-services-ocsinventory-agent-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.ocsinventory-agent = { + enable = true; + settings = { + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + }; +} +``` + +This configuration will periodically run the ocsinventory-agent SystemD service. + +The OCS Inventory Agent will inventory the computer and then sends the results to the specified OCS Inventory Server. diff --git a/nixos/modules/services/monitoring/ocsinventory-agent.nix b/nixos/modules/services/monitoring/ocsinventory-agent.nix new file mode 100644 index 0000000000000..7585ae863750b --- /dev/null +++ b/nixos/modules/services/monitoring/ocsinventory-agent.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.ocsinventory-agent; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } "="; + }; + +in +{ + meta = { + doc = ./ocsinventory-agent.md; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; + + options = { + services.ocsinventory-agent = { + enable = lib.mkEnableOption (lib.mdDoc "OCS Inventory Agent"); + + package = lib.mkPackageOptionMD pkgs "ocsinventory-agent" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + server = lib.mkOption { + type = lib.types.nullOr lib.types.str; + example = "https://ocsinventory.localhost:8080/ocsinventory"; + default = null; + description = lib.mdDoc '' + The URI of the OCS Inventory server where to send the inventory file. + + This option is ignored if {option}`services.ocsinventory-agent.settings.local` is set. + ''; + }; + + local = lib.mkOption { + type = lib.types.nullOr lib.types.path; + example = "/var/lib/ocsinventory-agent/reports"; + default = null; + description = lib.mdDoc '' + If specified, the OCS Inventory Agent will run in offline mode + and the resulting inventory file will be stored in the specified path. + ''; + }; + + ca = lib.mkOption { + type = lib.types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = lib.mdDoc '' + Path to CA certificates file in PEM format, for server + SSL certificate validation. + ''; + }; + + tag = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "01234567890123"; + description = lib.mdDoc "Tag for the generated inventory."; + }; + + debug = lib.mkEnableOption (lib.mdDoc "debug mode"); + }; + }; + default = { }; + example = { + ca = "/etc/ssl/certs/ca-certificates.crt"; + debug = true; + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + description = lib.mdDoc '' + Configuration for /etc/ocsinventory-agent/ocsinventory-agent.cfg. + + Refer to + {manpage}`ocsinventory-agent(1)` for available options. + ''; + }; + + interval = lib.mkOption { + type = lib.types.str; + default = "daily"; + example = "06:00"; + description = lib.mdDoc '' + How often we run the ocsinventory-agent service. Runs by default every daily. + + The format is described in + {manpage}`systemd.time(7)`. + ''; + }; + }; + }; + + config = + let + configFile = settingsFormat.generate "ocsinventory-agent.cfg" cfg.settings; + + in lib.mkIf cfg.enable { + # Path of the configuration file is hard-coded and cannot be changed + # https://github.com/OCSInventory-NG/UnixAgent/blob/v2.10.0/lib/Ocsinventory/Agent/Config.pm#L78 + # + environment.etc."ocsinventory-agent/ocsinventory-agent.cfg".source = configFile; + + systemd.services.ocsinventory-agent = { + description = "OCS Inventory Agent service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + reloadTriggers = [ configFile ]; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + ConfigurationDirectory = "ocsinventory-agent"; + StateDirectory = "ocsinventory-agent"; + }; + }; + + systemd.timers.ocsinventory-agent = { + description = "Launch OCS Inventory Agent regularly"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = cfg.interval; + AccuracySec = "1h"; + RandomizedDelaySec = 240; + Persistent = true; + Unit = "ocsinventory-agent.service"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/parsedmarc.nix b/nixos/modules/services/monitoring/parsedmarc.nix index 44fc359b6a7de..a146e7ab95435 100644 --- a/nixos/modules/services/monitoring/parsedmarc.nix +++ b/nixos/modules/services/monitoring/parsedmarc.nix @@ -301,6 +301,7 @@ in description = lib.mdDoc '' The addresses to send outgoing mail to. ''; + apply = x: if x == [] then null else lib.concatStringsSep "," x; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 305f235054be7..f89522c098646 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -2,8 +2,8 @@ let inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers - mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption - optional types mkOptionDefault flip attrNames; + mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption + optional types mkOptionDefault flip attrNames; cfg = config.services.prometheus.exporters; @@ -20,7 +20,7 @@ let # systemd service must be provided by specifying either # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` - exporterOpts = genAttrs [ + exporterOpts = (genAttrs [ "apcupsd" "artifactory" "bind" @@ -34,14 +34,15 @@ let "domain" "dovecot" "fastly" + "flow" "fritzbox" "graphite" "idrac" "imap-mailstat" "influxdb" "ipmi" - "json" "jitsi" + "json" "junos-czerwonk" "kea" "keylight" @@ -74,9 +75,9 @@ let "scaphandre" "script" "shelly" - "snmp" "smartctl" "smokeping" + "snmp" "sql" "statsd" "surfboard" @@ -88,10 +89,39 @@ let "v2ray" "varnish" "wireguard" - "flow" "zfs" - ] (name: - import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + ] + (name: + import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } + )) // (mapAttrs + (name: params: + import (./. + "/exporters/${params.name}.nix") { inherit config lib pkgs options; type = params.type ; }) + { + exportarr-bazarr = { + name = "exportarr"; + type = "bazarr"; + }; + exportarr-lidarr = { + name = "exportarr"; + type = "lidarr"; + }; + exportarr-prowlarr = { + name = "exportarr"; + type = "prowlarr"; + }; + exportarr-radarr = { + name = "exportarr"; + type = "radarr"; + }; + exportarr-readarr = { + name = "exportarr"; + type = "readarr"; + }; + exportarr-sonarr = { + name = "exportarr"; + type = "sonarr"; + }; + } ); mkExporterOpts = ({ name, port }: { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix b/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix new file mode 100644 index 0000000000000..1322093354109 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/exportarr.nix @@ -0,0 +1,55 @@ +{ config, lib, pkgs, options, type }: + +let + cfg = config.services.prometheus.exporters."exportarr-${type}"; + exportarrEnvironment = ( + lib.mapAttrs (_: toString) cfg.environment + ) // { + PORT = toString cfg.port; + URL = cfg.url; + API_KEY_FILE = lib.mkIf (cfg.apiKeyFile != null) "%d/api-key"; + }; +in +{ + port = 9708; + extraOpts = { + url = lib.mkOption { + type = lib.types.str; + default = "http://127.0.0.1"; + description = lib.mdDoc '' + The full URL to Sonarr, Radarr, or Lidarr. + ''; + }; + + apiKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = lib.mdDoc '' + File containing the api-key. + ''; + }; + + package = lib.mkPackageOptionMD pkgs "exportarr" { }; + + environment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = lib.mdDoc '' + See [the configuration guide](https://github.com/onedr0p/exportarr#configuration) for available options. + ''; + example = { + PROWLARR__BACKFILL = true; + }; + }; + }; + serviceOpts = { + serviceConfig = { + LoadCredential = lib.optionalString (cfg.apiKeyFile != null) "api-key:${cfg.apiKeyFile}"; + ExecStart = ''${cfg.package}/bin/exportarr ${type} "$@"''; + ProcSubset = "pid"; + ProtectProc = "invisible"; + SystemCallFilter = ["@system-service" "~@privileged"]; + }; + environment = exportarrEnvironment; + }; +} diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index e6d8afc66624f..db8641aa61461 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -1,14 +1,37 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + collect + concatLists + concatStringsSep + flip + getAttrFromPath + hasPrefix + isList + length + literalExpression + literalMD + mapAttrsRecursiveCond + mapAttrsToList + mdDoc + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOptionMD + optional + optionalAttrs + optionalString + types + ; + cfg = config.services.thanos; nullOpt = type: description: mkOption { type = types.nullOr type; default = null; - description = lib.mdDoc description; + description = mdDoc description; }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; @@ -32,7 +55,7 @@ let option = mkOption { type = types.bool; default = false; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -41,7 +64,7 @@ let option = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -50,7 +73,7 @@ let option = mkOption { type = types.attrsOf types.str; default = {}; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -59,7 +82,7 @@ let option = mkOption { type = types.str; inherit default; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -86,7 +109,7 @@ let defaultText = literalMD '' calculated from `config.services.thanos.${cmd}` ''; - description = lib.mdDoc '' + description = mdDoc '' Arguments to the `thanos ${cmd}` command. Defaults to a list of arguments formed by converting the structured @@ -127,10 +150,10 @@ let if config.services.thanos.<cmd>.tracing.config == null then null else toString (toYAML "tracing.yaml" config.services.thanos.<cmd>.tracing.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains tracing configuration. - See format details: <https://thanos.io/tracing.md/#configuration> + See format details: <https://thanos.io/tip/thanos/tracing.md/#configuration> ''; }; }; @@ -147,7 +170,7 @@ let If {option}`tracing.config-file` is set this option has no effect. - See format details: <https://thanos.io/tracing.md/#configuration> + See format details: <https://thanos.io/tip/thanos/tracing.md/#configuration> ''; }; }; @@ -192,10 +215,10 @@ let if config.services.thanos.<cmd>.objstore.config == null then null else toString (toYAML "objstore.yaml" config.services.thanos.<cmd>.objstore.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains object store configuration. - See format details: <https://thanos.io/storage.md/#configuration> + See format details: <https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage> ''; }; }; @@ -212,7 +235,7 @@ let If {option}`objstore.config-file` is set this option has no effect. - See format details: <https://thanos.io/storage.md/#configuration> + See format details: <https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage> ''; }; }; @@ -231,7 +254,7 @@ let type = types.str; default = "/var/lib/${config.services.prometheus.stateDir}/data"; defaultText = literalExpression ''"/var/lib/''${config.services.prometheus.stateDir}/data"''; - description = lib.mdDoc '' + description = mdDoc '' Data directory of TSDB. ''; }; @@ -266,14 +289,14 @@ let Maximum size of concurrently allocatable bytes for chunks. ''; - store.grpc.series-sample-limit = mkParamDef types.int 0 '' - Maximum amount of samples returned via a single Series call. + store.limits.request-samples = mkParamDef types.int 0 '' + The maximum samples allowed for a single Series request. + The Series call fails if this limit is exceeded. `0` means no limit. - NOTE: for efficiency we take 120 as the number of samples in chunk (it - cannot be bigger than that), so the actual number of samples might be - lower, even though the maximum could be hit. + NOTE: For efficiency the limit is internally implemented as 'chunks limit' + considering each chunk contains a maximum of 120 samples. ''; store.grpc.series-max-concurrency = mkParamDef types.int 20 '' @@ -371,24 +394,25 @@ let Maximum number of queries processed concurrently by query node. ''; - query.replica-label = mkParam types.str '' - Label to treat as a replica indicator along which data is + query.replica-labels = mkAttrsParam "query.replica-label" '' + Labels to treat as a replica indicator along which data is + deduplicated. Still you will be able to query without deduplication using - `dedup=false` parameter. + 'dedup=false' parameter. Data includes time series, recording + rules, and alerting rules. ''; selector-labels = mkAttrsParam "selector-label" '' Query selector labels that will be exposed in info endpoint. ''; - store.addresses = mkListParam "store" '' - Addresses of statically configured store API servers. + endpoints = mkListParam "endpoint" '' + Addresses of statically configured Thanos API servers (repeatable). - The scheme may be prefixed with `dns+` or - `dnssrv+` to detect store API servers through - respective DNS lookups. + The scheme may be prefixed with 'dns+' or 'dnssrv+' to detect + Thanos API servers through respective DNS lookups. ''; store.sd-files = mkListParam "store.sd-files" '' @@ -430,6 +454,12 @@ let ''; }; + query-frontend = params.common cfg.query-frontend // { + query-frontend.downstream-url = mkParamDef types.str "http://localhost:9090" '' + URL of downstream Prometheus Query compatible API. + ''; + }; + rule = params.common cfg.rule // params.objstore cfg.rule // { labels = mkAttrsParam "label" '' @@ -447,7 +477,7 @@ let Rule files that should be used by rule manager. Can be in glob format. ''; - eval-interval = mkParamDef types.str "30s" '' + eval-interval = mkParamDef types.str "1m" '' The default evaluation interval to use. ''; @@ -597,10 +627,6 @@ let to render all samples for a human eye anyway ''; - block-sync-concurrency = mkParamDef types.int 20 '' - Number of goroutines to use when syncing block metadata from object storage. - ''; - compact.concurrency = mkParamDef types.int 1 '' Number of goroutines to use when compacting groups. ''; @@ -625,7 +651,7 @@ let Data directory relative to `/var/lib` of TSDB. ''; - labels = mkAttrsParam "labels" '' + labels = mkAttrsParam "label" '' External labels to announce. This flag will be removed in the future when handling multiple tsdb @@ -656,57 +682,56 @@ in { options.services.thanos = { - package = mkOption { - type = types.package; - default = pkgs.thanos; - defaultText = literalExpression "pkgs.thanos"; - description = lib.mdDoc '' - The thanos package that should be used. - ''; - }; + package = mkPackageOptionMD pkgs "thanos" {}; sidecar = paramsToOptions params.sidecar // { enable = mkEnableOption - (lib.mdDoc "the Thanos sidecar for Prometheus server"); + (mdDoc "the Thanos sidecar for Prometheus server"); arguments = mkArgumentsOption "sidecar"; }; store = paramsToOptions params.store // { enable = mkEnableOption - (lib.mdDoc "the Thanos store node giving access to blocks in a bucket provider."); + (mdDoc "the Thanos store node giving access to blocks in a bucket provider."); arguments = mkArgumentsOption "store"; }; query = paramsToOptions params.query // { enable = mkEnableOption - (lib.mdDoc ("the Thanos query node exposing PromQL enabled Query API " + + (mdDoc ("the Thanos query node exposing PromQL enabled Query API " + "with data retrieved from multiple store nodes")); arguments = mkArgumentsOption "query"; }; + query-frontend = paramsToOptions params.query-frontend // { + enable = mkEnableOption + (mdDoc ("the Thanos query frontend implements a service deployed in front of queriers to + improve query parallelization and caching.")); + arguments = mkArgumentsOption "query-frontend"; + }; + rule = paramsToOptions params.rule // { enable = mkEnableOption - (lib.mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + + (mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + " given Query nodes, exposing Store API and storing old blocks in bucket")); arguments = mkArgumentsOption "rule"; }; compact = paramsToOptions params.compact // { enable = mkEnableOption - (lib.mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); + (mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); arguments = mkArgumentsOption "compact"; }; downsample = paramsToOptions params.downsample // { enable = mkEnableOption - (lib.mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); + (mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); arguments = mkArgumentsOption "downsample"; }; receive = paramsToOptions params.receive // { enable = mkEnableOption - (lib.mdDoc ("the Thanos receiver which accept Prometheus remote write API requests " + - "and write to local tsdb (EXPERIMENTAL, this may change drastically without notice)")); + (mdDoc ("the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb")); arguments = mkArgumentsOption "receive"; }; }; @@ -736,6 +761,7 @@ in { User = "prometheus"; Restart = "always"; ExecStart = thanos "sidecar"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -751,6 +777,7 @@ in { StateDirectory = cfg.store.stateDir; Restart = "always"; ExecStart = thanos "store"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -764,6 +791,20 @@ in { DynamicUser = true; Restart = "always"; ExecStart = thanos "query"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }) + + (mkIf cfg.query-frontend.enable { + systemd.services.thanos-query-frontend = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = thanos "query-frontend"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -779,6 +820,7 @@ in { StateDirectory = cfg.rule.stateDir; Restart = "always"; ExecStart = thanos "rule"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -797,6 +839,7 @@ in { DynamicUser = true; StateDirectory = cfg.compact.stateDir; ExecStart = thanos "compact"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; } // optionalAttrs (!wait) { inherit (cfg.compact) startAt; }; } @@ -813,6 +856,7 @@ in { StateDirectory = cfg.downsample.stateDir; Restart = "always"; ExecStart = thanos "downsample"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -829,6 +873,7 @@ in { StateDirectory = cfg.receive.stateDir; Restart = "always"; ExecStart = thanos "receive"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } diff --git a/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixos/modules/services/monitoring/zabbix-proxy.nix index 85da416ba6c33..503e81b48a587 100644 --- a/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -203,7 +203,7 @@ in { assertion = !config.services.zabbixServer.enable; message = "Please choose one of services.zabbixServer or services.zabbixProxy."; } - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.zabbixProxy.database.user must be set to ${user} if services.zabbixProxy.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -252,7 +252,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 2b50280e3969a..0607188d21319 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -191,7 +191,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.user == cfg.database.name; message = "services.zabbixServer.database.user must be set to ${user} if services.zabbixServer.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -240,7 +240,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/networking/centrifugo.nix b/nixos/modules/services/networking/centrifugo.nix new file mode 100644 index 0000000000000..143fe6a24dc38 --- /dev/null +++ b/nixos/modules/services/networking/centrifugo.nix @@ -0,0 +1,123 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.centrifugo; + + settingsFormat = pkgs.formats.json { }; + + configFile = settingsFormat.generate "centrifugo.json" cfg.settings; +in +{ + options.services.centrifugo = { + enable = lib.mkEnableOption (lib.mdDoc "Centrifugo messaging server"); + + package = lib.mkPackageOptionMD pkgs "centrifugo" { }; + + settings = lib.mkOption { + type = settingsFormat.type; + default = { }; + description = lib.mdDoc '' + Declarative Centrifugo configuration. See the [Centrifugo + documentation] for a list of options. + + [Centrifugo documentation]: https://centrifugal.dev/docs/server/configuration + ''; + }; + + credentials = lib.mkOption { + type = lib.types.attrsOf lib.types.path; + default = { }; + example = { + CENTRIFUGO_UNI_GRPC_TLS_KEY = "/run/keys/centrifugo-uni-grpc-tls.key"; + }; + description = lib.mdDoc '' + Environment variables with absolute paths to credentials files to load + on service startup. + ''; + }; + + environmentFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = lib.mdDoc '' + Files to load environment variables from. Options set via environment + variables take precedence over {option}`settings`. + + See the [Centrifugo documentation] for the environment variable name + format. + + [Centrifugo documentation]: https://centrifugal.dev/docs/server/configuration#os-environment-variables + ''; + }; + + extraGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "redis-centrifugo" ]; + description = lib.mdDoc '' + Additional groups for the systemd service. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.centrifugo = { + description = "Centrifugo messaging server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Type = "exec"; + + ExecStartPre = "${lib.getExe cfg.package} checkconfig --config ${configFile}"; + ExecStart = "${lib.getExe cfg.package} --config ${configFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + Restart = "always"; + RestartSec = "1s"; + + # Copy files to the credentials directory with file name being the + # environment variable name. Note that "%d" specifier expands to the + # path of the credentials directory. + LoadCredential = lib.mapAttrsToList (name: value: "${name}:${value}") cfg.credentials; + Environment = lib.mapAttrsToList (name: _: "${name}=%d/${name}") cfg.credentials; + + EnvironmentFile = cfg.environmentFiles; + + SupplementaryGroups = cfg.extraGroups; + + DynamicUser = true; + UMask = "0077"; + + ProtectHome = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectClock = true; + ProtectHostname = true; + ProtectControlGroups = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + PrivateUsers = true; + PrivateDevices = true; + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + DeviceAllow = [ "" ]; + DevicePolicy = "closed"; + CapabilityBoundingSet = [ "" ]; + MemoryDenyWriteExecute = true; + LockPersonality = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/firewall-iptables.nix b/nixos/modules/services/networking/firewall-iptables.nix index 63e952194d671..e900868387203 100644 --- a/nixos/modules/services/networking/firewall-iptables.nix +++ b/nixos/modules/services/networking/firewall-iptables.nix @@ -301,6 +301,7 @@ in } ]; + environment.systemPackages = [ pkgs.nixos-firewall-tool ]; networking.firewall.checkReversePath = mkIf (!kernelHasRPFilter) (mkDefault false); systemd.services.firewall = { diff --git a/nixos/modules/services/networking/harmonia.nix b/nixos/modules/services/networking/harmonia.nix index 144fa6c708e28..4733165cf7d19 100644 --- a/nixos/modules/services/networking/harmonia.nix +++ b/nixos/modules/services/networking/harmonia.nix @@ -28,6 +28,8 @@ in }; config = lib.mkIf cfg.enable { + nix.settings.extra-allowed-users = [ "harmonia" ]; + systemd.services.harmonia = { description = "harmonia binary cache service"; diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index d9d2e4264dfd1..07a3788abf7d2 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup doSub() { diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 99ffbf56ccb00..8c7d5237971f3 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -65,7 +65,9 @@ with lib; pkgs.iproute2 # Needed for ping "/run/wrappers" - ]; + # See https://github.com/NixOS/nixpkgs/issues/262681 + ] ++ (lib.optional config.networking.resolvconf.enable + config.networking.resolvconf.package); startLimitBurst = 5; startLimitIntervalSec = 20; serviceConfig = { diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index b8b76120e44f6..02b8979bd8bc7 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -6,7 +6,7 @@ let in { meta = { - maintainers = [ maintainers.rizary ]; + maintainers = [ maintainers.rizary maintainers.zimbatm ]; }; options = { services.nar-serve = { diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index afd721e34da5a..3f10145033c55 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -9,6 +9,7 @@ let stateDir = cfg.directory; driftFile = "${stateDir}/chrony.drift"; keyFile = "${stateDir}/chrony.keys"; + rtcFile = "${stateDir}/chrony.rtc"; configFile = pkgs.writeText "chrony.conf" '' ${concatMapStringsSep "\n" (server: "server " + server + " " + cfg.serverOption + optionalString (cfg.enableNTS) " nts") cfg.servers} @@ -20,8 +21,10 @@ let driftfile ${driftFile} keyfile ${keyFile} + ${optionalString (cfg.enableRTCTrimming) "rtcfile ${rtcFile}"} ${optionalString (cfg.enableNTS) "ntsdumpdir ${stateDir}"} + ${optionalString (cfg.enableRTCTrimming) "rtcautotrim ${builtins.toString cfg.autotrimThreshold}"} ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} ${cfg.extraConfig} @@ -85,6 +88,33 @@ in ''; }; + enableRTCTrimming = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Enable tracking of the RTC offset to the system clock and automatic trimming. + See also [](#opt-services.chrony.autotrimThreshold) + + ::: {.note} + This is not compatible with the `rtcsync` directive, which naively syncs the RTC time every 11 minutes. + + Tracking the RTC drift will allow more precise timekeeping, + especially on intermittently running devices, where the RTC is very relevant. + ::: + ''; + }; + + autotrimThreshold = mkOption { + type = types.ints.positive; + default = 30; + example = 10; + description = '' + Maximum estimated error threshold for the `rtcautotrim` command. + When reached, the RTC will be trimmed. + Only used when [](#opt-services.chrony.enableRTCTrimming) is enabled. + ''; + }; + enableNTS = mkOption { type = types.bool; default = false; @@ -132,7 +162,7 @@ in }; extraFlags = mkOption { - default = []; + default = [ ]; example = [ "-s" ]; type = types.listOf types.str; description = lib.mdDoc "Extra flags passed to the chronyd command."; @@ -141,14 +171,15 @@ in }; config = mkIf cfg.enable { - meta.maintainers = with lib.maintainers; [ thoughtpolice ]; + meta.maintainers = with lib.maintainers; [ thoughtpolice vifino ]; environment.systemPackages = [ chronyPkg ]; users.groups.chrony.gid = config.ids.gids.chrony; users.users.chrony = - { uid = config.ids.uids.chrony; + { + uid = config.ids.uids.chrony; group = "chrony"; description = "chrony daemon user"; home = stateDir; @@ -156,21 +187,29 @@ in services.timesyncd.enable = mkForce false; + # If chrony controls and tracks the RTC, writing it externally causes clock error. + systemd.services.save-hwclock = lib.mkIf cfg.enableRTCTrimming { + enable = lib.mkForce false; + }; + systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; }; systemd.tmpfiles.rules = [ "d ${stateDir} 0750 chrony chrony - -" "f ${driftFile} 0640 chrony chrony - -" "f ${keyFile} 0640 chrony chrony - -" + ] ++ lib.optionals cfg.enableRTCTrimming [ + "f ${rtcFile} 0640 chrony chrony - -" ]; systemd.services.chronyd = - { description = "chrony NTP daemon"; + { + description = "chrony NTP daemon"; wantedBy = [ "multi-user.target" ]; - wants = [ "time-sync.target" ]; - before = [ "time-sync.target" ]; - after = [ "network.target" "nss-lookup.target" ]; + wants = [ "time-sync.target" ]; + before = [ "time-sync.target" ]; + after = [ "network.target" "nss-lookup.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; path = [ chronyPkg ]; @@ -218,5 +257,18 @@ in SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "@chown" ]; }; }; + + assertions = [ + { + assertion = !(cfg.enableRTCTrimming && builtins.any (line: (builtins.match "^ *rtcsync" line) != null) (lib.strings.splitString "\n" cfg.extraConfig)); + message = '' + The chrony module now configures `rtcfile` and `rtcautotrim` for you. + These options conflict with `rtcsync` and cause chrony to crash. + Unless you are very sure the former isn't what you want, please remove + `rtcsync` from `services.chrony.extraConfig`. + Alternatively, disable this behaviour by `services.chrony.enableRTCTrimming = false;` + ''; + } + ]; }; } diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix index f410be4716466..1f47a1d0b631d 100644 --- a/nixos/modules/services/networking/pixiecore.nix +++ b/nixos/modules/services/networking/pixiecore.nix @@ -16,7 +16,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. + Open ports (67, 69, 4011 UDP and 'port', 'statusPort' TCP) in the firewall for Pixiecore. ''; }; @@ -103,8 +103,8 @@ in }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 4011 cfg.port cfg.statusPort ]; - allowedUDPPorts = [ 67 69 ]; + allowedTCPPorts = [ cfg.port cfg.statusPort ]; + allowedUDPPorts = [ 67 69 4011 ]; }; systemd.services.pixiecore = { diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 914cd7f320c9b..f93bcf19f2b30 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -176,7 +176,7 @@ in serviceConfig = { PIDFile="/run/squid.pid"; ExecStart = "${cfg.package}/bin/squid --foreground -YCs -f ${squidConfig}"; - ExecReload="kill -HUP $MAINPID"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillMode="mixed"; NotifyAccess="all"; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index bdcdaf056d038..6d9af6141f12c 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -666,7 +666,9 @@ in { ${cfg.package}/bin/syncthing \ -no-browser \ -gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \ - -home=${cfg.configDir} ${escapeShellArgs cfg.extraFlags} + -config=${cfg.configDir} \ + -data=${cfg.dataDir} \ + ${escapeShellArgs cfg.extraFlags} ''; MemoryDenyWriteExecute = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 0426dbb0c83c3..b6579af10a793 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -166,7 +166,7 @@ in { services.unbound.settings = { server = { directory = mkDefault cfg.stateDir; - username = cfg.user; + username = ''""''; chroot = ''""''; pidfile = ''""''; # when running under systemd there is no need to daemonize @@ -245,14 +245,13 @@ in { NotifyAccess = "main"; Type = "notify"; - # FIXME: Which of these do we actually need, can we drop the chroot flag? AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" # needed if ip-transparent is set to true + ]; + CapabilityBoundingSet = [ + "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" - "CAP_SETGID" - "CAP_SETUID" - "CAP_SYS_CHROOT" - "CAP_SYS_RESOURCE" ]; User = cfg.user; @@ -266,22 +265,19 @@ in { ProtectControlGroups = true; ProtectKernelModules = true; ProtectSystem = "strict"; + ProtectClock = true; + ProtectHostname = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelTunables = true; RuntimeDirectory = "unbound"; ConfigurationDirectory = "unbound"; StateDirectory = "unbound"; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" "AF_UNIX" ]; RestrictRealtime = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ - "~@clock" - "@cpu-emulation" - "@debug" - "@keyring" - "@module" - "mount" - "@obsolete" - "@resources" - ]; + SystemCallFilter = [ "@system-service" ]; RestrictNamespaces = true; LockPersonality = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 6b68371098065..537a4db95ca70 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -1,60 +1,61 @@ { config, options, lib, pkgs, utils, ... }: -with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; - cmd = '' - @${cfg.jrePackage}/bin/java java \ - ${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") - ("--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED " - + "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED " - + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED")} \ - ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ - ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ - -jar ${stateDir}/lib/ace.jar - ''; + cmd = lib.escapeShellArgs ([ "@${cfg.jrePackage}/bin/java" "java" ] + ++ lib.optionals (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") [ + "--add-opens=java.base/java.lang=ALL-UNNAMED" + "--add-opens=java.base/java.time=ALL-UNNAMED" + "--add-opens=java.base/sun.security.util=ALL-UNNAMED" + "--add-opens=java.base/java.io=ALL-UNNAMED" + "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" + ] + ++ (lib.optional (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m") + ++ (lib.optional (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m") + ++ cfg.extraJvmOptions + ++ [ "-jar" "${stateDir}/lib/ace.jar" ]); in { options = { - services.unifi.enable = mkOption { - type = types.bool; + services.unifi.enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether or not to enable the unifi controller service. ''; }; - services.unifi.jrePackage = mkOption { - type = types.package; + services.unifi.jrePackage = lib.mkOption { + type = lib.types.package; default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; - defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; + defaultText = lib.literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; }; - services.unifi.unifiPackage = mkOption { - type = types.package; + services.unifi.unifiPackage = lib.mkOption { + type = lib.types.package; default = pkgs.unifi5; - defaultText = literalExpression "pkgs.unifi5"; + defaultText = lib.literalExpression "pkgs.unifi5"; description = lib.mdDoc '' The unifi package to use. ''; }; - services.unifi.mongodbPackage = mkOption { - type = types.package; + services.unifi.mongodbPackage = lib.mkOption { + type = lib.types.package; default = pkgs.mongodb-4_4; - defaultText = literalExpression "pkgs.mongodb"; + defaultText = lib.literalExpression "pkgs.mongodb"; description = lib.mdDoc '' The mongodb package to use. Please note: unifi7 officially only supports mongodb up until 3.6 but works with 4.4. ''; }; - services.unifi.openFirewall = mkOption { - type = types.bool; + services.unifi.openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether or not to open the minimum required ports on the firewall. @@ -65,8 +66,8 @@ in ''; }; - services.unifi.initialJavaHeapSize = mkOption { - type = types.nullOr types.int; + services.unifi.initialJavaHeapSize = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 1024; description = lib.mdDoc '' @@ -75,8 +76,8 @@ in ''; }; - services.unifi.maximumJavaHeapSize = mkOption { - type = types.nullOr types.int; + services.unifi.maximumJavaHeapSize = lib.mkOption { + type = with lib.types; nullOr int; default = null; example = 4096; description = lib.mdDoc '' @@ -85,9 +86,18 @@ in ''; }; + services.unifi.extraJvmOptions = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + example = lib.literalExpression ''["-Xlog:gc"]''; + description = lib.mdDoc '' + Set extra options to pass to the JVM. + ''; + }; + }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.unifi = { isSystemUser = true; @@ -97,7 +107,7 @@ in }; users.groups.unifi = {}; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { # https://help.ubnt.com/hc/en-us/articles/218506997 allowedTCPPorts = [ 8080 # Port for UAP to inform controller. @@ -123,8 +133,8 @@ in serviceConfig = { Type = "simple"; - ExecStart = "${(removeSuffix "\n" cmd)} start"; - ExecStop = "${(removeSuffix "\n" cmd)} stop"; + ExecStart = "${cmd} start"; + ExecStop = "${cmd} stop"; Restart = "on-failure"; TimeoutSec = "5min"; User = "unifi"; @@ -166,7 +176,7 @@ in StateDirectory = "unifi"; RuntimeDirectory = "unifi"; LogsDirectory = "unifi"; - CacheDirectory= "unifi"; + CacheDirectory = "unifi"; TemporaryFileSystem = [ # required as we want to create bind mounts below @@ -176,7 +186,7 @@ in # We must create the binary directories as bind mounts instead of symlinks # This is because the controller resolves all symlinks to absolute paths # to be used as the working directory. - BindPaths = [ + BindPaths = [ "/var/log/unifi:${stateDir}/logs" "/run/unifi:${stateDir}/run" "${cfg.unifiPackage}/dl:${stateDir}/dl" @@ -194,7 +204,7 @@ in }; imports = [ - (mkRemovedOptionModule [ "services" "unifi" "dataDir" ] "You should move contents of dataDir to /var/lib/unifi/data" ) - (mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ]) + (lib.mkRemovedOptionModule [ "services" "unifi" "dataDir" ] "You should move contents of dataDir to /var/lib/unifi/data") + (lib.mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ]) ]; } diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix deleted file mode 100644 index a5e132d5c38db..0000000000000 --- a/nixos/modules/services/search/kibana.nix +++ /dev/null @@ -1,213 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.kibana; - opt = options.services.kibana; - - ge7 = builtins.compareVersions cfg.package.version "7" >= 0; - lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0; - - cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( - (filterAttrsRecursive (n: v: v != null && v != []) ({ - server.host = cfg.listenAddress; - server.port = cfg.port; - server.ssl.certificate = cfg.cert; - server.ssl.key = cfg.key; - - kibana.index = cfg.index; - kibana.defaultAppId = cfg.defaultAppId; - - elasticsearch.url = cfg.elasticsearch.url; - elasticsearch.hosts = cfg.elasticsearch.hosts; - elasticsearch.username = cfg.elasticsearch.username; - elasticsearch.password = cfg.elasticsearch.password; - - elasticsearch.ssl.certificate = cfg.elasticsearch.cert; - elasticsearch.ssl.key = cfg.elasticsearch.key; - elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities; - } // cfg.extraConf) - ))); - -in { - options.services.kibana = { - enable = mkEnableOption (lib.mdDoc "kibana service"); - - listenAddress = mkOption { - description = lib.mdDoc "Kibana listening host"; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = lib.mdDoc "Kibana listening port"; - default = 5601; - type = types.port; - }; - - cert = mkOption { - description = lib.mdDoc "Kibana ssl certificate."; - default = null; - type = types.nullOr types.path; - }; - - key = mkOption { - description = lib.mdDoc "Kibana ssl key."; - default = null; - type = types.nullOr types.path; - }; - - index = mkOption { - description = lib.mdDoc "Elasticsearch index to use for saving kibana config."; - default = ".kibana"; - type = types.str; - }; - - defaultAppId = mkOption { - description = lib.mdDoc "Elasticsearch default application id."; - default = "discover"; - type = types.str; - }; - - elasticsearch = { - url = mkOption { - description = lib.mdDoc '' - Elasticsearch url. - - Defaults to `"http://localhost:9200"`. - - Don't set this when using Kibana >= 7.0.0 because it will result in a - configuration error. Use {option}`services.kibana.elasticsearch.hosts` - instead. - ''; - default = null; - type = types.nullOr types.str; - }; - - hosts = mkOption { - description = lib.mdDoc '' - The URLs of the Elasticsearch instances to use for all your queries. - All nodes listed here must be on the same cluster. - - Defaults to `[ "http://localhost:9200" ]`. - - This option is only valid when using kibana >= 6.6. - ''; - default = null; - type = types.nullOr (types.listOf types.str); - }; - - username = mkOption { - description = lib.mdDoc "Username for elasticsearch basic auth."; - default = null; - type = types.nullOr types.str; - }; - - password = mkOption { - description = lib.mdDoc "Password for elasticsearch basic auth."; - default = null; - type = types.nullOr types.str; - }; - - ca = mkOption { - description = lib.mdDoc '' - CA file to auth against elasticsearch. - - It's recommended to use the {option}`certificateAuthorities` option - when using kibana-5.4 or newer. - ''; - default = null; - type = types.nullOr types.path; - }; - - certificateAuthorities = mkOption { - description = lib.mdDoc '' - CA files to auth against elasticsearch. - - Please use the {option}`ca` option when using kibana \< 5.4 - because those old versions don't support setting multiple CA's. - - This defaults to the singleton list [ca] when the {option}`ca` option is defined. - ''; - default = lib.optional (cfg.elasticsearch.ca != null) ca; - defaultText = literalExpression '' - lib.optional (config.${opt.elasticsearch.ca} != null) ca - ''; - type = types.listOf types.path; - }; - - cert = mkOption { - description = lib.mdDoc "Certificate file to auth against elasticsearch."; - default = null; - type = types.nullOr types.path; - }; - - key = mkOption { - description = lib.mdDoc "Key file to auth against elasticsearch."; - default = null; - type = types.nullOr types.path; - }; - }; - - package = mkOption { - description = lib.mdDoc "Kibana package to use"; - default = pkgs.kibana; - defaultText = literalExpression "pkgs.kibana"; - type = types.package; - }; - - dataDir = mkOption { - description = lib.mdDoc "Kibana data directory"; - default = "/var/lib/kibana"; - type = types.path; - }; - - extraConf = mkOption { - description = lib.mdDoc "Kibana extra configuration"; - default = {}; - type = types.attrs; - }; - }; - - config = mkIf (cfg.enable) { - assertions = [ - { - assertion = ge7 -> cfg.elasticsearch.url == null; - message = - "The option services.kibana.elasticsearch.url has been removed when using kibana >= 7.0.0. " + - "Please use option services.kibana.elasticsearch.hosts instead."; - } - { - assertion = lt6_6 -> cfg.elasticsearch.hosts == null; - message = - "The option services.kibana.elasticsearch.hosts is only valid for kibana >= 6.6."; - } - ]; - systemd.services.kibana = { - description = "Kibana Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "elasticsearch.service" ]; - environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; }; - serviceConfig = { - ExecStart = - "${cfg.package}/bin/kibana" + - " --config ${cfgFile}" + - " --path.data ${cfg.dataDir}"; - User = "kibana"; - WorkingDirectory = cfg.dataDir; - }; - }; - - environment.systemPackages = [ cfg.package ]; - - users.users.kibana = { - isSystemUser = true; - description = "Kibana service user"; - home = cfg.dataDir; - createHome = true; - group = "kibana"; - }; - users.groups.kibana = {}; - }; -} diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix index 9a50e79631380..ae79d5545fd76 100644 --- a/nixos/modules/services/search/opensearch.nix +++ b/nixos/modules/services/search/opensearch.nix @@ -72,6 +72,18 @@ in The port to listen on for transport traffic. ''; }; + + options."plugins.security.disabled" = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether to enable the security plugin, + `plugins.security.ssl.transport.keystore_filepath` or + `plugins.security.ssl.transport.server.pemcert_filepath` and + `plugins.security.ssl.transport.client.pemcert_filepath` + must be set for this plugin to be enabled. + ''; + }; }; default = {}; @@ -186,6 +198,13 @@ in shopt -s inherit_errexit # Install plugins + + # remove plugins directory if it is empty. + if [ -z "$(ls -A ${cfg.dataDir}/plugins)" ]; then + rm -r "${cfg.dataDir}/plugins" + fi + + ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins" ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules diff --git a/nixos/modules/services/security/hockeypuck.nix b/nixos/modules/services/security/hockeypuck.nix index 127134bc5dba5..56c13d791920c 100644 --- a/nixos/modules/services/security/hockeypuck.nix +++ b/nixos/modules/services/security/hockeypuck.nix @@ -55,7 +55,7 @@ in { ensureDatabases = [ "hockeypuck" ]; ensureUsers = [{ name = "hockeypuck"; - ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; ``` diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 5cd7ae6ad7db3..58a4b70014977 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -64,7 +64,6 @@ in { path = [ pkg ]; serviceConfig = { User = cfg.user; - Environment = "TZ=${config.time.timeZone}"; ExecStartPre = "${pkgs.coreutils}/bin/install -m644 ${ymlFile} ${configFile}"; ExecStart = "${pkg}/bin/flexget -c ${configFile} daemon start"; ExecStop = "${pkg}/bin/flexget -c ${configFile} daemon stop"; diff --git a/nixos/modules/services/web-apps/code-server.nix b/nixos/modules/services/web-apps/code-server.nix deleted file mode 100644 index 11601f6c30449..0000000000000 --- a/nixos/modules/services/web-apps/code-server.nix +++ /dev/null @@ -1,259 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.services.code-server; - defaultUser = "code-server"; - defaultGroup = defaultUser; -in { - options = { - services.code-server = { - enable = lib.mkEnableOption (lib.mdDoc "code-server"); - - package = lib.mkPackageOptionMD pkgs "code-server" { - example = '' - pkgs.vscode-with-extensions.override { - vscode = pkgs.code-server; - vscodeExtensions = with pkgs.vscode-extensions; [ - bbenoist.nix - dracula-theme.theme-dracula - ]; - } - ''; - }; - - extraPackages = lib.mkOption { - default = [ ]; - description = lib.mdDoc '' - Additional packages to add to the code-server {env}`PATH`. - ''; - example = lib.literalExpression "[ pkgs.go ]"; - type = lib.types.listOf lib.types.package; - }; - - extraEnvironment = lib.mkOption { - type = lib.types.attrsOf lib.types.str; - description = lib.mdDoc '' - Additional environment variables to pass to code-server. - ''; - default = { }; - example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; }; - }; - - extraArguments = lib.mkOption { - default = [ ]; - description = lib.mdDoc '' - Additional arguments to pass to code-server. - ''; - example = lib.literalExpression ''[ "--log=info" ]''; - type = lib.types.listOf lib.types.str; - }; - - host = lib.mkOption { - default = "localhost"; - description = lib.mdDoc '' - The host name or IP address the server should listen to. - ''; - type = lib.types.str; - }; - - port = lib.mkOption { - default = 4444; - description = lib.mdDoc '' - The port the server should listen to. - ''; - type = lib.types.port; - }; - - auth = lib.mkOption { - default = "password"; - description = lib.mdDoc '' - The type of authentication to use. - ''; - type = lib.types.enum [ "none" "password" ]; - }; - - hashedPassword = lib.mkOption { - default = ""; - description = lib.mdDoc '' - Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`. - ''; - type = lib.types.str; - }; - - user = lib.mkOption { - default = defaultUser; - example = "yourUser"; - description = lib.mdDoc '' - The user to run code-server as. - By default, a user named `${defaultUser}` will be created. - ''; - type = lib.types.str; - }; - - group = lib.mkOption { - default = defaultGroup; - example = "yourGroup"; - description = lib.mdDoc '' - The group to run code-server under. - By default, a group named `${defaultGroup}` will be created. - ''; - type = lib.types.str; - }; - - extraGroups = lib.mkOption { - default = [ ]; - description = lib.mdDoc '' - An array of additional groups for the `${defaultUser}` user. - ''; - example = [ "docker" ]; - type = lib.types.listOf lib.types.str; - }; - - socket = lib.mkOption { - default = null; - example = "/run/code-server/socket"; - description = lib.mdDoc '' - Path to a socket (bind-addr will be ignored). - ''; - type = lib.types.nullOr lib.types.str; - }; - - socketMode = lib.mkOption { - default = null; - description = lib.mdDoc '' - File mode of the socket. - ''; - type = lib.types.nullOr lib.types.str; - }; - - userDataDir = lib.mkOption { - default = null; - description = lib.mdDoc '' - Path to the user data directory. - ''; - type = lib.types.nullOr lib.types.str; - }; - - extensionsDir = lib.mkOption { - default = null; - description = lib.mdDoc '' - Path to the extensions directory. - ''; - type = lib.types.nullOr lib.types.str; - }; - - proxyDomain = lib.mkOption { - default = null; - example = "code-server.lan"; - description = lib.mdDoc '' - Domain used for proxying ports. - ''; - type = lib.types.nullOr lib.types.str; - }; - - disableTelemetry = lib.mkOption { - default = false; - example = true; - description = lib.mdDoc '' - Disable telemetry. - ''; - type = lib.types.bool; - }; - - disableUpdateCheck = lib.mkOption { - default = false; - example = true; - description = lib.mdDoc '' - Disable update check. - Without this flag, code-server checks every 6 hours against the latest github release and - then notifies you once every week that a new release is available. - ''; - type = lib.types.bool; - }; - - disableFileDownloads = lib.mkOption { - default = false; - example = true; - description = lib.mdDoc '' - Disable file downloads from Code. - ''; - type = lib.types.bool; - }; - - disableWorkspaceTrust = lib.mkOption { - default = false; - example = true; - description = lib.mdDoc '' - Disable Workspace Trust feature. - ''; - type = lib.types.bool; - }; - - disableGettingStartedOverride = lib.mkOption { - default = false; - example = true; - description = lib.mdDoc '' - Disable the coder/coder override in the Help: Getting Started page. - ''; - type = lib.types.bool; - }; - - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.code-server = { - description = "Code server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; - path = cfg.extraPackages; - environment = { - HASHED_PASSWORD = cfg.hashedPassword; - } // cfg.extraEnvironment; - serviceConfig = { - ExecStart = '' - ${lib.getExe cfg.package} \ - --auth=${cfg.auth} \ - --bind-addr=${cfg.host}:${toString cfg.port} \ - '' + lib.optionalString (cfg.socket != null) '' - --socket=${cfg.socket} \ - '' + lib.optionalString (cfg.userDataDir != null) '' - --user-data-dir=${cfg.userDataDir} \ - '' + lib.optionalString (cfg.extensionsDir != null) '' - --extensions-dir=${cfg.extensionsDir} \ - '' + lib.optionalString (cfg.disableTelemetry == true) '' - --disable-telemetry \ - '' + lib.optionalString (cfg.disableUpdateCheck == true) '' - --disable-update-check \ - '' + lib.optionalString (cfg.disableFileDownloads == true) '' - --disable-file-downloads \ - '' + lib.optionalString (cfg.disableWorkspaceTrust == true) '' - --disable-workspace-trust \ - '' + lib.optionalString (cfg.disableGettingStartedOverride == true) '' - --disable-getting-started-override \ - '' + lib.escapeShellArgs cfg.extraArguments; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - RuntimeDirectory = cfg.user; - User = cfg.user; - Group = cfg.group; - Restart = "on-failure"; - }; - }; - - users.users."${cfg.user}" = lib.mkMerge [ - (lib.mkIf (cfg.user == defaultUser) { - isNormalUser = true; - description = "code-server user"; - inherit (cfg) group; - }) - { - packages = cfg.extraPackages; - inherit (cfg) extraGroups; - } - ]; - - users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { }; - }; - - meta.maintainers = [ lib.maintainers.stackshadow ]; -} diff --git a/nixos/modules/services/web-apps/coder.nix b/nixos/modules/services/web-apps/coder.nix index 469a29bc3aa8c..f65211308c402 100644 --- a/nixos/modules/services/web-apps/coder.nix +++ b/nixos/modules/services/web-apps/coder.nix @@ -149,8 +149,8 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.username == name; - message = "services.coder.database.username must be set to ${user} if services.coder.database.createLocally is set true"; + { assertion = cfg.database.createLocally -> cfg.database.username == name && cfg.database.database == cfg.database.username; + message = "services.coder.database.username must be set to ${name} if services.coder.database.createLocally is set true"; } ]; @@ -193,10 +193,8 @@ in { cfg.database.database ]; ensureUsers = [{ - name = cfg.database.username; - ensurePermissions = { - "DATABASE \"${cfg.database.database}\"" = "ALL PRIVILEGES"; - }; + name = cfg.user; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix index f7ae018d5b7cc..9c21719a57590 100644 --- a/nixos/modules/services/web-apps/gotosocial.nix +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -128,9 +128,7 @@ in ensureUsers = [ { name = "gotosocial"; - ensurePermissions = { - "DATABASE gotosocial" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix index 5603ef7392e82..e4fbc6fd93689 100644 --- a/nixos/modules/services/web-apps/invidious.nix +++ b/nixos/modules/services/web-apps/invidious.nix @@ -109,15 +109,17 @@ let # Default to using the local database if we create it services.invidious.database.host = lib.mkDefault null; + + # TODO(raitobezarius to maintainers of invidious): I strongly advise to clean up the kemal specific + # thing for 24.05 and use `ensureDBOwnership`. + # See https://github.com/NixOS/nixpkgs/issues/216989 + systemd.services.postgresql.postStart = lib.mkAfter '' + $PSQL -tAc 'ALTER DATABASE "${cfg.settings.db.dbname}" OWNER TO "${cfg.settings.db.user}";' + ''; services.postgresql = { enable = true; + ensureUsers = lib.singleton { name = cfg.settings.db.user; ensureDBOwnership = false; }; ensureDatabases = lib.singleton cfg.settings.db.dbname; - ensureUsers = lib.singleton { - name = cfg.settings.db.user; - ensurePermissions = { - "DATABASE ${cfg.settings.db.dbname}" = "ALL PRIVILEGES"; - }; - }; # This is only needed because the unix user invidious isn't the same as # the database user. This tells postgres to map one to the other. identMap = '' @@ -136,6 +138,7 @@ let documentation = [ "https://docs.invidious.io/Database-Information-and-Maintenance.md" ]; startAt = lib.mkDefault "weekly"; path = [ config.services.postgresql.package ]; + after = [ "postgresql.service" ]; script = '' psql ${cfg.settings.db.dbname} ${cfg.settings.db.user} -c "DELETE FROM nonces * WHERE expire < current_timestamp" psql ${cfg.settings.db.dbname} ${cfg.settings.db.user} -c "TRUNCATE TABLE videos" diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 21416be358773..c0f9d785eea21 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -169,6 +169,15 @@ in off if you want to configure it manually. ''; }; + + excalidraw.enable = mkEnableOption (lib.mdDoc "Excalidraw collaboration backend for Jitsi"); + excalidraw.port = mkOption { + type = types.port; + default = 3002; + description = lib.mdDoc ''The port which the Excalidraw backend for Jitsi should listen to.''; + }; + + secureDomain.enable = mkEnableOption (lib.mdDoc "Authenticated room creation"); }; config = mkIf cfg.enable { @@ -192,41 +201,118 @@ in roomLocking = false; roomDefaultPublicJids = true; extraConfig = '' + restrict_room_creation = true + storage = "memory" + admins = { "focus@auth.${cfg.hostName}" } + ''; + } + { + domain = "breakout.${cfg.hostName}"; + name = "Jitsi Meet Breakout MUC"; + roomLocking = false; + roomDefaultPublicJids = true; + extraConfig = '' + restrict_room_creation = true storage = "memory" + admins = { "focus@auth.${cfg.hostName}" } ''; } { - domain = "internal.${cfg.hostName}"; + domain = "internal.auth.${cfg.hostName}"; name = "Jitsi Meet Videobridge MUC"; + roomLocking = false; + roomDefaultPublicJids = true; extraConfig = '' storage = "memory" admins = { "focus@auth.${cfg.hostName}", "jvb@auth.${cfg.hostName}" } ''; #-- muc_room_cache_size = 1000 } + { + domain = "lobby.${cfg.hostName}"; + name = "Jitsi Meet Lobby MUC"; + roomLocking = false; + roomDefaultPublicJids = true; + extraConfig = '' + restrict_room_creation = true + storage = "memory" + ''; + } + ]; + extraModules = [ + "pubsub" + "smacks" + "speakerstats" + "external_services" + "conference_duration" + "end_conference" + "muc_lobby_rooms" + "muc_breakout_rooms" + "av_moderation" + "muc_hide_all" + "muc_meeting_id" + "muc_domain_mapper" + "muc_rate_limit" + "limits_exception" + "persistent_lobby" + "room_metadata" ]; - extraModules = [ "pubsub" "smacks" ]; extraPluginPaths = [ "${pkgs.jitsi-meet-prosody}/share/prosody-plugins" ]; - extraConfig = lib.mkMerge [ (mkAfter '' - Component "focus.${cfg.hostName}" "client_proxy" - target_address = "focus@auth.${cfg.hostName}" + extraConfig = lib.mkMerge [ + (mkAfter '' + Component "focus.${cfg.hostName}" "client_proxy" + target_address = "focus@auth.${cfg.hostName}" + + Component "speakerstats.${cfg.hostName}" "speakerstats_component" + muc_component = "conference.${cfg.hostName}" + + Component "conferenceduration.${cfg.hostName}" "conference_duration_component" + muc_component = "conference.${cfg.hostName}" + + Component "endconference.${cfg.hostName}" "end_conference" + muc_component = "conference.${cfg.hostName}" + + Component "avmoderation.${cfg.hostName}" "av_moderation_component" + muc_component = "conference.${cfg.hostName}" + + Component "metadata.${cfg.hostName}" "room_metadata_component" + muc_component = "conference.${cfg.hostName}" + breakout_rooms_component = "breakout.${cfg.hostName}" '') (mkBefore '' + muc_mapper_domain_base = "${cfg.hostName}" + cross_domain_websocket = true; consider_websocket_secure = true; + + unlimited_jids = { + "focus@auth.${cfg.hostName}", + "jvb@auth.${cfg.hostName}" + } '') ]; virtualHosts.${cfg.hostName} = { enabled = true; domain = cfg.hostName; extraConfig = '' - authentication = "anonymous" + authentication = ${if cfg.secureDomain.enable then "\"internal_hashed\"" else "\"jitsi-anonymous\""} c2s_require_encryption = false admins = { "focus@auth.${cfg.hostName}" } smacks_max_unacked_stanzas = 5 smacks_hibernation_time = 60 smacks_max_hibernated_sessions = 1 smacks_max_old_sessions = 1 + + av_moderation_component = "avmoderation.${cfg.hostName}" + speakerstats_component = "speakerstats.${cfg.hostName}" + conference_duration_component = "conferenceduration.${cfg.hostName}" + end_conference_component = "endconference.${cfg.hostName}" + + c2s_require_encryption = false + lobby_muc = "lobby.${cfg.hostName}" + breakout_rooms_muc = "breakout.${cfg.hostName}" + room_metadata_component = "metadata.${cfg.hostName}" + main_muc = "conference.${cfg.hostName}" ''; ssl = { cert = "/var/lib/jitsi-meet/jitsi-meet.crt"; @@ -237,7 +323,7 @@ in enabled = true; domain = "auth.${cfg.hostName}"; extraConfig = '' - authentication = "internal_plain" + authentication = "internal_hashed" ''; ssl = { cert = "/var/lib/jitsi-meet/jitsi-meet.crt"; @@ -252,6 +338,14 @@ in c2s_require_encryption = false ''; }; + virtualHosts."guest.${cfg.hostName}" = { + enabled = true; + domain = "guest.${cfg.hostName}"; + extraConfig = '' + authentication = "anonymous" + c2s_require_encryption = false + ''; + }; }; systemd.services.prosody = mkIf cfg.prosody.enable { preStart = let @@ -270,7 +364,7 @@ in reloadIfChanged = true; }; - users.groups.jitsi-meet = {}; + users.groups.jitsi-meet = { }; systemd.tmpfiles.rules = [ "d '/var/lib/jitsi-meet' 0750 root jitsi-meet - -" ]; @@ -317,6 +411,20 @@ in ''; }; + systemd.services.jitsi-excalidraw = mkIf cfg.excalidraw.enable { + description = "Excalidraw collaboration backend for Jitsi"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.PORT = toString cfg.excalidraw.port; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.jitsi-excalidraw}/bin/jitsi-excalidraw-backend"; + Restart = "on-failure"; + Group = "jitsi-meet"; + }; + }; + services.nginx = mkIf cfg.nginx.enable { enable = mkDefault true; virtualHosts.${cfg.hostName} = { @@ -345,12 +453,23 @@ in locations."=/external_api.js" = mkDefault { alias = "${pkgs.jitsi-meet}/libs/external_api.min.js"; }; + locations."=/_api/room-info" = { + proxyPass = "http://localhost:5280/room-info"; + extraConfig = '' + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + ''; + }; locations."=/config.js" = mkDefault { alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig; }; locations."=/interface_config.js" = mkDefault { alias = overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""; }; + locations."/socket.io/" = mkIf cfg.excalidraw.enable { + proxyPass = "http://127.0.0.1:${toString cfg.excalidraw.port}"; + proxyWebsockets = true; + }; }; }; @@ -359,7 +478,7 @@ in virtualHosts.${cfg.hostName} = { extraConfig = let - templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" {} '' + templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" { } '' cp -R ${pkgs.jitsi-meet}/* . for file in *.html **/*.html ; do ${pkgs.sd}/bin/sd '<!--#include virtual="(.*)" -->' '{{ include "$1" }}' $file @@ -390,13 +509,24 @@ in }; }; + services.jitsi-meet.config = recursiveUpdate + (mkIf cfg.excalidraw.enable { + whiteboard = { + enabled = true; + collabServerBaseUrl = "https://${cfg.hostName}"; + }; + }) + (mkIf cfg.secureDomain.enable { + hosts.anonymousdomain = "guest.${cfg.hostName}"; + }); + services.jitsi-videobridge = mkIf cfg.videobridge.enable { enable = true; xmppConfigs."localhost" = { userName = "jvb"; domain = "auth.${cfg.hostName}"; passwordFile = "/var/lib/jitsi-meet/videobridge-secret"; - mucJids = "jvbbrewery@internal.${cfg.hostName}"; + mucJids = "jvbbrewery@internal.auth.${cfg.hostName}"; disableCertificateVerification = true; }; }; @@ -409,17 +539,27 @@ in userName = "focus"; userPasswordFile = "/var/lib/jitsi-meet/jicofo-user-secret"; componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret"; - bridgeMuc = "jvbbrewery@internal.${cfg.hostName}"; + bridgeMuc = "jvbbrewery@internal.auth.${cfg.hostName}"; config = mkMerge [{ jicofo.xmpp.service.disable-certificate-verification = true; jicofo.xmpp.client.disable-certificate-verification = true; - #} (lib.mkIf cfg.jibri.enable { - } (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) { - jicofo.jibri = { - brewery-jid = "JibriBrewery@internal.${cfg.hostName}"; - pending-timeout = "90"; - }; - })]; + } + (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) { + jicofo.jibri = { + brewery-jid = "JibriBrewery@internal.auth.${cfg.hostName}"; + pending-timeout = "90"; + }; + }) + (lib.mkIf cfg.secureDomain.enable { + jicofo = { + authentication = { + enabled = "true"; + type = "XMPP"; + login-url = cfg.hostName; + }; + xmpp.client.client-proxy = "focus.${cfg.hostName}"; + }; + })]; }; services.jibri = mkIf cfg.jibri.enable { @@ -430,7 +570,7 @@ in xmppDomain = cfg.hostName; control.muc = { - domain = "internal.${cfg.hostName}"; + domain = "internal.auth.${cfg.hostName}"; roomName = "JibriBrewery"; nickname = "jibri"; }; diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 20d9dcb7c2661..32389f7a59dd8 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -146,7 +146,7 @@ in ensureDatabases = [ cfg.settings.database.database ]; ensureUsers = [{ name = cfg.settings.database.user; - ensurePermissions."DATABASE ${cfg.settings.database.database}" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 2aab97438b7d6..8686506b1c282 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -17,9 +17,6 @@ let WEB_CONCURRENCY = toString cfg.webProcesses; MAX_THREADS = toString cfg.webThreads; - # mastodon-streaming concurrency. - STREAMING_CLUSTER_NUM = toString cfg.streamingProcesses; - DB_USER = cfg.database.user; REDIS_HOST = cfg.redis.host; @@ -33,13 +30,15 @@ let PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system"; PAPERCLIP_ROOT_URL = "/system"; ES_ENABLED = if (cfg.elasticsearch.host != null) then "true" else "false"; - ES_HOST = cfg.elasticsearch.host; - ES_PORT = toString(cfg.elasticsearch.port); TRUSTED_PROXY_IP = cfg.trustedProxy; } // 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; } + // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString(cfg.elasticsearch.port); } + // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; } + // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; } // cfg.extraConfig; systemCallsList = [ "@cpu-emulation" "@debug" "@keyring" "@ipc" "@mount" "@obsolete" "@privileged" "@setuid" ]; @@ -141,8 +140,44 @@ let }) ) cfg.sidekiqProcesses; + streamingUnits = builtins.listToAttrs + (map (i: { + name = "mastodon-streaming-${toString i}"; + value = { + after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; + requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional databaseActuallyCreateLocally "postgresql.service" + ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; + wantedBy = [ "mastodon.target" "mastodon-streaming.target" ]; + description = "Mastodon streaming ${toString i}"; + environment = env // { SOCKET = "/run/mastodon-streaming/streaming-${toString i}.socket"; }; + serviceConfig = { + ExecStart = "${cfg.package}/run-streaming.sh"; + Restart = "always"; + RestartSec = 20; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; + WorkingDirectory = cfg.package; + # Runtime directory and mode + RuntimeDirectory = "mastodon-streaming"; + RuntimeDirectoryMode = "0750"; + # System Call Filtering + SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@memlock" "@resources" ])) "pipe" "pipe2" ]; + } // cfgService; + }; + }) + (lib.range 1 cfg.streamingProcesses)); + in { + imports = [ + (lib.mkRemovedOptionModule + [ "services" "mastodon" "streamingPort" ] + "Mastodon currently doesn't support streaming via TCP ports. Please open a PR if you need this." + ) + ]; + options = { services.mastodon = { enable = lib.mkEnableOption (lib.mdDoc "Mastodon, a federated social network server"); @@ -191,18 +226,13 @@ in { default = "mastodon"; }; - streamingPort = lib.mkOption { - description = lib.mdDoc "TCP port used by the mastodon-streaming service."; - type = lib.types.port; - default = 55000; - }; streamingProcesses = lib.mkOption { description = lib.mdDoc '' - Processes used by the mastodon-streaming service. - Defaults to the number of CPU cores minus one. + Number of processes used by the mastodon-streaming service. + Recommended is the amount of your CPU cores minus one. ''; - type = lib.types.nullOr lib.types.int; - default = null; + type = lib.types.ints.positive; + example = 3; }; webPort = lib.mkOption { @@ -485,6 +515,31 @@ in { type = lib.types.port; default = 9200; }; + + preset = lib.mkOption { + description = lib.mdDoc '' + It controls the ElasticSearch indices configuration (number of shards and replica). + ''; + type = lib.types.enum [ "single_node_cluster" "small_cluster" "large_cluster" ]; + default = "single_node_cluster"; + example = "large_cluster"; + }; + + user = lib.mkOption { + description = lib.mdDoc "Used for optionally authenticating with Elasticsearch."; + type = lib.types.nullOr lib.types.str; + default = null; + example = "elasticsearch-mastodon"; + }; + + passwordFile = lib.mkOption { + description = lib.mdDoc '' + Path to file containing password for optionally authenticating with Elasticsearch. + ''; + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/mastodon/secrets/elasticsearch-password"; + }; }; package = lib.mkOption { @@ -557,7 +612,7 @@ in { config = lib.mkIf cfg.enable (lib.mkMerge [{ assertions = [ { - assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user); + 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 authentication (services.mastodon.database.host == "/run/postgresql") to work services.mastodon.user @@ -603,6 +658,12 @@ in { after = [ "network.target" ]; }; + systemd.targets.mastodon-streaming = { + description = "Target for all Mastodon streaming services"; + wantedBy = [ "multi-user.target" "mastodon.target" ]; + after = [ "network.target" ]; + }; + systemd.services.mastodon-init-dirs = { script = '' umask 077 @@ -631,6 +692,8 @@ in { DB_PASS="$(cat ${cfg.database.passwordFile})" '' + lib.optionalString cfg.smtp.authenticate '' SMTP_PASSWORD="$(cat ${cfg.smtp.passwordFile})" + '' + lib.optionalString (cfg.elasticsearch.passwordFile != null) '' + ES_PASS="$(cat ${cfg.elasticsearch.passwordFile})" '' + '' EOF ''; @@ -688,33 +751,6 @@ in { ++ lib.optional databaseActuallyCreateLocally "postgresql.service"; }; - systemd.services.mastodon-streaming = { - after = [ "network.target" "mastodon-init-dirs.service" ] - ++ lib.optional databaseActuallyCreateLocally "postgresql.service" - ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; - requires = [ "mastodon-init-dirs.service" ] - ++ lib.optional databaseActuallyCreateLocally "postgresql.service" - ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; - wantedBy = [ "mastodon.target" ]; - description = "Mastodon streaming"; - environment = env // (if cfg.enableUnixSocket - then { SOCKET = "/run/mastodon-streaming/streaming.socket"; } - else { PORT = toString(cfg.streamingPort); } - ); - serviceConfig = { - ExecStart = "${cfg.package}/run-streaming.sh"; - Restart = "always"; - RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; - WorkingDirectory = cfg.package; - # Runtime directory and mode - RuntimeDirectory = "mastodon-streaming"; - RuntimeDirectoryMode = "0750"; - # System Call Filtering - SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@memlock" "@resources" ])) "pipe" "pipe2" ]; - } // cfgService; - }; - systemd.services.mastodon-web = { after = [ "network.target" "mastodon-init-dirs.service" ] ++ lib.optional databaseActuallyCreateLocally "postgresql.service" @@ -780,10 +816,20 @@ in { }; locations."/api/v1/streaming/" = { - proxyPass = (if cfg.enableUnixSocket then "http://unix:/run/mastodon-streaming/streaming.socket" else "http://127.0.0.1:${toString(cfg.streamingPort)}/"); + proxyPass = "http://mastodon-streaming"; proxyWebsockets = true; }; }; + upstreams.mastodon-streaming = { + extraConfig = '' + least_conn; + ''; + servers = builtins.listToAttrs + (map (i: { + name = "unix:/run/mastodon-streaming/streaming-${toString i}.socket"; + value = { }; + }) (lib.range 1 cfg.streamingProcesses)); + }; }; services.postfix = lib.mkIf (cfg.smtp.createLocally && cfg.smtp.host == "127.0.0.1") { @@ -799,8 +845,8 @@ in { enable = true; ensureUsers = [ { - name = cfg.database.user; - ensurePermissions."DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; + name = cfg.database.name; + ensureDBOwnership = true; } ]; ensureDatabases = [ cfg.database.name ]; @@ -819,7 +865,7 @@ in { users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; } - { systemd.services = sidekiqUnits; } + { systemd.services = lib.mkMerge [ sidekiqUnits streamingUnits ]; } ]); meta.maintainers = with lib.maintainers; [ happy-river erictapen ]; diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 8b494b7c12083..ce7bcd94b3f01 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -454,7 +454,7 @@ in { assertion = cfg.database.createLocally -> (cfg.database.type == "mysql" || cfg.database.type == "postgres"); message = "services.mediawiki.createLocally is currently only supported for database type 'mysql' and 'postgres'"; } - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.name == cfg.database.user; message = "services.mediawiki.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.socket != null; @@ -486,7 +486,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [{ name = cfg.database.user; - ensurePermissions = { "DATABASE \"${cfg.database.name}\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 3374c746ad3dd..5c8c93c13c434 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -6,13 +6,10 @@ let defaultAddress = "localhost:8080"; - dbUser = "miniflux"; - dbName = "miniflux"; - pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} - ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" + ${pgbin}/psql "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; in @@ -62,7 +59,7 @@ in services.miniflux.config = { LISTEN_ADDR = mkDefault defaultAddress; - DATABASE_URL = "user=${dbUser} host=/run/postgresql dbname=${dbName}"; + DATABASE_URL = "user=miniflux host=/run/postgresql dbname=miniflux"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; }; @@ -70,12 +67,10 @@ in services.postgresql = { enable = true; ensureUsers = [ { - name = dbUser; - ensurePermissions = { - "DATABASE ${dbName}" = "ALL PRIVILEGES"; - }; + name = "miniflux"; + ensureDBOwnership = true; } ]; - ensureDatabases = [ dbName ]; + ensureDatabases = [ "miniflux" ]; }; systemd.services.miniflux-dbsetup = { @@ -97,7 +92,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/miniflux"; - User = dbUser; + User = "miniflux"; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index 343c5cead2b15..bb4319b51a2fa 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -347,12 +347,18 @@ in # Taken from here: # https://framagit.org/framasoft/mobilizon/-/blob/1.1.0/priv/templates/setup_db.eex + # TODO(to maintainers of mobilizon): the owner database alteration is necessary + # as PostgreSQL 15 changed their behaviors w.r.t. to privileges. + # See https://github.com/NixOS/nixpkgs/issues/216989 to get rid + # of that workaround. script = '' psql "${repoSettings.database}" -c "\ CREATE EXTENSION IF NOT EXISTS postgis; \ CREATE EXTENSION IF NOT EXISTS pg_trgm; \ CREATE EXTENSION IF NOT EXISTS unaccent;" + psql -tAc 'ALTER DATABASE "${repoSettings.database}" OWNER TO "${dbUser}";' + ''; serviceConfig = { @@ -372,9 +378,10 @@ in ensureUsers = [ { name = dbUser; - ensurePermissions = { - "DATABASE \"${repoSettings.database}\"" = "ALL PRIVILEGES"; - }; + # Given that `dbUser` is potentially arbitrarily custom, we will perform + # manual fixups in mobilizon-postgres. + # TODO(to maintainers of mobilizon): Feel free to simplify your setup by using `ensureDBOwnership`. + ensureDBOwnership = false; } ]; extraPlugins = with postgresql.pkgs; [ postgis ]; diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix index b617e9a593795..04ae6bd7f1754 100644 --- a/nixos/modules/services/web-apps/moodle.nix +++ b/nixos/modules/services/web-apps/moodle.nix @@ -194,7 +194,7 @@ in config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.createLocally -> cfg.database.user == user; + { assertion = cfg.database.createLocally -> cfg.database.user == user && cfg.database.user == cfg.database.name; message = "services.moodle.database.user must be set to ${user} if services.moodle.database.createLocally is set true"; } { assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; @@ -220,7 +220,7 @@ in ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { name = cfg.database.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 8ba1852848e5b..3b9434e3d3456 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -257,9 +257,7 @@ in { ensureUsers = [ { name = "netbox"; - ensurePermissions = { - "DATABASE netbox" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index f9713cac47e94..f1ac3770d403c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -1042,7 +1042,7 @@ in { ensureDatabases = [ cfg.config.dbname ]; ensureUsers = [{ name = cfg.config.dbuser; - ensurePermissions = { "DATABASE ${cfg.config.dbname}" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix index 3494f2fa21f09..f958566b91f09 100644 --- a/nixos/modules/services/web-apps/onlyoffice.nix +++ b/nixos/modules/services/web-apps/onlyoffice.nix @@ -198,7 +198,7 @@ in ensureDatabases = [ "onlyoffice" ]; ensureUsers = [{ name = "onlyoffice"; - ensurePermissions = { "DATABASE \"onlyoffice\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; }]; }; }; diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 0e3bd07c1fc14..d97b45d624187 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -581,7 +581,7 @@ in enable = true; ensureUsers = [{ name = "outline"; - ensurePermissions."DATABASE outline" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; ensureDatabases = [ "outline" ]; }; diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index 7012df6dffbfd..d6f6077268d46 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -186,9 +186,7 @@ in { ensureUsers = [ { name = "peering-manager"; - ensurePermissions = { - "DATABASE \"peering-manager\"" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index 159fb52476aab..b0a25dcce9efe 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -271,7 +271,6 @@ in { ensureDatabases = [ cfg.database.name ]; ensureUsers = [{ name = user; - ensurePermissions = { }; }]; }; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 5ebee48c3e0b5..1fa69814c6c9f 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -1,123 +1,110 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + literalExpression + mdDoc + mkEnableOption + mkIf + mkOption + mkPackageOptionMD + mkRemovedOptionModule + types + ; cfg = config.services.plantuml-server; in { + imports = [ + (mkRemovedOptionModule [ "services" "plantuml-server" "allowPlantumlInclude" ] "This option has been removed from PlantUML.") + ]; + options = { services.plantuml-server = { - enable = mkEnableOption (lib.mdDoc "PlantUML server"); + enable = mkEnableOption (mdDoc "PlantUML server"); - package = mkOption { - type = types.package; - default = pkgs.plantuml-server; - defaultText = literalExpression "pkgs.plantuml-server"; - description = lib.mdDoc "PlantUML server package to use"; - }; + package = mkPackageOptionMD pkgs "plantuml-server" { }; packages = { - jdk = mkOption { - type = types.package; - default = pkgs.jdk; - defaultText = literalExpression "pkgs.jdk"; - description = lib.mdDoc "JDK package to use for the server"; - }; - jetty = mkOption { - type = types.package; - default = pkgs.jetty; - defaultText = literalExpression "pkgs.jetty"; - description = lib.mdDoc "Jetty package to use for the server"; + jdk = mkPackageOptionMD pkgs "jdk" { }; + jetty = mkPackageOptionMD pkgs "jetty" { + default = "jetty_11"; + extraDescription = '' + At the time of writing (v1.2023.12), PlantUML Server does not support + Jetty versions higher than 12.x. + + Jetty 12.x has introduced major breaking changes, see + <https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.0> and + <https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-migration-11-to-12> + ''; }; }; user = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "User which runs PlantUML server."; + description = mdDoc "User which runs PlantUML server."; }; group = mkOption { type = types.str; default = "plantuml"; - description = lib.mdDoc "Group which runs PlantUML server."; + description = mdDoc "Group which runs PlantUML server."; }; home = mkOption { - type = types.str; + type = types.path; default = "/var/lib/plantuml"; - description = lib.mdDoc "Home directory of the PlantUML server instance."; + description = mdDoc "Home directory of the PlantUML server instance."; }; listenHost = mkOption { type = types.str; default = "127.0.0.1"; - description = lib.mdDoc "Host to listen on."; + description = mdDoc "Host to listen on."; }; listenPort = mkOption { type = types.int; default = 8080; - description = lib.mdDoc "Port to listen on."; + description = mdDoc "Port to listen on."; }; plantumlLimitSize = mkOption { type = types.int; default = 4096; - description = lib.mdDoc "Limits image width and height."; + description = mdDoc "Limits image width and height."; }; - graphvizPackage = mkOption { - type = types.package; - default = pkgs.graphviz; - defaultText = literalExpression "pkgs.graphviz"; - description = lib.mdDoc "Package containing the dot executable."; - }; + graphvizPackage = mkPackageOptionMD pkgs "graphviz" { }; plantumlStats = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; + description = mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; }; httpAuthorization = mkOption { type = types.nullOr types.str; default = null; - description = lib.mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; - }; - - allowPlantumlInclude = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory."; + description = mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; }; }; }; config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - createHome = true; - }; - - users.groups.${cfg.group} = {}; - systemd.services.plantuml-server = { description = "PlantUML server"; wantedBy = [ "multi-user.target" ]; path = [ cfg.home ]; + environment = { PLANTUML_LIMIT_SIZE = builtins.toString cfg.plantumlLimitSize; GRAPHVIZ_DOT = "${cfg.graphvizPackage}/bin/dot"; PLANTUML_STATS = if cfg.plantumlStats then "on" else "off"; HTTP_AUTHORIZATION = cfg.httpAuthorization; - ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' ${cfg.packages.jdk}/bin/java \ @@ -128,13 +115,40 @@ in jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} ''; + serviceConfig = { User = cfg.user; Group = cfg.group; + StateDirectory = mkIf (cfg.home == "/var/lib/plantuml") "plantuml"; + StateDirectoryMode = mkIf (cfg.home == "/var/lib/plantuml") "0750"; + + # Hardening + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; }; }; }; - meta.maintainers = with lib.maintainers; [ truh ]; + meta.maintainers = with lib.maintainers; [ truh anthonyroussel ]; } diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 576b54a7edf24..300a0f892ef77 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -11,13 +11,6 @@ in { package = mkPackageOptionMD pkgs "plausible" { }; - releaseCookiePath = mkOption { - type = with types; either str path; - description = lib.mdDoc '' - The path to the file with release cookie. (used for remote connection to the running node). - ''; - }; - adminUser = { name = mkOption { default = "admin"; @@ -92,6 +85,13 @@ in { framework docs](https://hexdocs.pm/phoenix/Mix.Tasks.Phx.Gen.Secret.html#content). ''; }; + listenAddress = mkOption { + default = "127.0.0.1"; + type = types.str; + description = lib.mdDoc '' + The IP address on which the server is listening. + ''; + }; port = mkOption { default = 8000; type = types.port; @@ -162,6 +162,10 @@ in { }; }; + imports = [ + (mkRemovedOptionModule [ "services" "plausible" "releaseCookiePath" ] "Plausible uses no distributed Erlang features, so this option is no longer necessary and was removed") + ]; + config = mkIf cfg.enable { assertions = [ { assertion = cfg.adminUser.activate -> cfg.database.postgres.setup; @@ -180,8 +184,6 @@ in { enable = true; }; - services.epmd.enable = true; - environment.systemPackages = [ cfg.package ]; systemd.services = mkMerge [ @@ -209,6 +211,32 @@ in { # Configuration options from # https://plausible.io/docs/self-hosting-configuration PORT = toString cfg.server.port; + LISTEN_IP = cfg.server.listenAddress; + + # Note [plausible-needs-no-erlang-distributed-features]: + # Plausible does not use, and does not plan to use, any of + # Erlang's distributed features, see: + # https://github.com/plausible/analytics/pull/1190#issuecomment-1018820934 + # Thus, disable distribution for improved simplicity and security: + # + # When distribution is enabled, + # Elixir spwans the Erlang VM, which will listen by default on all + # interfaces for messages between Erlang nodes (capable of + # remote code execution); it can be protected by a cookie; see + # https://erlang.org/doc/reference_manual/distributed.html#security). + # + # It would be possible to restrict the interface to one of our choice + # (e.g. localhost or a VPN IP) similar to how we do it with `listenAddress` + # for the Plausible web server; if distribution is ever needed in the future, + # https://github.com/NixOS/nixpkgs/pull/130297 shows how to do it. + # + # But since Plausible does not use this feature in any way, + # we just disable it. + RELEASE_DISTRIBUTION = "none"; + # Additional safeguard, in case `RELEASE_DISTRIBUTION=none` ever + # stops disabling the start of EPMD. + ERL_EPMD_ADDRESS = "127.0.0.1"; + DISABLE_REGISTRATION = if isBool cfg.server.disableRegistration then boolToString cfg.server.disableRegistration else cfg.server.disableRegistration; RELEASE_TMP = "/var/lib/plausible/tmp"; @@ -238,7 +266,10 @@ in { path = [ cfg.package ] ++ optional cfg.database.postgres.setup config.services.postgresql.package; script = '' - export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + # Elixir does not start up if `RELEASE_COOKIE` is not set, + # even though we set `RELEASE_DISTRIBUTION=none` so the cookie should be unused. + # Thus, make a random one, which should then be ignored. + export RELEASE_COOKIE=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 20) export ADMIN_USER_PWD="$(< $CREDENTIALS_DIRECTORY/ADMIN_USER_PWD )" export SECRET_KEY_BASE="$(< $CREDENTIALS_DIRECTORY/SECRET_KEY_BASE )" @@ -265,7 +296,6 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - "RELEASE_COOKIE:${cfg.releaseCookiePath}" ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; }; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 7b2e3be4295e8..a8fb37d2c5ecd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -529,6 +529,15 @@ let assertion = cfg.database.password != null -> cfg.database.passwordFile == null; message = "Cannot set both password and passwordFile"; } + { + assertion = cfg.database.createLocally -> cfg.database.name == cfg.user && cfg.database.user == cfg.user; + message = '' + When creating a database via NixOS, the db user and db name must be equal! + If you already have an existing DB+user and this assertion is new, you can safely set + `services.tt-rss.database.createLocally` to `false` because removal of `ensureUsers` + and `ensureDatabases` doesn't have any effect. + ''; + } ]; services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { @@ -632,8 +641,8 @@ let enable = mkDefault true; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ - { name = cfg.user; - ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + { name = cfg.database.user; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index ce74e243a1818..dcacb40e4681f 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -376,7 +376,9 @@ in ReadWriteDirectories = cfg.dataDir; StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ]; LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; - Restart = "on-abnormal"; + Restart = "on-failure"; + RestartPreventExitStatus = 1; + RestartSecs = "5s"; # TODO: attempt to upstream these options NoNewPrivileges = true; diff --git a/nixos/modules/services/web-servers/hydron.nix b/nixos/modules/services/web-servers/hydron.nix index 4434965b217a0..9d30fdc0caab0 100644 --- a/nixos/modules/services/web-servers/hydron.nix +++ b/nixos/modules/services/web-servers/hydron.nix @@ -93,7 +93,7 @@ in with lib; { ensureDatabases = [ "hydron" ]; ensureUsers = [ { name = "hydron"; - ensurePermissions = { "DATABASE hydron" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/modules/services/web-servers/jboss/builder.sh b/nixos/modules/services/web-servers/jboss/builder.sh index ac573089cd5a7..8c49b87db0604 100644 --- a/nixos/modules/services/web-servers/jboss/builder.sh +++ b/nixos/modules/services/web-servers/jboss/builder.sh @@ -1,6 +1,6 @@ set -e -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/bin diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 4d2c36287be69..30d6b99fcfda1 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.tomcat; @@ -9,30 +7,20 @@ let in { - meta = { - maintainers = with maintainers; [ danbst ]; + maintainers = with lib.maintainers; [ danbst ]; }; ###### interface options = { - services.tomcat = { - enable = mkEnableOption (lib.mdDoc "Apache Tomcat"); + enable = lib.mkEnableOption (lib.mdDoc "Apache Tomcat"); - package = mkOption { - type = types.package; - default = pkgs.tomcat9; - defaultText = literalExpression "pkgs.tomcat9"; - example = lib.literalExpression "pkgs.tomcat9"; - description = lib.mdDoc '' - Which tomcat package to use. - ''; - }; + package = lib.mkPackageOptionMD pkgs "tomcat9" { }; - purifyOnStart = mkOption { - type = types.bool; + purifyOnStart = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' On startup, the `baseDir` directory is populated with various files, @@ -43,7 +31,7 @@ in ''; }; - baseDir = mkOption { + baseDir = lib.mkOption { type = lib.types.path; default = "/var/tomcat"; description = lib.mdDoc '' @@ -53,64 +41,64 @@ in ''; }; - logDirs = mkOption { - default = []; - type = types.listOf types.path; + logDirs = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.path; description = lib.mdDoc "Directories to create in baseDir/logs/"; }; - extraConfigFiles = mkOption { - default = []; - type = types.listOf types.path; + extraConfigFiles = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.path; description = lib.mdDoc "Extra configuration files to pull into the tomcat conf directory"; }; - extraEnvironment = mkOption { - type = types.listOf types.str; - default = []; + extraEnvironment = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; example = [ "ENVIRONMENT=production" ]; description = lib.mdDoc "Environment Variables to pass to the tomcat service"; }; - extraGroups = mkOption { - default = []; - type = types.listOf types.str; + extraGroups = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.str; example = [ "users" ]; description = lib.mdDoc "Defines extra groups to which the tomcat user belongs."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "tomcat"; description = lib.mdDoc "User account under which Apache Tomcat runs."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "tomcat"; description = lib.mdDoc "Group account under which Apache Tomcat runs."; }; - javaOpts = mkOption { - type = types.either (types.listOf types.str) types.str; + javaOpts = lib.mkOption { + type = lib.types.either (lib.types.listOf lib.types.str) lib.types.str; default = ""; description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; }; - catalinaOpts = mkOption { - type = types.either (types.listOf types.str) types.str; + catalinaOpts = lib.mkOption { + type = lib.types.either (lib.types.listOf lib.types.str) lib.types.str; default = ""; description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container"; }; - sharedLibs = mkOption { - type = types.listOf types.str; - default = []; + sharedLibs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications"; }; - serverXml = mkOption { - type = types.lines; + serverXml = lib.mkOption { + type = lib.types.lines; default = ""; description = lib.mdDoc '' Verbatim server.xml configuration. @@ -118,87 +106,74 @@ in ''; }; - commonLibs = mkOption { - type = types.listOf types.str; - default = []; + commonLibs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container"; }; - webapps = mkOption { - type = types.listOf types.path; + webapps = lib.mkOption { + type = lib.types.listOf lib.types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; + defaultText = lib.literalExpression "[ config.services.tomcat.package.webapps ]"; description = lib.mdDoc "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; - virtualHosts = mkOption { - type = types.listOf (types.submodule { + virtualHosts = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = lib.mdDoc "name of the virtualhost"; }; - aliases = mkOption { - type = types.listOf types.str; + aliases = lib.mkOption { + type = lib.types.listOf lib.types.str; description = lib.mdDoc "aliases of the virtualhost"; - default = []; + default = [ ]; }; - webapps = mkOption { - type = types.listOf types.path; + webapps = lib.mkOption { + type = lib.types.listOf lib.types.path; description = lib.mdDoc '' List containing web application WAR files and/or directories containing web applications and configuration files for the virtual host. ''; - default = []; + default = [ ]; }; }; }); - default = []; + default = [ ]; description = lib.mdDoc "List consisting of a virtual host name and a list of web applications to deploy on each virtual host"; }; - logPerVirtualHost = mkOption { - type = types.bool; + logPerVirtualHost = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc "Whether to enable logging per virtual host."; }; - jdk = mkOption { - type = types.package; - default = pkgs.jdk; - defaultText = literalExpression "pkgs.jdk"; - description = lib.mdDoc "Which JDK to use."; - }; + jdk = lib.mkPackageOptionMD pkgs "jdk" { }; axis2 = { + enable = lib.mkEnableOption "Apache Axis2 container"; - enable = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc "Whether to enable an Apache Axis2 container"; - }; - - services = mkOption { - default = []; - type = types.listOf types.str; + services = lib.mkOption { + default = [ ]; + type = lib.types.listOf lib.types.str; description = lib.mdDoc "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; }; - }; - }; - }; - ###### implementation - config = mkIf config.services.tomcat.enable { + config = lib.mkIf config.services.tomcat.enable { users.groups.tomcat.gid = config.ids.gids.tomcat; users.users.tomcat = - { uid = config.ids.uids.tomcat; + { + uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; group = "tomcat"; @@ -234,7 +209,7 @@ in ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i` done - ${optionalString (cfg.extraConfigFiles != []) '' + ${lib.optionalString (cfg.extraConfigFiles != []) '' for i in ${toString cfg.extraConfigFiles}; do ln -sfn $i ${cfg.baseDir}/conf/`basename $i` done @@ -253,32 +228,32 @@ in hostElementForVirtualHost = virtualHost: '' <Host name="${virtualHost.name}" appBase="virtualhosts/${virtualHost.name}/webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - '' + concatStrings (innerElementsForVirtualHost virtualHost) + '' + '' + lib.concatStrings (innerElementsForVirtualHost virtualHost) + '' </Host> ''; innerElementsForVirtualHost = virtualHost: (map (alias: '' <Alias>${alias}</Alias> '') virtualHost.aliases) - ++ (optional cfg.logPerVirtualHost '' + ++ (lib.optional cfg.logPerVirtualHost '' <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs/${virtualHost.name}" prefix="${virtualHost.name}_access_log." pattern="combined" resolveHosts="false"/> ''); - hostElementsString = concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; - hostElementsSedString = replaceStrings ["\n"] ["\\\n"] hostElementsString; + hostElementsString = lib.concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts; + hostElementsSedString = lib.replaceStrings ["\n"] ["\\\n"] hostElementsString; in '' # Create a modified server.xml which also includes all virtual hosts - sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${escapeShellArg hostElementsSedString} \ + sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${lib.escapeShellArg hostElementsSedString} \ ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml '' } - ${optionalString (cfg.logDirs != []) '' + ${lib.optionalString (cfg.logDirs != []) '' for i in ${toString cfg.logDirs}; do mkdir -p ${cfg.baseDir}/logs/$i chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/$i done ''} - ${optionalString cfg.logPerVirtualHost (toString (map (h: '' + ${lib.optionalString cfg.logPerVirtualHost (toString (map (h: '' mkdir -p ${cfg.baseDir}/logs/${h.name} chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name} '') cfg.virtualHosts))} @@ -345,7 +320,7 @@ in # Symlink all the given web applications files or paths into the webapps/ directory # of this virtual host - for i in "${optionalString (virtualHost ? webapps) (toString virtualHost.webapps)}"; do + for i in "${lib.optionalString (virtualHost ? webapps) (toString virtualHost.webapps)}"; do if [ -f $i ]; then # If the given web application is a file, symlink it into the webapps/ directory ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i` @@ -368,7 +343,7 @@ in done '') cfg.virtualHosts)} - ${optionalString cfg.axis2.enable '' + ${lib.optionalString cfg.axis2.enable '' # Copy the Axis2 web application cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps @@ -405,10 +380,10 @@ in serviceConfig = { Type = "forking"; PermissionsStartOnly = true; - PIDFile="/run/tomcat/tomcat.pid"; + PIDFile = "/run/tomcat/tomcat.pid"; RuntimeDirectory = "tomcat"; User = cfg.user; - Environment=[ + Environment = [ "CATALINA_BASE=${cfg.baseDir}" "CATALINA_PID=/run/tomcat/tomcat.pid" "JAVA_HOME='${cfg.jdk}'" diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 6b07686efcba2..a46331ccd431d 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -96,8 +96,8 @@ in # (required, but can be null if only config changes # are needed) - extraStructuredConfig = { # attrset of extra configuration parameters - FOO = lib.kernel.yes; # (without the CONFIG_ prefix, optional) + extraStructuredConfig = { # attrset of extra configuration parameters without the CONFIG_ prefix + FOO = lib.kernel.yes; # (optional) }; # values should generally be lib.kernel.yes, # lib.kernel.no or lib.kernel.module @@ -105,8 +105,9 @@ in foo = true; # (may be checked by other NixOS modules, optional) }; - extraConfig = "CONFIG_FOO y"; # extra configuration options in string form - # (deprecated, use extraStructuredConfig instead, optional) + extraConfig = "FOO y"; # extra configuration options in string form without the CONFIG_ prefix + # (optional, multiple lines allowed to specify multiple options) + # (deprecated, use extraStructuredConfig instead) } ``` 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 310584e398bc1..e2e7ffe59dcd2 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 @@ -11,7 +11,23 @@ import shutil import subprocess import sys import warnings -from typing import NamedTuple +import json +from typing import NamedTuple, Dict, List +from dataclasses import dataclass + + +@dataclass +class BootSpec: + init: str + initrd: str + initrdSecrets: str + kernel: str + kernelParams: List[str] + label: str + system: str + toplevel: str + specialisations: Dict[str, "BootSpec"] + libc = ctypes.CDLL("libc.so.6") @@ -71,12 +87,31 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def profile_path(profile: str | None, generation: int, specialisation: str | None, name: str) -> str: - return os.path.realpath("%s/%s" % (system_dir(profile, generation, specialisation), name)) +def get_bootspec(profile: str | None, generation: int) -> BootSpec: + system_directory = system_dir(profile, generation, None) + boot_json_path = os.path.realpath("%s/%s" % (system_directory, "boot.json")) + if os.path.isfile(boot_json_path): + boot_json_f = open(boot_json_path, 'r') + bootspec_json = json.load(boot_json_f) + else: + boot_json_str = subprocess.check_output([ + "@bootspecTools@/bin/synthesize", + "--version", + "1", + system_directory, + "/dev/stdout"], + universal_newlines=True) + bootspec_json = json.loads(boot_json_str) + return bootspec_from_json(bootspec_json) + +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) -def copy_from_profile(profile: str | None, generation: int, specialisation: str | None, name: str, dry_run: bool = False) -> str: - store_file_path = profile_path(profile, generation, specialisation, name) +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) @@ -84,40 +119,19 @@ def copy_from_profile(profile: str | None, generation: int, specialisation: str copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path - -def describe_generation(profile: str | None, generation: int, specialisation: str | None) -> str: - try: - with open(profile_path(profile, generation, specialisation, "nixos-version")) as f: - nixos_version = f.read() - except IOError: - nixos_version = "Unknown" - - kernel_dir = os.path.dirname(profile_path(profile, generation, specialisation, "kernel")) - module_dir = glob.glob("%s/lib/modules/*" % kernel_dir)[0] - kernel_version = os.path.basename(module_dir) - - build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) - build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') - - description = "@distroName@ {}, Linux Kernel {}, Built on {}".format( - nixos_version, kernel_version, build_date - ) - - return description - - def write_entry(profile: str | None, generation: int, specialisation: str | None, - machine_id: str, current: bool) -> None: - kernel = copy_from_profile(profile, generation, specialisation, "kernel") - initrd = copy_from_profile(profile, generation, specialisation, "initrd") + machine_id: str, bootspec: BootSpec, current: bool) -> None: + if specialisation: + bootspec = bootspec.specialisations[specialisation] + kernel = copy_from_file(bootspec.kernel) + initrd = copy_from_file(bootspec.initrd) title = "@distroName@{profile}{specialisation}".format( profile=" [" + profile + "]" if profile else "", specialisation=" (%s)" % specialisation if specialisation else "") try: - append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets") - subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) + subprocess.check_call([bootspec.initrdSecrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass except subprocess.CalledProcessError: @@ -132,17 +146,19 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "init=%s " % profile_path(profile, generation, specialisation, "init") + kernel_params = "init=%s " % bootspec.init + + kernel_params = kernel_params + " ".join(bootspec.kernelParams) + build_time = int(os.path.getctime(system_dir(profile, generation, specialisation))) + build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F') - with open(profile_path(profile, generation, specialisation, "kernel-params")) as params_file: - kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: f.write(BOOT_ENTRY.format(title=title, generation=generation, kernel=kernel, initrd=initrd, kernel_params=kernel_params, - description=describe_generation(profile, generation, specialisation))) + description=f"{bootspec.label}, built on {build_date}")) if machine_id is not None: f.write("machine-id %s\n" % machine_id) f.flush() @@ -173,21 +189,14 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]: return configurations[-configurationLimit:] -def get_specialisations(profile: str | None, generation: int, _: str | None) -> list[SystemIdentifier]: - specialisations_dir = os.path.join( - system_dir(profile, generation, None), "specialisation") - if not os.path.exists(specialisations_dir): - return [] - return [SystemIdentifier(profile, generation, spec) for spec in os.listdir(specialisations_dir)] - - def remove_old_entries(gens: list[SystemIdentifier]) -> None: rex_profile = re.compile(r"^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") rex_generation = re.compile(r"^@efiSysMountPoint@/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") known_paths = [] for gen in gens: - known_paths.append(copy_from_profile(*gen, "kernel", True)) - known_paths.append(copy_from_profile(*gen, "initrd", True)) + 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("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"): if rex_profile.match(path): prof = rex_profile.sub(r"\1", path) @@ -268,7 +277,7 @@ def install_bootloader(args: argparse.Namespace) -> None: if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) os.makedirs("@efiSysMountPoint@/efi/nixos", exist_ok=True) os.makedirs("@efiSysMountPoint@/loader/entries", exist_ok=True) @@ -279,10 +288,11 @@ def install_bootloader(args: argparse.Namespace) -> None: remove_old_entries(gens) for gen in gens: try: - is_default = os.path.dirname(profile_path(*gen, "init")) == args.default_config - write_entry(*gen, machine_id, current=is_default) - for specialisation in get_specialisations(*gen): - write_entry(*specialisation, machine_id, current=is_default) + bootspec = get_bootspec(gen.profile, gen.generation) + is_default = os.path.dirname(bootspec.init) == args.default_config + write_entry(*gen, machine_id, bootspec, current=is_default) + for specialisation in bootspec.specialisations.keys(): + write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, current=is_default) if is_default: write_loader_conf(*gen) except OSError as e: 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 1086ab80b14f1..9d55c21077d13 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -16,6 +16,8 @@ let systemd = config.systemd.package; + bootspecTools = pkgs.bootspec; + nix = config.nix.package.out; timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index b7ced5b0d3466..33261021480f1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -122,6 +122,16 @@ let (assertValueOneOf "PacketInfo" boolValues) (assertValueOneOf "VNetHeader" boolValues) ]; + + # See https://www.freedesktop.org/software/systemd/man/latest/systemd.netdev.html#%5BIPVTAP%5D%20Section%20Options + ipVlanVtapChecks = [ + (assertOnlyFields [ + "Mode" + "Flags" + ]) + (assertValueOneOf "Mode" ["L2" "L3" "L3S" ]) + (assertValueOneOf "Flags" ["private" "vepa" "bridge" ]) + ]; in { sectionNetdev = checkUnitConfig "Netdev" [ @@ -146,6 +156,7 @@ let "ip6gretap" "ipip" "ipvlan" + "ipvtap" "macvlan" "macvtap" "sit" @@ -191,6 +202,10 @@ let (assertValueOneOf "ReorderHeader" boolValues) ]; + sectionIPVLAN = checkUnitConfig "IPVLAN" ipVlanVtapChecks; + + sectionIPVTAP = checkUnitConfig "IPVTAP" ipVlanVtapChecks; + sectionMACVLAN = checkUnitConfig "MACVLAN" [ (assertOnlyFields [ "Mode" @@ -615,6 +630,7 @@ let "VRF" "VLAN" "IPVLAN" + "IPVTAP" "MACVLAN" "MACVTAP" "VXLAN" @@ -1277,6 +1293,7 @@ let "FirewallMark" "Wash" "SplitGSO" + "AckFilter" ]) (assertValueOneOf "AutoRateIngress" boolValues) (assertInt "OverheadBytes") @@ -1309,6 +1326,7 @@ let (assertRange "FirewallMark" 1 4294967295) (assertValueOneOf "Wash" boolValues) (assertValueOneOf "SplitGSO" boolValues) + (assertValueOneOf "AckFilter" (boolValues ++ ["aggressive"])) ]; sectionControlledDelay = checkUnitConfig "ControlledDelay" [ @@ -1623,6 +1641,26 @@ let ''; }; + ipvlanConfig = mkOption { + default = {}; + example = { Mode = "L2"; Flags = "private"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVLAN; + description = lib.mdDoc '' + Each attribute in this set specifies an option in the `[IPVLAN]` section of the unit. + See {manpage}`systemd.netdev(5)` for details. + ''; + }; + + ipvtapConfig = mkOption { + default = {}; + example = { Mode = "L3"; Flags = "vepa"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionIPVTAP; + description = lib.mdDoc '' + Each attribute in this set specifies an option in the `[IPVTAP]` section of the unit. + See {manpage}`systemd.netdev(5)` for details. + ''; + }; + macvlanConfig = mkOption { default = {}; example = { Mode = "private"; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 13c71e1495ea9..e990aeea7a14b 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -435,7 +435,7 @@ let } # mindepth 1 so that we don't change the mode of / - (cd "$tmp" && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ + (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1" ''; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e223451652b2e..0e7d59b32075b 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -370,7 +370,7 @@ in { boot.initrd.availableKernelModules = [ # systemd needs this for some features - "autofs4" + "autofs" # systemd-cryptenroll ] ++ lib.optional cfg.enableTpm2 "tpm-tis" ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 4eadec239e67d..d144ce62dc27e 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -1,28 +1,42 @@ { config, lib, pkgs, utils, ... }: -with lib; - let - bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; - - mountCommand = pkgs.runCommand "mount.bcachefs" {} '' - mkdir -p $out/bin - cat > $out/bin/mount.bcachefs <<EOF - #!/bin/sh - exec "/bin/bcachefs" mount "\$@" - EOF - chmod +x $out/bin/mount.bcachefs - ''; + bootFs = lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; commonFunctions = '' prompt() { local name="$1" printf "enter passphrase for $name: " } + tryUnlock() { local name="$1" local path="$2" + local success=false + local target + local uuid=$(echo -n $path | sed -e 's,UUID=\(.*\),\1,g') + + printf "waiting for device to appear $path" + for try in $(seq 10); do + if [ -e $path ]; then + success=true + break + else + target=$(blkid --uuid $uuid) + if [ $? == 0 ]; then + success=true + break + fi + fi + echo -n "." + sleep 1 + done + printf "\n" + if [ $success == true ]; then + path=$target + fi + if bcachefs unlock -c $path > /dev/null 2> /dev/null; then # test for encryption prompt $name until bcachefs unlock $path 2> /dev/null; do # repeat until successfully unlocked @@ -30,6 +44,8 @@ let prompt $name done printf "unlocking successful.\n" + else + echo "Cannot unlock device $uuid with path $path" >&2 fi } ''; @@ -38,7 +54,7 @@ let # remove this adaptation when bcachefs implements mounting by filesystem uuid # also, implement automatic waiting for the constituent devices when that happens # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) - firstDevice = fs: head (splitString ":" fs.device); + firstDevice = fs: lib.head (lib.splitString ":" fs.device); openCommand = name: fs: '' tryUnlock ${name} ${firstDevice fs} @@ -72,41 +88,61 @@ let }; }; + assertions = [ + { + assertion = let + kernel = config.boot.kernelPackages.kernel; + in ( + kernel.kernelAtLeast "6.7" || ( + lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [ + lib.kernel.module + lib.kernel.yes + lib.kernel.option.yes + ] + ) + ); + + message = "Linux 6.7-rc1 at minimum or a custom linux kernel with bcachefs support is required"; + } + ]; in { - config = mkIf (elem "bcachefs" config.boot.supportedFilesystems) (mkMerge [ + config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [ { - # We do not want to include bachefs in the fsPackages for systemd-initrd - # because we provide the unwrapped version of mount.bcachefs - # through the extraBin option, which will make it available for use. - system.fsPackages = lib.optional (!config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; - environment.systemPackages = lib.optional (config.boot.initrd.systemd.enable) pkgs.bcachefs-tools; - - # use kernel package with bcachefs support until it's in mainline - boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + inherit assertions; + # needed for systemd-remount-fs + system.fsPackages = [ pkgs.bcachefs-tools ]; + + # FIXME: Replace this with `linuxPackages_testing` after NixOS 23.11 is released + # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7 + boot.kernelPackages = lib.mkDefault ( + # FIXME: Remove warning after NixOS 23.11 is released + lib.warn "Please upgrade to Linux 6.7-rc1 or later: 'linuxPackages_testing_bcachefs' is deprecated. Use 'boot.kernelPackages = pkgs.linuxPackages_testing;' to silence this warning" + pkgs.linuxPackages_testing_bcachefs + ); systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); } - (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + inherit assertions; # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; - boot.initrd.systemd.extraBin = { + # do we need this? boot/systemd.nix:566 & boot/systemd/initrd.nix:357 "bcachefs" = "${pkgs.bcachefs-tools}/bin/bcachefs"; - "mount.bcachefs" = "${mountCommand}/bin/mount.bcachefs"; + "mount.bcachefs" = "${pkgs.bcachefs-tools}/bin/mount.bcachefs"; }; - boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs - copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs + copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/mount.bcachefs ''; boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/bcachefs version ''; - boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + concatStrings (mapAttrsToList openCommand bootFs)); + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + lib.concatStrings (lib.mapAttrsToList openCommand bootFs)); boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index a88b78bc98219..e712fac17a462 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -61,7 +61,7 @@ in # Which provisioning agent to use. Supported values are "auto" (default), "waagent", # "cloud-init", or "disabled". - Provisioning.Agent=disabled + Provisioning.Agent=auto # Password authentication for root account will be unavailable. Provisioning.DeleteRootPassword=n @@ -246,7 +246,7 @@ in pkgs.bash # waagent's Microsoft.OSTCExtensions.VMAccessForLinux needs Python 3 - pkgs.python3 + pkgs.python39 # waagent's Microsoft.CPlat.Core.RunCommandLinux needs lsof pkgs.lsof @@ -259,5 +259,10 @@ in }; }; + # waagent will generate files under /etc/sudoers.d during provisioning + security.sudo.extraConfig = '' + #includedir /etc/sudoers.d + ''; + }; } diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 39c6cab5980a1..d909680cca1ff 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -37,42 +37,5 @@ in inherit config lib pkgs; }; - # Azure metadata is available as a CD-ROM drive. - fileSystems."/metadata".device = "/dev/sr0"; - - systemd.services.fetch-ssh-keys = { - description = "Fetch host keys and authorized_keys for root user"; - - wantedBy = [ "sshd.service" "waagent.service" ]; - before = [ "sshd.service" "waagent.service" ]; - - path = [ pkgs.coreutils ]; - script = - '' - eval "$(cat /metadata/CustomData.bin)" - if ! [ -z "$ssh_host_ecdsa_key" ]; then - echo "downloaded ssh_host_ecdsa_key" - echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key - chmod 600 /etc/ssh/ssh_host_ed25519_key - fi - - if ! [ -z "$ssh_host_ecdsa_key_pub" ]; then - echo "downloaded ssh_host_ecdsa_key_pub" - echo "$ssh_host_ecdsa_key_pub" > /etc/ssh/ssh_host_ed25519_key.pub - chmod 644 /etc/ssh/ssh_host_ed25519_key.pub - fi - - if ! [ -z "$ssh_root_auth_key" ]; then - echo "downloaded ssh_root_auth_key" - mkdir -m 0700 -p /root/.ssh - echo "$ssh_root_auth_key" > /root/.ssh/authorized_keys - chmod 600 /root/.ssh/authorized_keys - fi - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - serviceConfig.StandardError = "journal+console"; - serviceConfig.StandardOutput = "journal+console"; - }; }; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index dcdd1b59eef53..e4a18fd81d715 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -56,6 +56,11 @@ in efiInstallAsRemovable = true; }; + fileSystems."/boot" = mkIf cfg.efi { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f44fcfcf54ab6..e2d1748454e32 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -117,6 +117,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {}; amd-sev = runTest ./amd-sev.nix; anbox = runTest ./anbox.nix; anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; @@ -124,6 +125,7 @@ in { apfs = runTest ./apfs.nix; appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; + archi = handleTest ./archi.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; @@ -172,6 +174,7 @@ in { cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; + centrifugo = runTest ./centrifugo.nix; ceph-multi-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix {}; ceph-single-node-bluestore = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore.nix {}; @@ -191,7 +194,6 @@ in { cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockpit = handleTest ./cockpit.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; - code-server = handleTest ./code-server.nix {}; coder = handleTest ./coder.nix {}; collectd = handleTest ./collectd.nix {}; connman = handleTest ./connman.nix {}; @@ -616,6 +618,7 @@ in { openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; opentelemetry-collector = handleTest ./opentelemetry-collector.nix {}; + ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix {}; owncast = handleTest ./owncast.nix {}; outline = handleTest ./outline.nix {}; image-contents = handleTest ./image-contents.nix {}; @@ -656,6 +659,7 @@ in { phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; pinnwand = handleTest ./pinnwand.nix {}; + plantuml-server = handleTest ./plantuml-server.nix {}; plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; plasma5 = handleTest ./plasma5.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; @@ -748,6 +752,7 @@ in { signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; sing-box = handleTest ./sing-box.nix {}; + slimserver = handleTest ./slimserver.nix {}; slurm = handleTest ./slurm.nix {}; smokeping = handleTest ./smokeping.nix {}; snapcast = handleTest ./snapcast.nix {}; diff --git a/nixos/tests/amazon-ssm-agent.nix b/nixos/tests/amazon-ssm-agent.nix new file mode 100644 index 0000000000000..957e9e0e02c5d --- /dev/null +++ b/nixos/tests/amazon-ssm-agent.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "amazon-ssm-agent"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes.machine = { config, pkgs, ... }: { + services.amazon-ssm-agent.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_file("/etc/amazon/ssm/seelog.xml") + machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json") + + machine.wait_for_unit("amazon-ssm-agent.service") + ''; +}) diff --git a/nixos/tests/archi.nix b/nixos/tests/archi.nix new file mode 100644 index 0000000000000..59f2e940c0050 --- /dev/null +++ b/nixos/tests/archi.nix @@ -0,0 +1,31 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "archi"; + meta.maintainers = with lib.maintainers; [ paumr ]; + + nodes.machine = { pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + environment.systemPackages = with pkgs; [ archi ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("createEmptyModel via CLI"): + machine.succeed("Archi -application com.archimatetool.commandline.app -consoleLog -nosplash --createEmptyModel --saveModel smoke.archimate") + machine.copy_from_vm("smoke.archimate", "") + + with subtest("UI smoketest"): + machine.succeed("DISPLAY=:0 Archi --createEmptyModel >&2 &") + machine.wait_for_window("Archi") + + # wait till main UI is open + machine.wait_for_text("Welcome to Archi") + + machine.screenshot("welcome-screen") + ''; +}) diff --git a/nixos/tests/centrifugo.nix b/nixos/tests/centrifugo.nix new file mode 100644 index 0000000000000..45c2904f5585f --- /dev/null +++ b/nixos/tests/centrifugo.nix @@ -0,0 +1,80 @@ +let + redisPort = 6379; + centrifugoPort = 8080; + nodes = [ + "centrifugo1" + "centrifugo2" + "centrifugo3" + ]; +in +{ lib, ... }: { + name = "centrifugo"; + meta.maintainers = [ lib.maintainers.tie ]; + + nodes = lib.listToAttrs (lib.imap0 + (index: name: { + inherit name; + value = { config, ... }: { + services.centrifugo = { + enable = true; + settings = { + inherit name; + port = centrifugoPort; + # See https://centrifugal.dev/docs/server/engines#redis-sharding + engine = "redis"; + # Connect to local Redis shard via Unix socket. + redis_address = + let + otherNodes = lib.take index nodes ++ lib.drop (index + 1) nodes; + in + map (name: "${name}:${toString redisPort}") otherNodes ++ [ + "unix://${config.services.redis.servers.centrifugo.unixSocket}" + ]; + usage_stats_disable = true; + api_insecure = true; + }; + extraGroups = [ + config.services.redis.servers.centrifugo.user + ]; + }; + services.redis.servers.centrifugo = { + enable = true; + bind = null; # all interfaces + port = redisPort; + openFirewall = true; + settings.protected-mode = false; + }; + }; + }) + nodes); + + testScript = '' + import json + + redisPort = ${toString redisPort} + centrifugoPort = ${toString centrifugoPort} + + start_all() + + for machine in machines: + machine.wait_for_unit("redis-centrifugo.service") + machine.wait_for_open_port(redisPort) + + for machine in machines: + machine.wait_for_unit("centrifugo.service") + machine.wait_for_open_port(centrifugoPort) + + # See https://centrifugal.dev/docs/server/server_api#info + def list_nodes(machine): + curl = "curl --fail-with-body --silent" + body = "{}" + resp = json.loads(machine.succeed(f"{curl} -d '{body}' http://localhost:{centrifugoPort}/api/info")) + return resp["result"]["nodes"] + machineNames = {m.name for m in machines} + for machine in machines: + nodes = list_nodes(machine) + assert len(nodes) == len(machines) + nodeNames = {n['name'] for n in nodes} + assert machineNames == nodeNames + ''; +} diff --git a/nixos/tests/code-server.nix b/nixos/tests/code-server.nix deleted file mode 100644 index 7d523dfc617e3..0000000000000 --- a/nixos/tests/code-server.nix +++ /dev/null @@ -1,22 +0,0 @@ -import ./make-test-python.nix ({pkgs, lib, ...}: -{ - name = "code-server"; - - nodes = { - machine = {pkgs, ...}: { - services.code-server = { - enable = true; - auth = "none"; - }; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("code-server.service") - machine.wait_for_open_port(4444) - machine.succeed("curl -k --fail http://localhost:4444", timeout=10) - ''; - - meta.maintainers = [ lib.maintainers.drupol ]; -}) diff --git a/nixos/tests/dex-oidc.nix b/nixos/tests/dex-oidc.nix index 37275a97ef0fb..e54ae18ca9373 100644 --- a/nixos/tests/dex-oidc.nix +++ b/nixos/tests/dex-oidc.nix @@ -49,7 +49,7 @@ import ./make-test-python.nix ({ lib, ... }: { ensureUsers = [ { name = "dex"; - ensurePermissions = { "DATABASE dex" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/dnscrypt-wrapper/default.nix b/nixos/tests/dnscrypt-wrapper/default.nix index 1c05376e097b3..1a794931dc500 100644 --- a/nixos/tests/dnscrypt-wrapper/default.nix +++ b/nixos/tests/dnscrypt-wrapper/default.nix @@ -1,5 +1,15 @@ + { lib, pkgs, ... }: +let + snakeoil = import ../common/acme/server/snakeoil-certs.nix; + + hosts = lib.mkForce + { "fd::a" = [ "server" snakeoil.domain ]; + "fd::b" = [ "client" ]; + }; +in + { name = "dnscrypt-wrapper"; meta = with pkgs.lib.maintainers; { @@ -7,59 +17,122 @@ }; nodes = { - server = { lib, ... }: - { services.dnscrypt-wrapper = with builtins; + server = { + networking.hosts = hosts; + networking.interfaces.eth1.ipv6.addresses = lib.singleton + { address = "fd::a"; prefixLength = 64; }; + + services.dnscrypt-wrapper = { enable = true; - address = "192.168.1.1"; + address = "[::]"; + port = 5353; keys.expiration = 5; # days keys.checkInterval = 2; # min # The keypair was generated by the command: # dnscrypt-wrapper --gen-provider-keypair \ # --provider-name=2.dnscrypt-cert.server \ - # --ext-address=192.168.1.1:5353 - providerKey.public = toFile "public.key" (readFile ./public.key); - providerKey.secret = toFile "secret.key" (readFile ./secret.key); + providerKey.public = "${./public.key}"; + providerKey.secret = "${./secret.key}"; + }; + + # nameserver + services.bind.enable = true; + services.bind.zones = lib.singleton + { name = "."; + master = true; + file = pkgs.writeText "root.zone" '' + $TTL 3600 + . IN SOA example.org. admin.example.org. ( 1 3h 1h 1w 1d ) + . IN NS example.org. + example.org. IN AAAA 2001:db8::1 + ''; + }; + + # webserver + services.nginx.enable = true; + services.nginx.virtualHosts.${snakeoil.domain} = + { onlySSL = true; + listenAddresses = [ "localhost" ]; + sslCertificate = snakeoil.${snakeoil.domain}.cert; + sslCertificateKey = snakeoil.${snakeoil.domain}.key; + locations."/ip".extraConfig = '' + default_type text/plain; + return 200 "Ciao $remote_addr!\n"; + ''; }; - services.tinydns.enable = true; - services.tinydns.data = '' - ..:192.168.1.1:a - +it.works:1.2.3.4 - ''; - networking.firewall.allowedUDPPorts = [ 5353 ]; - networking.firewall.allowedTCPPorts = [ 5353 ]; - networking.interfaces.eth1.ipv4.addresses = lib.mkForce - [ { address = "192.168.1.1"; prefixLength = 24; } ]; + + # demultiplex HTTP and DNS from port 443 + services.sslh = + { enable = true; + method = "ev"; + settings.transparent = true; + settings.listen = lib.mkForce + [ { host = "server"; port = "443"; is_udp = false; } + { host = "server"; port = "443"; is_udp = true; } + ]; + settings.protocols = + [ # Send TLS to webserver (TCP) + { name = "tls"; host= "localhost"; port= "443"; } + # Send DNSCrypt to dnscrypt-wrapper (TCP or UDP) + { name = "anyprot"; host = "localhost"; port = "5353"; } + { name = "anyprot"; host = "localhost"; port = "5353"; is_udp = true;} + ]; + }; + + networking.firewall.allowedTCPPorts = [ 443 ]; + networking.firewall.allowedUDPPorts = [ 443 ]; }; - client = { lib, ... }: - { services.dnscrypt-proxy2.enable = true; - services.dnscrypt-proxy2.upstreamDefaults = false; - services.dnscrypt-proxy2.settings = { - server_names = [ "server" ]; - static.server.stamp = "sdns://AQAAAAAAAAAAEDE5Mi4xNjguMS4xOjUzNTMgFEHYOv0SCKSuqR5CDYa7-58cCBuXO2_5uTSVU9wNQF0WMi5kbnNjcnlwdC1jZXJ0LnNlcnZlcg"; + client = { + networking.hosts = hosts; + networking.interfaces.eth1.ipv6.addresses = lib.singleton + { address = "fd::b"; prefixLength = 64; }; + + services.dnscrypt-proxy2.enable = true; + services.dnscrypt-proxy2.upstreamDefaults = false; + services.dnscrypt-proxy2.settings = + { server_names = [ "server" ]; + listen_addresses = [ "[::1]:53" ]; + cache = false; + # Computed using https://dnscrypt.info/stamps/ + static.server.stamp = + "sdns://AQAAAAAAAAAADzE5Mi4xNjguMS4yOjQ0MyAUQdg6" + +"_RIIpK6pHkINhrv7nxwIG5c7b_m5NJVT3A1AXRYyLmRuc2NyeXB0LWNlcnQuc2VydmVy"; }; - networking.nameservers = [ "127.0.0.1" ]; - networking.interfaces.eth1.ipv4.addresses = lib.mkForce - [ { address = "192.168.1.2"; prefixLength = 24; } ]; - }; + networking.nameservers = [ "::1" ]; + security.pki.certificateFiles = [ snakeoil.ca.cert ]; + }; }; testScript = '' - start_all() - with subtest("The server can generate the ephemeral keypair"): server.wait_for_unit("dnscrypt-wrapper") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key") server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt") almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip() - with subtest("The client can connect to the server"): - server.wait_for_unit("tinydns") - client.wait_for_unit("dnscrypt-proxy2") - assert "1.2.3.4" in client.wait_until_succeeds( - "host it.works" - ), "The IP address of 'it.works' does not match 1.2.3.4" + with subtest("The DNSCrypt client can connect to the server"): + server.wait_for_unit("sslh") + client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\[server\] OK'") + + with subtest("HTTP client can connect to the server"): + server.wait_for_unit("nginx") + client.succeed("curl -s --fail https://${snakeoil.domain}/ip | grep -q fd::b") + + with subtest("DNS queries over UDP are working"): + server.wait_for_unit("bind") + client.wait_for_open_port(53) + assert "2001:db8::1" in client.wait_until_succeeds( + "host -U example.org" + ), "The IP address of 'example.org' does not match 2001:db8::1" + + with subtest("DNS queries over TCP are working"): + server.wait_for_unit("bind") + client.wait_for_open_port(53) + assert "2001:db8::1" in client.wait_until_succeeds( + "host -T example.org" + ), "The IP address of 'example.org' does not match 2001:db8::1" with subtest("The server rotates the ephemeral keys"): # advance time by a little less than 5 days @@ -68,7 +141,8 @@ server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys") with subtest("The client can still connect to the server"): - server.wait_for_unit("dnscrypt-wrapper") - client.succeed("host it.works") + client.systemctl("restart dnscrypt-proxy2") + client.wait_until_succeeds("host -T example.org") + client.wait_until_succeeds("host -U example.org") ''; } diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 0122bc440361d..900ea6320100f 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -119,11 +119,6 @@ let package = elk.elasticsearch; }; - kibana = { - enable = true; - package = elk.kibana; - }; - elasticsearch-curator = { enable = true; actionYAML = '' @@ -217,13 +212,6 @@ let one.wait_until_succeeds("cat /tmp/logstash.out | grep flowers") one.wait_until_succeeds("cat /tmp/logstash.out | grep -v dragons") - with subtest("Kibana is healthy"): - one.wait_for_unit("kibana.service") - one.wait_until_succeeds( - "curl --silent --show-error --fail-with-body 'http://localhost:5601/api/status'" - + " | jq -es 'if . == [] then null else .[] | .status.overall.state == \"green\" end'" - ) - with subtest("Metricbeat is running"): one.wait_for_unit("metricbeat.service") @@ -274,7 +262,6 @@ in { # name = "elk-7"; # elasticsearch = pkgs.elasticsearch7-oss; # logstash = pkgs.logstash7-oss; - # kibana = pkgs.kibana7-oss; # filebeat = pkgs.filebeat7; # metricbeat = pkgs.metricbeat7; # }; @@ -282,7 +269,6 @@ in { ELK-7 = mkElkTest "elk-7" { elasticsearch = pkgs.elasticsearch7; logstash = pkgs.logstash7; - kibana = pkgs.kibana7; filebeat = pkgs.filebeat7; metricbeat = pkgs.metricbeat7; }; diff --git a/nixos/tests/ferretdb.nix b/nixos/tests/ferretdb.nix index 9ad7397ade80c..7251198af77dc 100644 --- a/nixos/tests/ferretdb.nix +++ b/nixos/tests/ferretdb.nix @@ -39,7 +39,7 @@ with import ../lib/testing-python.nix { inherit system; }; ensureDatabases = [ "ferretdb" ]; ensureUsers = [{ name = "ferretdb"; - ensurePermissions."DATABASE ferretdb" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/tests/freshrss-pgsql.nix b/nixos/tests/freshrss-pgsql.nix index 055bd51ed43d7..c685f4a8159b8 100644 --- a/nixos/tests/freshrss-pgsql.nix +++ b/nixos/tests/freshrss-pgsql.nix @@ -22,9 +22,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ensureUsers = [ { name = "freshrss"; - ensurePermissions = { - "DATABASE freshrss" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; initialScript = pkgs.writeText "postgresql-password" '' diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index 8bf4caad7fbfc..dd389bc8a3d1f 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -55,7 +55,7 @@ let ensureDatabases = [ "grafana" ]; ensureUsers = [{ name = "grafana"; - ensurePermissions."DATABASE grafana" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; systemd.services.grafana.after = [ "postgresql.service" ]; diff --git a/nixos/tests/hockeypuck.nix b/nixos/tests/hockeypuck.nix index 2b9dba8720aba..675d6b226ad20 100644 --- a/nixos/tests/hockeypuck.nix +++ b/nixos/tests/hockeypuck.nix @@ -35,7 +35,7 @@ in { ensureDatabases = [ "hockeypuck" ]; ensureUsers = [{ name = "hockeypuck"; - ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index e97e8a467b187..e1588088ba198 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -9,13 +9,11 @@ in { nodes.hass = { pkgs, ... }: { services.postgresql = { enable = true; - - # FIXME: hack for https://github.com/NixOS/nixpkgs/issues/216989 - # Should be replaced with ensureUsers again when a solution for that is found - initialScript = pkgs.writeText "hass-setup-db.sql" '' - CREATE ROLE hass WITH LOGIN; - CREATE DATABASE hass WITH OWNER hass; - ''; + ensureDatabases = [ "hass" ]; + ensureUsers = [{ + name = "hass"; + ensureDBOwnership = true; + }]; }; services.home-assistant = { diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1baa4396424fb..e9ec287498509 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -991,6 +991,68 @@ in { ''; }; + bcachefsLinuxTesting = makeInstallerTest "bcachefs-linux-testing" { + extraInstallerConfig = { + imports = [ no-zfs-module ]; + + boot = { + supportedFilesystems = [ "bcachefs" ]; + kernelPackages = pkgs.linuxPackages_testing; + }; + }; + + extraConfig = '' + boot.kernelPackages = pkgs.linuxPackages_testing; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + + bcachefsUpgradeToLinuxTesting = makeInstallerTest "bcachefs-upgrade-to-linux-testing" { + extraInstallerConfig = { + imports = [ no-zfs-module ]; + boot.supportedFilesystems = [ "bcachefs" ]; + # We don't have network access in the VM, we need this for `nixos-install` + system.extraDependencies = [ pkgs.linux_testing ]; + }; + + extraConfig = '' + boot.kernelPackages = pkgs.linuxPackages_testing; + ''; + + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary ext2 1M 100MB" # /boot + + " mkpart primary linux-swap 100M 1024M" # swap + + " mkpart primary 1024M -1s", # / + "udevadm settle", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.bcachefs -L root /dev/vda3", + "mount -t bcachefs /dev/vda3 /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir -p /mnt/boot", + "mount /dev/vda1 /mnt/boot", + ) + ''; + }; + # Test using labels to identify volumes in grub simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' diff --git a/nixos/tests/invidious.nix b/nixos/tests/invidious.nix index 582d1550fff1a..701e8e5e7a3fc 100644 --- a/nixos/tests/invidious.nix +++ b/nixos/tests/invidious.nix @@ -44,8 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { enable = true; initialScript = pkgs.writeText "init-postgres-with-password" '' CREATE USER kemal WITH PASSWORD 'correct horse battery staple'; - CREATE DATABASE invidious; - GRANT ALL PRIVILEGES ON DATABASE invidious TO kemal; + CREATE DATABASE invidious OWNER kemal; ''; }; }; diff --git a/nixos/tests/ocsinventory-agent.nix b/nixos/tests/ocsinventory-agent.nix new file mode 100644 index 0000000000000..67b0c8c911036 --- /dev/null +++ b/nixos/tests/ocsinventory-agent.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "ocsinventory-agent"; + + nodes.machine = { pkgs, ... }: { + services.ocsinventory-agent = { + enable = true; + settings = { + debug = true; + local = "/var/lib/ocsinventory-agent/reports"; + tag = "MY_INVENTORY_TAG"; + }; + }; + }; + + testScript = '' + path = "/var/lib/ocsinventory-agent/reports" + + # Run the agent to generate the inventory file in offline mode + start_all() + machine.succeed("mkdir -p {}".format(path)) + machine.wait_for_unit("ocsinventory-agent.service") + machine.wait_until_succeeds("journalctl -u ocsinventory-agent.service | grep 'Inventory saved in'") + + # Fetch the path to the generated inventory file + report_file = machine.succeed("find {}/*.ocs -type f | head -n1".format(path)) + + with subtest("Check the tag value"): + tag = machine.succeed( + "${pkgs.libxml2}/bin/xmllint --xpath 'string(/REQUEST/CONTENT/ACCOUNTINFO/KEYVALUE)' {}".format(report_file) + ).rstrip() + assert tag == "MY_INVENTORY_TAG", f"tag is not valid, was '{tag}'" + ''; +}) diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 22409e8992367..6a51cc522bdc5 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ lib, ... }: { ensureDatabases = [ "paperless" ]; ensureUsers = [ { name = config.services.paperless.user; - ensurePermissions = { "DATABASE \"paperless\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index cb8de87c9ee31..3ee7ed19fa1c5 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -19,14 +19,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: authentication = '' host all all localhost trust ''; - ensureUsers = [ - { - name = "postgres"; - ensurePermissions = { - "DATABASE \"postgres\"" = "ALL PRIVILEGES"; - }; - } - ]; }; services.pgadmin = { diff --git a/nixos/tests/pgbouncer.nix b/nixos/tests/pgbouncer.nix index 1e72327d42005..bb5afd35ee28f 100644 --- a/nixos/tests/pgbouncer.nix +++ b/nixos/tests/pgbouncer.nix @@ -17,7 +17,8 @@ in systemd.services.postgresql = { postStart = '' - ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER ROLE testuser WITH LOGIN PASSWORD 'testpass'"; + ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER ROLE testuser WITH LOGIN PASSWORD 'testpass'"; + ${pkgs.postgresql}/bin/psql -U postgres -c "ALTER DATABASE testdb OWNER TO testuser;"; ''; }; @@ -28,9 +29,6 @@ in ensureUsers = [ { name = "testuser"; - ensurePermissions = { - "DATABASE testdb" = "ALL PRIVILEGES"; - }; }]; authentication = '' local testdb testuser scram-sha-256 @@ -40,7 +38,7 @@ in pgbouncer = { enable = true; listenAddress = "localhost"; - databases = { testdb = "host=/run/postgresql/ port=5432 auth_user=testuser dbname=testdb"; }; + databases = { test = "host=/run/postgresql/ port=5432 auth_user=testuser dbname=testdb"; }; authType = "scram-sha-256"; authFile = testAuthFile; }; @@ -55,7 +53,7 @@ in # Test if we can make a query through PgBouncer one.wait_until_succeeds( - "psql 'postgres://testuser:testpass@localhost:6432/testdb' -c 'SELECT 1;'" + "psql 'postgres://testuser:testpass@localhost:6432/test' -c 'SELECT 1;'" ) ''; }) diff --git a/nixos/tests/plantuml-server.nix b/nixos/tests/plantuml-server.nix new file mode 100644 index 0000000000000..460c30919aecf --- /dev/null +++ b/nixos/tests/plantuml-server.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "plantuml-server"; + meta.maintainers = with lib.maintainers; [ anthonyroussel ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.plantuml-server.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("plantuml-server.service") + machine.wait_for_open_port(8080) + + with subtest("Generate chart"): + chart_id = machine.succeed("curl -sSf http://localhost:8080/plantuml/coder -d 'Alice -> Bob'") + machine.succeed("curl -sSf http://localhost:8080/plantuml/txt/{}".format(chart_id)) + ''; +}) diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 9afd3db75de8a..9c26c509a5ab5 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -8,9 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { virtualisation.memorySize = 4096; services.plausible = { enable = true; - releaseCookiePath = "${pkgs.runCommand "cookie" { } '' - ${pkgs.openssl}/bin/openssl rand -base64 64 >"$out" - ''}"; adminUser = { email = "admin@example.org"; passwordFile = "${pkgs.writeText "pwd" "foobar"}"; @@ -28,6 +25,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("plausible.service") machine.wait_for_open_port(8000) + # Ensure that the software does not make not make the machine + # listen on any public interfaces by default. + machine.fail("ss -tlpn 'src = 0.0.0.0 or src = [::]' | grep LISTEN") + machine.succeed("curl -f localhost:8000 >&2") machine.succeed("curl -f localhost:8000/js/script.js >&2") diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index 4f1aef854146e..08a01585f8778 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -164,9 +164,12 @@ import ./make-test-python.nix ({ pkgs, ... }: ''; tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=pleroma.nixos.test' -days 36500 mkdir -p $out - cp key.pem cert.pem $out + openssl req -x509 \ + -subj '/CN=pleroma.nixos.test/' -days 49710 \ + -addext 'subjectAltName = DNS:pleroma.nixos.test' \ + -keyout "$out/key.pem" -newkey ed25519 \ + -out "$out/cert.pem" -noenc ''; hosts = nodes: '' @@ -180,7 +183,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - toot + pkgs.toot send-toot ]; }; diff --git a/nixos/tests/powerdns-admin.nix b/nixos/tests/powerdns-admin.nix index d7bacb24eec5d..d326d74a98261 100644 --- a/nixos/tests/powerdns-admin.nix +++ b/nixos/tests/powerdns-admin.nix @@ -87,9 +87,7 @@ let ensureUsers = [ { name = "powerdnsadmin"; - ensurePermissions = { - "DATABASE powerdnsadmin" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index bccfe998f61a9..7840130d4a364 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -257,6 +257,21 @@ let ''; }; + exportarr-sonarr = { + nodeName = "exportarr_sonarr"; + exporterConfig = { + enable = true; + url = "http://127.0.0.1:8989"; + # testing for real data is tricky, because the api key can not be preconfigured + apiKeyFile = pkgs.writeText "dummy-api-key" "eccff6a992bc2e4b88e46d064b26bb4e"; + }; + exporterTest = '' + wait_for_unit("prometheus-exportarr-sonarr-exporter.service") + wait_for_open_port(9707) + succeed("curl -sSf 'http://localhost:9707/metrics") + ''; + }; + fastly = { exporterConfig = { enable = true; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index a075cfc1f1b72..0111273893775 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -3,6 +3,7 @@ let queryPort = 9090; minioPort = 9000; pushgwPort = 9091; + frontPort = 9092; s3 = { accessKey = "BKIKJAA5BMMU2RHO6IBB"; @@ -152,10 +153,15 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "prometheus:${toString grpcPort}" ]; }; + services.thanos.query-frontend = { + enable = true; + http-address = "0.0.0.0:${toString frontPort}"; + query-frontend.downstream-url = "http://127.0.0.1:${toString queryPort}"; + }; }; store = { pkgs, ... }: { @@ -178,7 +184,7 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "localhost:${toString grpcPort}" ]; }; @@ -262,6 +268,10 @@ in import ./make-test-python.nix { query.wait_for_unit("thanos-query.service") wait_for_metric(query) + # Test Thanos query frontend service + query.wait_for_unit("thanos-query-frontend.service") + query.succeed("curl -sS http://localhost:${toString frontPort}/-/healthy") + # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the # Thanos storage service has correctly downloaded it from S3 and if the Thanos # query service running on $store can correctly retrieve the metric: diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix index db0098d2ac48c..a5bb1981d2c3c 100644 --- a/nixos/tests/sftpgo.nix +++ b/nixos/tests/sftpgo.nix @@ -156,7 +156,7 @@ in ensureDatabases = [ "sftpgo" ]; ensureUsers = [{ name = "sftpgo"; - ensurePermissions."DATABASE sftpgo" = "ALL PRIVILEGES"; + ensureDBOwnership = true; }]; }; diff --git a/nixos/tests/slimserver.nix b/nixos/tests/slimserver.nix new file mode 100644 index 0000000000000..c3f7b6fde4de0 --- /dev/null +++ b/nixos/tests/slimserver.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "slimserver"; + meta.maintainers = with pkgs.lib.maintainers; [ adamcstephens ]; + + nodes.machine = { ... }: { + services.slimserver.enable = true; + services.squeezelite = { + enable = true; + extraArguments = "-s 127.0.0.1 -d slimproto=info"; + }; + sound.enable = true; + boot.initrd.kernelModules = ["snd-dummy"]; + }; + + testScript = + '' + import json + rpc_get_player = { + "id": 1, + "method": "slim.request", + "params":[0,["player", "id", "0", "?"]] + } + + with subtest("slimserver is started"): + machine.wait_for_unit("slimserver.service") + # give slimserver a moment to report errors + machine.sleep(2) + + with subtest('slimserver module errors are not reported'): + machine.fail("journalctl -u slimserver.service | grep 'throw_exception'") + machine.fail("journalctl -u slimserver.service | grep 'not installed'") + machine.fail("journalctl -u slimserver.service | grep 'not found'") + machine.fail("journalctl -u slimserver.service | grep 'The following CPAN modules were found but cannot work with Logitech Media Server'") + machine.fail("journalctl -u slimserver.service | grep 'please use the buildme.sh'") + + with subtest('slimserver is ready'): + machine.wait_for_open_port(9000) + machine.wait_until_succeeds("journalctl -u slimserver.service | grep 'Completed dbOptimize Scan'") + + with subtest("squeezelite player successfully connects to slimserver"): + machine.wait_for_unit("squeezelite.service") + machine.wait_until_succeeds("journalctl -u squeezelite.service | grep 'slimproto:937 connected'") + player_mac = machine.wait_until_succeeds("journalctl -eu squeezelite.service | grep 'sendHELO:148 mac:'").strip().split(" ")[-1] + player_id = machine.succeed(f"curl http://localhost:9000/jsonrpc.js -g -X POST -d '{json.dumps(rpc_get_player)}'") + assert player_mac == json.loads(player_id)["result"]["_id"], "squeezelite player not found" + ''; +}) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 13007d0d80d84..256a18532b0a2 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -252,6 +252,35 @@ in ''; }; + garbage-collect-entry = makeTest { + name = "systemd-boot-switch-test"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + + nodes = { + inherit common; + machine = { pkgs, nodes, ... }: { + imports = [ common ]; + + # These are configs for different nodes, but we'll use them here in `machine` + system.extraDependencies = [ + nodes.common.system.build.toplevel + ]; + }; + }; + + testScript = { nodes, ... }: + let + baseSystem = nodes.common.system.build.toplevel; + in + '' + machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${baseSystem}") + machine.succeed("nix-env -p /nix/var/nix/profiles/system --delete-generations 1") + machine.succeed("${baseSystem}/bin/switch-to-configuration boot") + machine.fail("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("test -e /boot/loader/entries/nixos-generation-2.conf") + ''; + }; + # Some UEFI firmwares fail on large reads. Now that systemd-boot loads initrd # itself, systems with such firmware won't boot without this fix uefiLargeFileWorkaround = makeTest { @@ -277,4 +306,20 @@ in machine.wait_for_unit("multi-user.target") ''; }; + + no-bootspec = makeTest + { + name = "systemd-boot-no-bootspec"; + meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + + nodes.machine = { + imports = [ common ]; + boot.bootspec.enable = false; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + ''; + }; } diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix index f3369da99a055..18beaac6f062c 100644 --- a/nixos/tests/tandoor-recipes.nix +++ b/nixos/tests/tandoor-recipes.nix @@ -5,6 +5,29 @@ import ./make-test-python.nix ({ lib, ... }: { nodes.machine = { pkgs, ... }: { services.tandoor-recipes = { enable = true; + extraConfig = { + DB_ENGINE = "django.db.backends.postgresql"; + POSTGRES_HOST = "/run/postgresql"; + POSTGRES_USER = "tandoor_recipes"; + POSTGRES_DB = "tandoor_recipes"; + }; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "tandoor_recipes" ]; + ensureUsers = [ + { + name = "tandoor_recipes"; + ensureDBOwnership = true; + } + ]; + }; + + systemd.services = { + tandoor-recipes = { + after = [ "postgresql.service" ]; + }; }; }; diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 6d76cc8e57412..b52801c898eb3 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -76,6 +76,7 @@ let tests = { rio.pkg = p: p.rio; rio.cmd = "rio -e $command"; + rio.pinkValue = "#FF1261"; roxterm.pkg = p: p.roxterm; roxterm.cmd = "roxterm -e $command"; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 4cfb3cc5a7d84..a5f219e104ad4 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -1,21 +1,26 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ +import ./make-test-python.nix ({ pkgs, ... }: { name = "tomcat"; nodes.machine = { pkgs, ... }: { - services.tomcat.enable = true; + services.tomcat = { + enable = true; + axis2.enable = true; + }; }; testScript = '' machine.wait_for_unit("tomcat.service") machine.wait_for_open_port(8080) machine.wait_for_file("/var/tomcat/webapps/examples"); + + machine.succeed( + "curl -sS --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + ) machine.succeed( - "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + "curl -sS --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" ) machine.succeed( - "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + "curl -sS --fail http://localhost:8080/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'" ) ''; }) diff --git a/nixos/tests/vikunja.nix b/nixos/tests/vikunja.nix index 2660aa9767ca7..60fd5ce13854e 100644 --- a/nixos/tests/vikunja.nix +++ b/nixos/tests/vikunja.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ensureDatabases = [ "vikunja-api" ]; ensureUsers = [ { name = "vikunja-api"; - ensurePermissions = { "DATABASE \"vikunja-api\"" = "ALL PRIVILEGES"; }; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/nixos/tests/web-apps/mastodon/remote-postgresql.nix index 715477191bfbc..6548883db4526 100644 --- a/nixos/tests/web-apps/mastodon/remote-postgresql.nix +++ b/nixos/tests/web-apps/mastodon/remote-postgresql.nix @@ -16,7 +16,7 @@ in meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ]; nodes = { - database = { + database = { config, ... }: { networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -24,11 +24,13 @@ in ]; }; extraHosts = hosts; - firewall.allowedTCPPorts = [ 5432 ]; + firewall.allowedTCPPorts = [ config.services.postgresql.port ]; }; services.postgresql = { enable = true; + # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. + package = pkgs.postgresql_14; enableTCPIP = true; authentication = '' hostnossl mastodon_local mastodon_test 192.168.2.201/32 md5 @@ -41,7 +43,7 @@ in }; }; - nginx = { + nginx = { nodes, ... }: { networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -69,18 +71,14 @@ in tryFiles = "$uri @proxy"; }; locations."@proxy" = { - proxyPass = "http://192.168.2.201:55001"; - proxyWebsockets = true; - }; - locations."/api/v1/streaming/" = { - proxyPass = "http://192.168.2.201:55002"; + proxyPass = "http://192.168.2.201:${toString nodes.server.services.mastodon.webPort}"; proxyWebsockets = true; }; }; }; }; - server = { pkgs, ... }: { + server = { config, pkgs, ... }: { virtualisation.memorySize = 2048; environment = { @@ -98,7 +96,10 @@ in ]; }; extraHosts = hosts; - firewall.allowedTCPPorts = [ 55001 55002 ]; + firewall.allowedTCPPorts = [ + config.services.mastodon.webPort + config.services.mastodon.sidekiqPort + ]; }; services.mastodon = { @@ -106,6 +107,7 @@ in configureNginx = false; localDomain = "mastodon.local"; enableUnixSocket = false; + streamingProcesses = 2; database = { createLocally = false; host = "192.168.2.102"; diff --git a/nixos/tests/web-apps/mastodon/script.nix b/nixos/tests/web-apps/mastodon/script.nix index a89b4b7480e99..afb7c0e0a0ebe 100644 --- a/nixos/tests/web-apps/mastodon/script.nix +++ b/nixos/tests/web-apps/mastodon/script.nix @@ -10,9 +10,8 @@ server.wait_for_unit("redis-mastodon.service") server.wait_for_unit("mastodon-sidekiq-all.service") - server.wait_for_unit("mastodon-streaming.service") + server.wait_for_unit("mastodon-streaming.target") server.wait_for_unit("mastodon-web.service") - server.wait_for_open_port(55000) server.wait_for_open_port(55001) # Check that mastodon-media-auto-remove is scheduled diff --git a/nixos/tests/web-apps/mastodon/standard.nix b/nixos/tests/web-apps/mastodon/standard.nix index 14311afea3f78..e5eb30fef5976 100644 --- a/nixos/tests/web-apps/mastodon/standard.nix +++ b/nixos/tests/web-apps/mastodon/standard.nix @@ -40,11 +40,15 @@ in port = 31637; }; + # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. + services.postgresql.package = pkgs.postgresql_14; + services.mastodon = { enable = true; configureNginx = true; localDomain = "mastodon.local"; enableUnixSocket = false; + streamingProcesses = 2; smtp = { createLocally = false; fromAddress = "mastodon@mastodon.local"; diff --git a/nixos/tests/wiki-js.nix b/nixos/tests/wiki-js.nix index fd054a9c59093..8b3c51935a6c4 100644 --- a/nixos/tests/wiki-js.nix +++ b/nixos/tests/wiki-js.nix @@ -10,14 +10,15 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { enable = true; settings.db.host = "/run/postgresql"; settings.db.user = "wiki-js"; + settings.db.db = "wiki-js"; settings.logLevel = "debug"; }; services.postgresql = { enable = true; - ensureDatabases = [ "wiki" ]; + ensureDatabases = [ "wiki-js" ]; ensureUsers = [ { name = "wiki-js"; - ensurePermissions."DATABASE wiki" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 937b505af2acd..592af9a094f1d 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_3" + "6_3" "6_4" ]; testScript = '' diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 7926fe80de2fd..1a807b27b6f65 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -1,7 +1,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "ejabberd"; meta = with pkgs.lib.maintainers; { - maintainers = [ ajs124 ]; + maintainers = [ ]; }; nodes = { client = { nodes, pkgs, ... }: { diff --git a/pkgs/README.md b/pkgs/README.md index 7f9b2fb220730..31a590e43d8d8 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -114,6 +114,25 @@ Now that this is out of the way. To add a package to Nixpkgs: 7. Optionally commit the new package and open a pull request [to nixpkgs](https://github.com/NixOS/nixpkgs/pulls), or use [the Patches category](https://discourse.nixos.org/t/about-the-patches-category/477) on Discourse for sending a patch without a GitHub account. +## Commit conventions + +- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole. + +- Format the commit messages in the following way: + + ``` + (pkg-name): (from -> to | init at version | refactor | etc) + + (Motivation for change. Link to release notes. Additional information.) + ``` + + Examples: + + * nginx: init at 2.0.1 + * firefox: 54.0.1 -> 55.0 + + https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ + ## Category Hierarchy [categories]: #category-hierarchy diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index cf53a20700a52..d3f814a7db897 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ sndio ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) + ++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=("PREFIX=$out") '' + lib.optionalString - (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) '' + (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") # Fix warning about implicit declaration of function 'strlcpy' diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index d3c1d868d21fb..f476b3c8a8e6f 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , makeWrapper , wrapGAppsHook @@ -15,6 +14,8 @@ , lv2 , lilv , mpg123 +, opusfile +, rapidjson , serd , sord , sqlite @@ -29,7 +30,7 @@ , libid3tag , libopus , libuuid -, ffmpeg_4 +, ffmpeg_6 , soundtouch , pcre , portaudio # given up fighting their portaudio.patch? @@ -61,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.3.3"; + version = "3.4.2"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "audacity"; + repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-m38Awdv2ew+MKqd68x/ZsRBwidM2KJ3BRykIKgnFSx4="; + hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; }; postPatch = '' @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") '' + '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; @@ -94,7 +95,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg_4 + ffmpeg_6 file flac gtk3 @@ -109,8 +110,10 @@ stdenv.mkDerivation rec { lilv lv2 mpg123 + opusfile pcre portmidi + rapidjson serd sord soundtouch @@ -168,12 +171,15 @@ stdenv.mkDerivation rec { doCheck = false; # Test fails + dontWrapGApps = true; + # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency - postInstall = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' wrapProgram "$out/bin/audacity" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_4 ]} \ + "''${gappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index e6bd6aafe7ad6..c71f6fa0bc788 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-t3kslhb6STPemdBN6fXc8jcPgNrlnGzcAUQ3HAUB7Yw="; + sha256 = "sha256-43QmTnFp8raEyZO5NK/UlRM8Ykd0y4iaYlL3MpROmsk="; }; extraInstallCommands = diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 34b4b7ab18833..f2627d65ff561 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -121,6 +121,13 @@ in clangStdenv.mkDerivation { ./autogen.sh ''; + postPatch = '' + # Fix the build on c++17 compiler: + # https://github.com/DeaDBeeF-Player/deadbeef/issues/3012 + # TODO: remove after 1.9.5 release. + substituteInPlace plugins/adplug/Makefile.am --replace 'adplug_la_CXXFLAGS = ' 'adplug_la_CXXFLAGS = -std=c++11 ' + ''; + meta = with lib; { description = "Ultimate Music Player for GNU/Linux"; homepage = "http://deadbeef.sourceforge.net/"; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 648bcd67660ef..cd845c87b590b 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, appstream-glib , desktop-file-utils , fetchFromGitHub , calf @@ -10,9 +11,11 @@ , gsl , gtk4 , itstool +, ladspaH , libadwaita , libbs2b , libebur128 +, libportal-gtk4 , libsamplerate , libsigcxx30 , libsndfile @@ -37,13 +40,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-TuVW2KBJciuFVdduzfFepGOa+UY9+sXRN1gWhfDvXgw="; + hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE="; }; nativeBuildInputs = [ @@ -56,15 +59,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream-glib fftw fftwFloat fmt_9 glib gsl gtk4 + ladspaH libadwaita libbs2b libebur128 + libportal-gtk4 libsamplerate libsigcxx30 libsndfile @@ -102,6 +108,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; meta = with lib; { + changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; description = "Audio effects for PipeWire applications."; homepage = "https://github.com/wwmm/easyeffects"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index a773bbfa1c545..f0aebf4e4a32a 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , which @@ -33,7 +34,13 @@ stdenv.mkDerivation rec { hash = "sha256-aAJ+k+kkOS6k835mEW7BvgAIYGhUHxf7Q4P5cKO8XTk="; }; - patches = lib.optionals mbrolaSupport [ + patches = [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) + ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. (substituteAll { src = ./mbrola.patch; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 503e72dfe0e30..34329fb2ea84d 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,29 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPackages, pkg-config, cmake +{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake , alsa-lib, glib, libjack2, libsndfile, libpulseaudio , AppKit, AudioUnit, CoreAudio, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-RqhlpvMbRSwdcY2uuFAdJnihN3aObcLVMuvCZ294dgo="; + hash = "sha256-3qLmo9Ibl44v6Jj5Ix17ixwqfPt3ITTXUqBETF5pzE4="; }; - patches = [ - # Fixes bad CMAKE_INSTALL_PREFIX + CMAKE_INSTALL_LIBDIR concatenation for Darwin install name dir - # Remove when PR merged & in release - (fetchpatch { - name = "0001-Fix-incorrect-way-of-turning-CMAKE_INSTALL_LIBDIR-absolute.patch"; - url = "https://github.com/FluidSynth/fluidsynth/pull/1261/commits/03cd38dd909fc24aa39553d869afbb4024416de8.patch"; - hash = "sha256-nV+MbFttnbNBO4zWnPLpnnEuoiESkV9BGFlUS9tQQfk="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index f3a0ba8c6e933..15125358e4647 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "galaxy-buds-client"; - version = "4.5.2"; + version = "4.5.4"; src = fetchFromGitHub { owner = "ThePBone"; repo = "GalaxyBudsClient"; rev = version; - hash = "sha256-bnJ1xvqos+JP0KF8Z7mX8/8IozcaRCgaRL3cSO3V120="; + hash = "sha256-mmhXTtESjc8uNULc9zV2Qy/815BEEL7ybdnjArF2CXY="; }; projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/applications/audio/galaxy-buds-client/deps.nix index d45dd12b8b20a..1e72808d90681 100644 --- a/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ b/pkgs/applications/audio/galaxy-buds-client/deps.nix @@ -2,33 +2,42 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.14"; sha256 = "0nn3xgkf7v47dwpnsxjg0b25ifqa4mbq02ja5rvnlc3q2k6k0fxv"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.14"; sha256 = "0diw3l2nblapvvhnpl28fcgmqg845rlp8cszcvzhd8g6mcm54r7i"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.14"; sha256 = "0r0p1g80pj06d8i7mq0kj00bpnsdlrxkh31r9166c779in34y946"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.14"; sha256 = "133w2s2jrjj8731s7xq06c8b4zwn00lb7cn8c1iypqaa82krvkq2"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.14"; sha256 = "06v18kmq10z5gmdqpnvn3aws2ir14gnnz0gvkbj7f68bfggzcg3s"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.14"; sha256 = "1qmggiigsn2rkqr0fhrfvyx138dvazihj64r1s4azq014530r0pk"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.14"; sha256 = "1h0h20cq6hds2mljn1457s42n6pcq821l1d6da2ijncmhk6rdwnl"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.14"; sha256 = "1hnski71ynqqlddfnbhall4fx3ndh04774kzykzparm8nd9aqaam"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.13"; sha256 = "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.14"; sha256 = "1cvyg94avqdscniszshx5r3vfvx0cnna262sp89ad4bianmd4qkj"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.13"; sha256 = "1msrsxzya1l0grfxk17yizfvy2vg4i7hyw1aw54s8gf7x3gpzn86"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.14"; sha256 = "1c1jdxsnqrzwrcalrvc7x34x1zxc5qcpfxx4fkqca99ngw4b0blj"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.14"; sha256 = "182nza6rqndxlwi089r06ladfc6j8vsgqzd7xq21s91zbcbcidar"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.13"; sha256 = "0cs42z2vz679mdic7fbxzjs53xm2lp37wcnh843nz86qvma5280k"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.13"; sha256 = "0s5fcsy2hs2wphd5cs4dnk4aw8zs5bbzisg0ba5akqpzwpps8fs1"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.13"; sha256 = "19kxbgs0nbiw9zq1f9fsawnw0sl5c880z2dfidnjp99vvfda9rzs"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.16"; sha256 = "1gsm421gzzymc6rys4sw4hds33grg2mwpnm5xpbhwfh4bnbfblg8"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.17"; sha256 = "05g761may9xa1n75lmzib5hknjk7k0nz453bmg2d5m0xxqw6yc13"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.17"; sha256 = "0k0xnbayplndc6xld98jdla8zv769aj5s285cpbdgm2dril0rywj"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.17"; sha256 = "0smxxr0b8585x0fq57y3jcaxpl5qyxmkr0c6pd83bsczk8p4rjfy"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "Config.Net"; version = "4.15.0"; sha256 = "0hsyma0r8hssz2h7bx38rr8ajx28x5ya2h4k665cbd65z3cs1di1"; }) (fetchNuGet { pname = "Config.Net.Json"; version = "4.15.0"; sha256 = "1q6v4pj76h0hhn26ln4kc8vg75jm8jnlp1ssnrqzwxy88yf82z4h"; }) (fetchNuGet { pname = "CS-Script.Core"; version = "1.4.2-preview"; sha256 = "0djliiixl3ncc1b29s9knal1ascg359na0pacsm73p98ad1f7pzh"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.0"; sha256 = "1b8kvqli5wql53ab9fwyg78h572z4f286s8rjb9xxmsyav1hsyll"; }) + (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) + (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.1"; sha256 = "1g5g7mnfr668hww9r84pfl04x0s44cq5ppykqg406a0lkdb2g8yp"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.1"; sha256 = "0z0fadsicysa77ji4fnjkaaqfpc0d1w7x9qlkq40kb3jg7xhsmyx"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.1"; sha256 = "15671jvv5j98rkv249nn1fchxcd9gq8b37iwjqbmijig3r4ir718"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "InputSimulatorCore"; version = "1.0.5"; sha256 = "1vfqhqjcrpzahhvv5kyh6pk6j5c06wd0b2831y31fbxpdkxhbs2p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) @@ -112,16 +121,21 @@ (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; sha256 = "10byjmh2s0c13lmnzfw24qmr11kry9hg9y5fib3556y7759qwbqv"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.13"; sha256 = "0gzsiv85g0i8jmjl0nplvljqrgc4y42ds1q0f1x1hdqbnn7vsav2"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.0-preview.178"; sha256 = "1gwk81iq6zipab3dhpwydrqm2mqz67hpx7asvhna3mx0phrp2zqd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.13"; sha256 = "1a6rwgwwqg98dhk5hdb38iffa39khcrvfwskl6i5j3xgvgzzq2lx"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.13"; sha256 = "0rxm79asyx1dji8x7q1z47mzy6zh8qbgw7py6xfkfj89cai6x4p8"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.13"; sha256 = "1f00mzx7gzfhy42yldi3jzaivsl3byspak22rji86iq0vczz28zg"; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.16"; sha256 = "06qf63bx6m18wbhvzfs89m5yl5s08spgg02gr7qy8j36r04k6cc5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.1"; sha256 = "0r14s3zyn3cpic02j80xjh8x6dd8g671f9nfnng5zk1x497qdw3a"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) + (fetchNuGet { pname = "Svg.Custom"; version = "0.5.16"; sha256 = "0qp0vmknclaahf1aj8y2jl4xbaq30rf4ia55fpawxi25dfxsa4wy"; }) + (fetchNuGet { pname = "Svg.Model"; version = "0.5.16"; sha256 = "0c2hk7wgvd2lbc96jxnkcwmzbbdnwgnhh4km9ijb5248qkghs1b1"; }) + (fetchNuGet { pname = "Svg.Skia"; version = "0.5.16"; sha256 = "0ra6svakyg5h6m19ww5yrxl85w8yi3v5vrzqgcnqlvzndk696cyf"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -154,6 +168,7 @@ (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.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index e4a10d82c1396..0432224fa3c32 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,13 +9,13 @@ buildGo121Module rec { pname = "go-musicfox"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38="; + hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; }; deleteVendor = true; diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index 8ba33a267970c..b4800889de109 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7AhdygNl6st5ryaMjrloBvTVz6PN48Y6VVpde5g3+D4="; + hash = "sha256-yXrCE3nsdZP4JHKVslzQafjZ380zC8sZv5TJf8dJqJw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 97862104a057c..80cb8f76981d7 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -6,6 +6,7 @@ , automake , gnome2 , gtk2 +, libGL , libjack2 , libtool , libxml2 @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { audiofile gnome2.gtkglext gtk2 + libGL libjack2 libtool libxml2 diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 935e3a9503836..032ee8ec03c6b 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm, xorg , zita-convolver, zita-resampler }: @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { libxcb lv2 xcbutilwm + xorg.xcbutil zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 004823ee52d71..d0cafaaf7f02c 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.69"; + version = "2.0.78"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gkO6XYiPMkU/zRLvc0yd3jJXVcAgAkR1W1ELTSN461o="; + hash = "sha256-IalfA/nfQrnE90ycOnPEZ4A/L8rwi08ECNA/8YxeAgQ="; }; postPatch = '' diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 2135af507b6a4..f85df83401e08 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins, jack-example-tools }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "magnetophon"; repo = "VoiceOfFaust"; - rev = "V${version}"; - sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + rev = version; + sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU="; }; plugins = [ helmholtz mrpeach ]; @@ -16,35 +16,18 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jack faust2lv2 ]; - runtimeInputs = [ pitchTracker ]; + enableParallelBuilding = true; dontWrapQtApps = true; + makeFlags = [ + "PREFIX=$(out)" + ]; + patchPhase = '' sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker - ''; - - buildPhase = '' - sh install.sh - # so it doesn;t end up in /bin/ : - rm -f install.sh - ''; - - installPhase = '' - mkdir -p $out/bin - - for f in $(find . -executable -type f); do - cp $f $out/bin/ - done - - cp launchers/* $out/bin/ - mkdir $out/PureData/ - # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - cp PureData/* $out/PureData/ - - mkdir -p $out/lib/lv2 - cp -r *.lv2/ $out/lib/lv2 + sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker ''; meta = { diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 348dcfb5986f1..94ee6ad53e69f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -21,11 +21,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.31.3"; + version = "1.32.3"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo="; + hash = "sha256-LZkTpX1O6PSXoYLG6CWCYCQJeCpPtIHpif7r9ENYZ7Q="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e88ce8c9e3397..9577d8ab3959c 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://rybczak.net/ncmpcpp/"; changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jfrankenau koral lovek323 ]; + maintainers = with maintainers; [ koral lovek323 ]; platforms = platforms.all; mainProgram = "ncmpcpp"; }; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index 5e781a9f51158..d85b543baed45 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -30,8 +30,9 @@ stdenv.mkDerivation { ]; patches = [ + # https://github.com/paulnasca/paulstretch_cpp/pull/12 (fetchpatch { - url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + url = "https://github.com/paulnasca/paulstretch_cpp/commit/d8671b36135fe66839b11eadcacb474cc8dae0d1.patch"; sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; }) ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 10bd25e11676c..e07904b32485c 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -1,13 +1,13 @@ { lib -, stdenv +, buildNpmPackage , fetchFromGitHub -, electron -, copyDesktopItems , makeDesktopItem +, copyDesktopItems , makeWrapper +, electron }: -stdenv.mkDerivation rec { +buildNpmPackage rec { pname = "pocket-casts"; version = "0.7.0"; @@ -15,9 +15,15 @@ stdenv.mkDerivation rec { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; + hash = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; }; + npmDepsHash = "sha256-rMLUQGcbBJBbxXP67lXp0ww8U2HYM/m1CP2dOw1cCHc="; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + dontNpmBuild = true; + desktopItems = [ (makeDesktopItem { name = pname; @@ -34,19 +40,12 @@ stdenv.mkDerivation rec { makeWrapper ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/opt/pocket-casts $out/share/pixmaps - - cp -r main.js tray-icon.png LICENSE $out/opt/pocket-casts - install -Dm644 icon.png $out/share/pixmaps/pocket-casts.png - install -Dm644 icon-x360.png $out/share/pixmaps/pocket-casts-x360.png + postInstall = '' + install -Dm644 $out/lib/node_modules/pocket-casts/icon.png $out/share/pixmaps/pocket-casts.png + install -Dm644 $out/lib/node_modules/pocket-casts/icon-x360.png $out/share/pixmaps/pocket-casts-x360.png makeWrapper ${electron}/bin/electron $out/bin/pocket-casts \ - --add-flags $out/opt/pocket-casts/main.js - - runHook postInstall + --add-flags $out/lib/node_modules/pocket-casts/main.js ''; meta = with lib; { @@ -54,6 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "pocket-casts"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index f62af07c522d1..01ccc65d5f63f 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -2,6 +2,7 @@ , fetchurl , autoPatchelfHook , makeWrapper +, undmg , alsa-lib , curl @@ -14,41 +15,49 @@ , xdotool , which -, jackSupport ? true +, jackSupport ? stdenv.isLinux , jackLibrary -, pulseaudioSupport ? config.pulseaudio or true +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio }: let - url_for_platform = version: arch: "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; + url_for_platform = version: arch: if stdenv.isDarwin + then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" + else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.03"; + version = "7.05"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = { - x86_64-linux = "sha256-74fQXN6a3SqNZIc2MkOf2iWwP6oQToklbb3kBuaku6s="; - aarch64-linux = "sha256-BF7iN8NdejqwZzHTFdys422p3qoNIm20IpFuaHdUx3U="; + hash = if stdenv.isDarwin then "sha256-jaT+3cIFVfBopgeeTkpNs9rFX50unlPJogdhkI9bsWU=" else { + x86_64-linux = "sha256-P/PnbJPr4ErDz5ho1/dLERhqkKjdetHzKpCpfVZAYb0="; + aarch64-linux = "sha256-PdnBVlHwoEEv2SPq/p5oyiOlduCEqL35gAY+QIJU1Ys="; }.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ - autoPatchelfHook makeWrapper - xdg-utils # Required for desktop integration + ] ++ lib.optionals stdenv.isLinux [ which + autoPatchelfHook + xdg-utils # Required for desktop integration + ] ++ lib.optionals stdenv.isDarwin [ + undmg ]; + sourceRoot = lib.optionalString stdenv.isDarwin "Reaper.app"; + buildInputs = [ - alsa-lib stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 + ] ++ lib.optionals stdenv.isLinux [ gtk3 + alsa-lib ]; - runtimeDependencies = [ + runtimeDependencies = lib.optionals stdenv.isLinux [ gtk3 # libSwell needs libgdk-3.so.0 ] ++ lib.optional jackSupport jackLibrary @@ -56,7 +65,13 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = '' + installPhase = if stdenv.isDarwin then '' + runHook preInstall + mkdir -p "$out/Applications/Reaper.app" + cp -r * "$out/Applications/Reaper.app/" + makeWrapper "$out/Applications/Reaper.app/Contents/MacOS/REAPER" "$out/bin/reaper" + runHook postInstall + '' else '' runHook preInstall HOME="$out/share" XDG_DATA_HOME="$out/share" ./install-reaper.sh \ @@ -89,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://www.reaper.fm/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + maintainers = with maintainers; [ ilian orivej uniquepointer viraptor ]; }; } diff --git a/pkgs/applications/audio/reaper/updater.sh b/pkgs/applications/audio/reaper/updater.sh index 750bea346bbc3..31832f7173c66 100755 --- a/pkgs/applications/audio/reaper/updater.sh +++ b/pkgs/applications/audio/reaper/updater.sh @@ -5,7 +5,7 @@ set -euo pipefail reaper_ver=$(curl -Ls https://www.reaper.fm/download.php | grep -o 'Version [0-9]\.[0-9]*' | head -n1 | cut -d' ' -f2) -function set_hash_for_arch() { +function set_hash_for_linux() { local arch=$1 pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_linux_$arch.tar.xz) pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") @@ -14,5 +14,15 @@ function set_hash_for_arch() { update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-linux } -set_hash_for_arch aarch64 -set_hash_for_arch x86_64 +function set_hash_for_darwin() { + local arch=$1 + pkg_hash=$(nix-prefetch-url https://www.reaper.fm/files/${reaper_ver%.*}.x/reaper${reaper_ver/./}_universal.dmg) + pkg_hash=$(nix hash to-sri "sha256:$pkg_hash") + # reset the version so the second architecture update doesn't get ignored + update-source-version reaper 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system=$arch-darwin + update-source-version reaper "${reaper_ver}" "$pkg_hash" --system=$arch-darwin +} + +set_hash_for_linux aarch64 +set_hash_for_linux x86_64 +set_hash_for_darwin aarch64 diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 1d43d11c60cfd..d1ac18eabbcf3 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 +{ lib, stdenv, fetchFromGitHub, fetchpatch, alsa-lib, freetype, ftgl, libjack2, libX11, lv2 , libGLU, libGL, pkg-config, ttf_bitstream_vera }: @@ -10,9 +10,18 @@ stdenv.mkDerivation rec { owner = "pantherb"; repo = "setBfree"; rev = "v${version}"; - sha256 = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; + hash = "sha256-e/cvD/CtT8dY1lYcsZ21DC8pNqKXqKfC/eRXX8k01eI="; }; + patches = [ + # link with -lGL can remove on next update + (fetchpatch { + name = "ui-add-lGL.patch"; + url = "https://github.com/pantherb/setBfree/commit/756437db43fbf5481f101d8fc695f8b11192047f.patch"; + hash = "sha256-49PYTayD4TchAApfFvj3DLc4EBTxH8LYx48TtdSRwwA="; + }) + ]; + postPatch = '' substituteInPlace common.mak \ --replace /usr/local "$out" \ diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index da126de3fc436..0f3b8be11c08b 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -22,6 +22,7 @@ , openssl , portaudioSupport ? stdenv.isDarwin , portaudio +, slimserver , AudioToolbox , AudioUnit , Carbon @@ -95,7 +96,10 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + inherit (slimserver) tests; + updateScript = ./update.sh; + }; meta = with lib; { description = "Lightweight headless squeezebox client emulator"; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index b9ca1a1790de8..4feaf9cd99ac2 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkg-config }: +{ lib, stdenv, fetchFromGitHub, xorg, cairo, libGL, lv2, libjack2, mesa, pkg-config }: stdenv.mkDerivation rec { pname = "stone-phaser"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 cairo lv2 libjack2 mesa + xorg.libX11 cairo libGL lv2 libjack2 mesa ]; postPatch = '' diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/applications/audio/string-machine/default.nix index a146ea8cd977a..312cf1db5bac2 100644 --- a/pkgs/applications/audio/string-machine/default.nix +++ b/pkgs/applications/audio/string-machine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, lv2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, boost, cairo, libGL, lv2, pkg-config }: stdenv.mkDerivation rec { pname = "string-machine"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost cairo lv2 + boost cairo libGL lv2 ]; makeFlags = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 52ddd5302191e..47c2297274c89 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.7"; + version = "7.7.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; + hash = "sha256-FNRG0NKHQpPHb3P1M0eshFuGu9lyWFgmufFC5aqr7n0="; }; postUnpack = '' diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 865d82a73562c..877f670d68617 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +{ lib, stdenv, fetchurl, fetchpatch, libogg, libvorbis, libao, pkg-config, curl, libiconv , speex, flac , autoreconfHook }: @@ -11,8 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes a call to undeclared function `utf8_decode`. + # https://github.com/xiph/vorbis-tools/pull/33 + (fetchpatch { + url = "https://github.com/xiph/vorbis-tools/commit/8a645f78b45ae7e370c0dc2a52d0f2612aa6110b.patch"; + hash = "sha256-RkT9Xa0pRu/oO9E9qhDa17L0luWgYHI2yINIkPZanmI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libogg libvorbis libao curl speex flac ]; + buildInputs = [ libogg libvorbis libao curl speex flac ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index 49ad9cccc9ce3..8e6da71a1eadb 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage { postBuild = '' make -C docs \ DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \ - RUSTC_TARGET=${stdenv.targetPlatform.config} \ + RUSTC_TARGET=${stdenv.hostPlatform.config} \ BUILD_MODE=release \ proxmox-backup-client.1 pxar.1 ''; diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index d801d81f86f50..f2beb553edd54 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.9.4"; + version = "0.10.2"; format = "pyproject"; @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "ep1cman"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MFg518iodxdHbr7k5kpkTWI59Kk7pPwyIVswVcjasl8="; + hash = "sha256-EQCI7TkkOhDASMo5yKfAca/gB4ayyPOaDVK6WEaAIgc="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index 86c0d53fcf82e..d73a916b0de36 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.53.1"; + version = "2.54.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-Gsrt/+6fhpwg3DzPtXPj9T9VPaMIaRcYBdWuFOotsbA="; + hash = "sha256-1kgbIg/3SvVT83UfwAYUixs1RQk4PP1quiOcI1mzbZ0="; fetchSubmodules = true; }; - vendorHash = "sha256-zsLPqcLCZSnhlFWvNXZJwlfS+NsaTS07TmWd+x4ZPXA="; + vendorHash = "sha256-Gr9mrME8/ZDxp2ORKessNhfguklDf+jC4RSpzLOSBhQ="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 9a03c3b4b5625..f56fdb09a707b 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RQlWWHoij3gtFwjJeEGsmd5YJNTGX0I84nOAQyWBx/M="; + sha256 = "sha256-UbRsY9fSUYAwPcLfGGDHeqvSsLKUKR+2a93jH5xA9uQ="; }; - vendorHash = "sha256-YmUgKO3JtVOE/YACqL/QBiyR1jT/jPCH+Gb0xYwkJEc="; + vendorHash = "sha256-dOvpOCMxxmcAaticSLVlro1L4crAVJWyvgx/JZZ7buE="; doCheck = false; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 000c1ace4a4ce..f3ea89a73f011 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "snarkos"; - version = "2.2.1"; + version = "2.2.4"; src = fetchFromGitHub { owner = "AleoHQ"; repo = "snarkOS"; rev = "v${version}"; - sha256 = "sha256-vEoEnjVjxVnjZ3Lya1qO2kOypNu07aYSlrSya5NJZzs="; + sha256 = "sha256-sq99lJqSJ436wdSjdOlooGD2PysZzbyb7hTfJ9OUg/U="; }; - cargoHash = "sha256-CVHvBqfcTqWBtLFcEcs9y/LmQ4gXjX+dfqqZSxN+33A="; + cargoHash = "sha256-0x/YKPLh5yf3y/CjrQF18yDfPJ8IlArVVczgyVPzpEI="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index c07f94e5baeeb..dbada09c1b6e9 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,5 +1,5 @@ { autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub -, git, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform +, git, hexdump, lib, libevent, libsodium, makeWrapper, rustPlatform , pkg-config, Security, stdenv, testers, tl-expected, utf8cpp, util-linux, zcash, zeromq }: @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { configureFlags = [ "--disable-tests" "--with-boost-libdir=${lib.getLib boost180}/lib" - "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" + "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ccabb6b11947d..ec5bc924f0caf 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 = "2022.3.1.19"; # "Android Studio Giraffe (2022.3.1)" - sha256Hash = "sha256-JQYl3KsYPgxo6/Eu+KUir3NpUn128e/HBPk8BbAv+p4="; + version = "2022.3.1.20"; # "Android Studio Giraffe (2022.3.1) Patch 2" + sha256Hash = "sha256-IkxOt6DI4cBPUOztEBNJV0DHGruJjVdJ0skxcue+rdg="; }; betaVersion = { - version = "2023.1.1.17"; # "Android Studio Hedgehog (2023.3.1)" - sha256Hash = "sha256-0sN+B1RxxlbgxXrEs8gft4qjvIYtazJS6DllHZ2h768="; + version = "2023.1.1.25"; # "Android Studio Hedgehog | 2023.1.1 RC 3" + sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; }; latestVersion = { - version = "2023.2.1.1"; # Android Studio Iguana (2023.2.1) Canary 1 - sha256Hash = "sha256-7ub9GkJd9J37nG2drXOuU7r4w/gI+m9nlWANqIk2ddk="; + version = "2023.2.1.14"; # "Android Studio Iguana | 2023.2.1 Canary 14" + sha256Hash = "sha256-8szERftch1JWJ66BclJBq5DZcH1Xf1cyVj08WknLoS8="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/cosmic-edit/default.nix b/pkgs/applications/editors/cosmic-edit/default.nix index 9b53bb5ef9263..2adfc012bc6cf 100644 --- a/pkgs/applications/editors/cosmic-edit/default.nix +++ b/pkgs/applications/editors/cosmic-edit/default.nix @@ -15,11 +15,6 @@ , fontconfig , freetype , wayland -, expat -, udev -, which -, lld -, util-linuxMinimal }: rustPlatform.buildRustPackage rec { @@ -51,8 +46,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" ''; - nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal makeWrapper ]; - buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev glib gtk3 ]; + nativeBuildInputs = [ cmake just pkg-config makeWrapper ]; + buildInputs = [ libxkbcommon libinput fontconfig freetype wayland glib gtk3 ]; dontUseJustBuild = true; @@ -74,6 +69,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/cosmic-edit"; description = "Text Editor for the COSMIC Desktop Environment"; license = licenses.gpl3Only; + mainProgram = "cosmic-edit"; maintainers = with maintainers; [ ahoneybun ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 84df7d5b0c275..ad67837b38920 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,20 +38,21 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.201.0"; + version = "1.201.0.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4="; + hash = "sha256-ke7i0eeZHEsVhtzaS0AeLQOrYE1F+ppCwjR2TWeJQPA="; }; + patches = [ ./proc_globdata.patch ]; + postPatch = '' substituteInPlace app/proc_globdata.pas \ - --replace "/usr/share/cudatext" "$out/share/cudatext" \ - --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \ - --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;" + --subst-var out \ + --subst-var-by python3 ${python3} ''; nativeBuildInputs = [ lazarus fpc ] diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/applications/editors/cudatext/proc_globdata.patch new file mode 100644 index 0000000000000..b89476bb5fcbc --- /dev/null +++ b/pkgs/applications/editors/cudatext/proc_globdata.patch @@ -0,0 +1,30 @@ +diff --git i/app/proc_globdata.pas w/app/proc_globdata.pas +index d161b09c7..0fcfbdc09 100644 +--- i/app/proc_globdata.pas ++++ w/app/proc_globdata.pas +@@ -1342,6 +1342,7 @@ begin + + {$ifdef unix} + for Dir in [ ++ '@python3@/lib', + '/usr/lib64', + '/usr/lib', + '/usr/lib/x86_64-linux-gnu' +@@ -1364,7 +1365,7 @@ var + function GetDirPrecopy: string; + begin + {$ifdef linux} +- exit('/usr/share/cudatext'); ++ exit('@out@/share/cudatext'); + {$endif} + + {$ifdef darwin} +@@ -2056,7 +2057,7 @@ begin + FindWrapAtEdge_Delay:= 350; + FindWrapAtEdge_ThemeItem:= ''; //'EdMarkedRangeBg'; + +- AllowProgramUpdates:= true; ++ AllowProgramUpdates:= false; + EscapeClose:= false; + EscapeCloseConsole:= true; + EscapeCloseFinder:= 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 ffd8253ae2c4d..8a8aa1119ead3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -654,10 +654,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2.0.20231106.215852"; + version = "0.3.0.20231111.144610"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.2.0.20231106.215852.tar"; - sha256 = "17qjjifdl3y8p4ldzami9b3ns9mzzqdacvkzsryv5885hzas67zz"; + url = "https://elpa.gnu.org/devel/bufferlo-0.3.0.20231111.144610.tar"; + sha256 = "02vsgmfn7z4772dgfy9laraqrslzz7nqdaibzpj5qx2k0gxrh0nb"; }; packageRequires = [ emacs ]; meta = { @@ -920,14 +920,17 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + company = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231110.5234"; + version = "0.10.2.0.20231115.182802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231110.5234.tar"; - sha256 = "18533dlk7k77if51kjhwlf2yb872ixjf1cffg197bnfy29sdrm11"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231115.182802.tar"; + sha256 = "0l18qi7m8anawl466xd7r3i3cjvhqprhwzclpw92x7hzgnjv73nl"; }; packageRequires = [ emacs ]; meta = { @@ -1000,10 +1003,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3.0.20231107.184238"; + version = "29.1.4.4.0.20231113.72021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.3.0.20231107.184238.tar"; - sha256 = "1mcfx5my48zr14syzmpidgr1kjji2v63sqmx3zh7spxxd274yviq"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20231113.72021.tar"; + sha256 = "0w6dy2356k1k0g4kbr81wv431fb9by03nc7rdgwnsyq4cs3dd46s"; }; packageRequires = [ emacs seq ]; meta = { @@ -1015,10 +1018,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231107.212252"; + version = "0.35.0.20231115.174657"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231107.212252.tar"; - sha256 = "1p9l79sxxa06cxky5z08mccf34hbbp742iza57riknf0zmrglkpc"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231115.174657.tar"; + sha256 = "0j8kj3d2svqns4z2pp18rc6x9blfz0w41r73934wdjxw2fri9wbd"; }; packageRequires = [ compat emacs ]; meta = { @@ -1067,10 +1070,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20231108.174629"; + version = "0.38.0.20231112.81933"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231108.174629.tar"; - sha256 = "1ynkyw7mkl8y66kxwy51gwdj60b4nadk9qbwsjljbfdnc80y6ws5"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231112.81933.tar"; + sha256 = "1zmd13qbdknw03l65fir3a4niq5lbacj28j5kqknka87f3lz4pd2"; }; packageRequires = [ compat emacs ]; meta = { @@ -1332,10 +1335,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20231107.64253"; + version = "2.1.0.0.20231115.111152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231107.64253.tar"; - sha256 = "143pgnsfi3mf42n1yrwjr79b32k0081i19zdkwg97xhvfbqhiddw"; + url = "https://elpa.gnu.org/devel/denote-2.1.0.0.20231115.111152.tar"; + sha256 = "0mp57k3z1gyc21lj010yi9nb3qpqd6yirysf9ljcy9h5bxnqafmh"; }; packageRequires = [ emacs ]; meta = { @@ -1491,10 +1494,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2.0.20231109.135341"; + version = "0.3.0.20231114.215046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-duplicates-0.2.0.20231109.135341.tar"; - sha256 = "07ridbcy3n0v3dax7kj3d7nk2k0w57dnapd4kki4xhkm4fklx6w6"; + url = "https://elpa.gnu.org/devel/dired-duplicates-0.3.0.20231114.215046.tar"; + sha256 = "0rla938sj1zig7qcdxybl7qm4x1b0ndpf9xf9ikj0vfdghyg7z2s"; }; packageRequires = [ emacs ]; meta = { @@ -1634,6 +1637,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1.0.20231112.180047"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231112.180047.tar"; + sha256 = "09s55hfy11y7v1d2l6nggz8b27mrsvqabb5xwpipnnynkmif2q2q"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -1800,10 +1818,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20231107.90944"; + version = "1.15.0.20231115.41203"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231107.90944.tar"; - sha256 = "135a3zyzjpv2n0c988b9g9mh93y7p1dp9nvmchm4i26mdmzn6jbz"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231115.41203.tar"; + sha256 = "0xybf9czzkdpv94qsbmq725scmjjkm4gwn74ffa8r99a0i1w2nki"; }; packageRequires = [ eldoc @@ -1911,10 +1929,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231104.193345"; + version = "0.23.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231104.193345.tar"; - sha256 = "10qny8wp74np12sczz08gfrxspvapwvz2zkdig76wcrpd4kdpjk4"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231112.53804.tar"; + sha256 = "056kgr14msd6fhzwpdazzaxzmn65wm6qp59z22l5ykpr8awl4jxi"; }; packageRequires = [ compat emacs ]; meta = { @@ -1931,10 +1949,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231104.193345"; + version = "0.8.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231104.193345.tar"; - sha256 = "15syrabv26yq69g2lz2dqs8w4drw1v3whr0h2vzmc1p0pv9jpks2"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231112.53804.tar"; + sha256 = "1fxk8hfid2ii912can7b1gp8fzkq31y1cfi53n9mw6p0nj26c1fh"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1956,10 +1974,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14pre0.20231029.40923"; + version = "0.14pre0.20231111.212243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231029.40923.tar"; - sha256 = "06r0s8dxlxr63a1zgdk0qxzd6x27r6mlymi6hxp8923yvwqddkdf"; + url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231111.212243.tar"; + sha256 = "13xd7m5pigfvqnrxqr40dg9139djb0m9l3p7scvi0fi05247kf5l"; }; packageRequires = [ emacs @@ -1985,10 +2003,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20231106.173540"; + version = "16.0.20231110.185602"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20231106.173540.tar"; - sha256 = "08l7nzz596jwqr4wcjcvsihdhai4faqihavrshvja2nhrdxxm79x"; + url = "https://elpa.gnu.org/devel/emms-16.0.20231110.185602.tar"; + sha256 = "114dsyncfcgrxjypf475n5kabcmm08szq4sa2grqv5gcm9l63qwr"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2054,10 +2072,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231104.154155"; + version = "5.6snapshot0.20231112.203749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231104.154155.tar"; - sha256 = "0z22cw6hgn4lsc1bp4ci75v03mvlra1nyfj8g7xkfdv75nbv2yga"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231112.203749.tar"; + sha256 = "1zag35hnzc72gbjr00ljfz803z8rmz8qhyxxvcxaia769vhmh5j8"; }; packageRequires = [ compat emacs ]; meta = { @@ -2633,10 +2651,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4.0.20231015.114428"; + version = "1.0.5.0.20231115.90848"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-mode-1.0.4.0.20231015.114428.tar"; - sha256 = "1y3571ymlrgiq5jxbwlyw43pmfxgq776pajb9hlvyz9l3w195c8g"; + url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; + sha256 = "1z7v8kwamh217k0lfwcdycj4wnq4dj9lrryppqhjdqb7cj02bmdz"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2683,10 +2701,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.6.0.0.20231104.45848"; + version = "0.6.0.0.20231113.71128"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231104.45848.tar"; - sha256 = "1ppvgi17agzrsjfd9jaa5zszvqcm1n4rfy7z82da4rl5mbgnml9p"; + url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231113.71128.tar"; + sha256 = "19aj5bp72ic2j9fv4lygnpj01bl89ifcw4s75lqasff60mlv0320"; }; packageRequires = [ emacs ]; meta = { @@ -3113,10 +3131,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231104.142700"; + version = "0.9.0.20231111.85046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231104.142700.tar"; - sha256 = "16qq42qmklyls2fc482x2pv1l14x3kn78l41imvg8jrv3z64j89p"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231111.85046.tar"; + sha256 = "1dp2sclzrr5918n2zjzyxhxcf3sd393a3a4xr4c8wdi2wdpmn1vs"; }; packageRequires = [ compat emacs ]; meta = { @@ -3720,10 +3738,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20231031.71656"; + version = "4.3.0.0.20231115.130235"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231031.71656.tar"; - sha256 = "04hjhg596qfkrnll0wrg4f50ilns28jpf2ws7021wivr370xajki"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231115.130235.tar"; + sha256 = "025iqd3c9kwrv1hwdr1szp1cl23bkf1vahad6nhx00x351rxv0r0"; }; packageRequires = [ emacs ]; meta = { @@ -4139,10 +4157,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20231107.210315"; + version = "1.0.0.20231110.144817"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231107.210315.tar"; - sha256 = "0j5fkmw4qy40ab2c6d0mf6637s8q95gi3sp7w477d6ymck5i2ck8"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231110.144817.tar"; + sha256 = "0cfspqc7livr0m3s021gp2cl74qnv1pvyxba83af0088nb9z0aqz"; }; packageRequires = [ emacs ]; meta = { @@ -4154,10 +4172,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231108.95550"; + version = "9.7pre0.20231115.92033"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231108.95550.tar"; - sha256 = "01dk4sq5wfiwj9g5bfriqqkfrgdfy3c7kixd7y4cf9k6pbjl4sfp"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231115.92033.tar"; + sha256 = "18sbwnw57xp9ss78f3xva3jysdvzk0lcppr2g4qgb696fkglp6w1"; }; packageRequires = [ emacs ]; meta = { @@ -4773,10 +4791,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20231101.62313"; + version = "1.0.1.0.20231115.55251"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231101.62313.tar"; - sha256 = "10k57sd29hkbja85sn5yf7wm0g5wyk216ykdjl4vr03891ic03dg"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231115.55251.tar"; + sha256 = "15pvf6f0g423w3vi86l8djxvzzrvziml7rlqp314xskp8kz7w6g6"; }; packageRequires = [ emacs ]; meta = { @@ -4940,10 +4958,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.1.0.20231020.222710"; + version = "1.5.1.0.20231113.141045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231020.222710.tar"; - sha256 = "0lmq7x7x8cm6y8vp2gin1h6h7chkflj5fyzls4b61rh15yg8m1h0"; + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; + sha256 = "1lidmlrsg0jax0mmsxgpjk70x4i4vhiv5ira744rj7m3w0mwgmrw"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -5621,10 +5639,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.1.0.0.20230606.175440"; + version = "0.1.0.0.20231115.114712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20230606.175440.tar"; - sha256 = "01541k8j5g920vnj3ds6ancqyi36n6ak00g4rq5vc6ia1ybxiijh"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20231115.114712.tar"; + sha256 = "1why1wwbpasmag8czsgb65f8gkqjcg5hckgmk9106ml834krhhx5"; }; packageRequires = [ emacs ]; meta = { @@ -5719,10 +5737,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.3.0.20231103.213748"; + version = "0.3.0.20231114.102408"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.3.0.20231103.213748.tar"; - sha256 = "1nr6faizww1nzv5lpdikbqxkc6i1hswg2qa50cybl05ycqq9b10a"; + url = "https://elpa.gnu.org/devel/srht-0.3.0.20231114.102408.tar"; + sha256 = "0s5xa8vqb6wzxmv3vx8cc8lkpnnkfzdjljra7lz105m3v2adz1a0"; }; packageRequires = [ emacs plz ]; meta = { @@ -6042,10 +6060,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20231106.72513"; + version = "0.8.0.20231111.112832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231106.72513.tar"; - sha256 = "1pbw7wrhz5h1xykbc1ihhpzqc0kki6k637wagx8yfz95n606808d"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231111.112832.tar"; + sha256 = "1gd4dvill1vvdncibjfv7vl1rxlkhcq2nfppczyp2sr565fgcb0c"; }; packageRequires = [ compat emacs ]; meta = { @@ -6230,10 +6248,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20231027.212124"; + version = "0.4.3.0.20231112.92348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231027.212124.tar"; - sha256 = "0rzc5ks0b9nlnvggj7hn9648y5siw9qjpg8n3swlmkb68m3b2c05"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231112.92348.tar"; + sha256 = "01yvwx8psllys34fry1vp2h7w3jll8kcrglsri8p2d3bps45pn14"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6408,10 +6426,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20231101.193012"; + version = "0.3.0snapshot0.20231110.152111"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231101.193012.tar"; - sha256 = "12hmms0yr0vybayvzkbqbp5j428lsnirzwg93f1l8m05xxs3xm9w"; + url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231110.152111.tar"; + sha256 = "15vbi4vjqr9kz1q1525snl5pz35mgbzrjkysl7gm4zpj6s6qcbar"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6643,10 +6661,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20231108.202420"; + version = "1.4.0.20231115.164627"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231108.202420.tar"; - sha256 = "1c34pq5l7ckjlyimpa528d8a7q5pakz3li5bc4ka86mwf861kd7v"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231115.164627.tar"; + sha256 = "1rb2lvk2h7qxddws53n0qp5mg71b6gy94rdqy6nz77f1p3rrxqwf"; }; packageRequires = [ compat emacs ]; meta = { @@ -6663,10 +6681,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.3.0.20230818.15224"; + version = "0.7.3.0.20231115.51213"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20230818.15224.tar"; - sha256 = "0q23yw8dy9abawqlcpwjrk668kvxyffv972j0s6579z37i643gv6"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20231115.51213.tar"; + sha256 = "1ymjcby120181rfl353kdx1i4jpg5vb6vrag5775bknr3ijjqax9"; }; packageRequires = [ emacs posframe vertico ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 82f1c6bfaaae8..ff5cce83103e5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -65,7 +65,7 @@ self: let }); xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 6152ef002fd23..c214731a22894 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -569,10 +569,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.2.tar"; - sha256 = "1dvpzxlnzs037wz9xhiwiz2qrc7r2i05z6p6p0sy8i4kb6scc6gy"; + url = "https://elpa.gnu.org/packages/bufferlo-0.3.tar"; + sha256 = "16fj1wiqymyys0wjnbmmfwpvqxnm3mlqfrg7nrsryfgpv2mv9z17"; }; packageRequires = [ emacs ]; meta = { @@ -877,10 +877,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3"; + version = "29.1.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.3.tar"; - sha256 = "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.4.tar"; + sha256 = "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr"; }; packageRequires = [ emacs seq ]; meta = { @@ -1177,10 +1177,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.0.0.tar"; - sha256 = "1wrfbirkzf9szss1rgpmgdr0gy2dvhnbzlnyhw3sp2jvw5sb1xz9"; + url = "https://elpa.gnu.org/packages/denote-2.1.0.tar"; + sha256 = "1igp9h327b9x3fxrp34bz0x5slk659r3asjdia3jm8amajm4bw6s"; }; packageRequires = [ emacs ]; meta = { @@ -1318,10 +1318,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-duplicates-0.2.tar"; - sha256 = "1n5n961f1mrvcqfrz56734qj1ynajdjblyf4y60pw9m3fn03db4s"; + url = "https://elpa.gnu.org/packages/dired-duplicates-0.3.tar"; + sha256 = "1b9drjkbs9anqil274jrn031agpkir9mhs96l2ylm13n8imx9msl"; }; packageRequires = [ emacs ]; meta = { @@ -1449,6 +1449,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/drepl-0.1.tar"; + sha256 = "0lx94kcxgp8s13w7hz9857r9baqfswvj7vc9frjq4crc4ps7fi7r"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -2357,10 +2372,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-mode-1.0.4.tar"; - sha256 = "1c97m28i6lym07kb05jgssjxj6p9v3v56qrn48xwv55sriqrha4l"; + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; + sha256 = "1ksafa4nfd4n1kdxpjk6i59l5rxfdmcqjkkpmmc8w402xka0vwn4"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -3753,10 +3768,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.11"; + version = "9.6.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.11.tar"; - sha256 = "18hp5jx90wn9xsg8frql3r1kmn2q9qph6plcssj64fp34wcwxsd8"; + url = "https://elpa.gnu.org/packages/org-9.6.12.tar"; + sha256 = "0qkq7vx3kga18001clsac4rbg9bw5cp9k5qnixw7s39xajd4bcv3"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2808ec7fcc0f5..84c991ad17c27 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -118,7 +118,7 @@ self: let }); jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; @@ -159,7 +159,7 @@ self: let ); xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index ccde3ca0303ba..117adcd47a9c4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -23,6 +23,8 @@ in ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; + el-easydraw = callPackage ./manual-packages/el-easydraw { }; + elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; emacspeak = callPackage ./manual-packages/emacspeak { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix new file mode 100644 index 0000000000000..608777208bb6b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -0,0 +1,45 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, writeText +, unstableGitUpdater +, gzip +}: + +let + rev = "de68851724072c6695e675f090b33a8abec040c9"; +in +melpaBuild { + pname = "edraw"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "misohena"; + repo = "el-easydraw"; + inherit rev; + hash = "sha256-l9i+HCRKnKiDqID+bfAOPE7LpVBZp1AOPkceX8KbDXM="; + }; + + commit = rev; + + packageRequires = [ gzip ]; + + recipe = writeText "recipe" '' + (edraw + :repo "misohena/el-easydraw" + :fetcher github + :files + ("*.el" + "msg")) + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/misohena/el-easydraw"; + description = "Embedded drawing tool for Emacs"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ brahyerr ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index c2754d7fc30f7..cd45cfc787271 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -315,7 +315,7 @@ let ivy-rtags = fix-rtags super.ivy-rtags; jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary; + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 27ab7dbd543d1..37a9e04418c65 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.11.0.tar"; - sha256 = "010sl2l9vx3k095bkgvi7w1zvb68jh7lj4plmjn98lmzmbhq7q27"; + url = "https://elpa.nongnu.org/nongnu/cider-1.11.1.tar"; + sha256 = "1zp24p67w9wcc26s0b95idvzy1ndk35a8rabj3ckg1sgddgzh0p6"; }; packageRequires = [ clojure-mode @@ -1534,10 +1534,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.4"; + version = "17.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.4.tar"; - sha256 = "0xf8smasbb53ddg4vxckpg5w48dnm16v2k5vimfqr73cig49z87f"; + url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; + sha256 = "0ld9wjak3fzwi9w2552fzq1562h7g19q69pigp16rj30smp5gkj7"; }; packageRequires = [ emacs ]; meta = { @@ -2375,10 +2375,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.20.tar"; - sha256 = "13ff9g2lzcddi8n6bcmb7g93kxc8v9h3g9k8qcn42bl7jjy12iqf"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.21.tar"; + sha256 = "01yli62vcnh763pf1bp0f649hhrbl8y7ad89q7b98xgcciqgzm93"; }; packageRequires = [ cl-lib compat emacs let-alist ]; meta = { @@ -2608,10 +2608,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20231109.110741"; + version = "1.0.20231115.104415"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231109.110741.tar"; - sha256 = "19d1bs0ajc28wa49f1mphdwrpfywib5cvv3mxip6az9x6faand7g"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231115.104415.tar"; + sha256 = "01ihh66c20c2dv6apswgww8wxwn1ldqhpk70mfbgjipc9a7ykwws"; }; packageRequires = [ emacs ]; meta = { @@ -2987,10 +2987,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.6.tar"; - sha256 = "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.7.tar"; + sha256 = "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib"; }; packageRequires = [ emacs ]; meta = { @@ -3002,10 +3002,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.26.2"; + version = "0.27.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.2.tar"; - sha256 = "14rcg6rs4dd4a0pr4makkg1flwxfrxyg5xrs5sa034bzxj6zqal5"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.0.tar"; + sha256 = "1r0qspi9qdnsa4gm9bmxzsjyalqi14jhjx96jqw725pmhvjy9933"; }; packageRequires = [ compat emacs ]; meta = { @@ -3471,10 +3471,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.15.20231105091131"; + version = "24.18.20231115084756"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.15.20231105091131.tar"; - sha256 = "13wvf6zn87xpglpycxmjmq6mfvpr21bsihsshx06my38832kw128"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.18.20231115084756.tar"; + sha256 = "1vj8l4g4hpdvs1yvgkcy79vbf2ibhwxfgcrg1mj26qj3f9naf25s"; }; 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 3c839bdb04196..eb98b6176fea2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -3811,17 +3811,17 @@ }, { "ename": "apheleia", - "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", - "sha256": "17aknfx1ii97lsqm4228rxawa6klnxpi948pl5bzwls9fx91g31v", + "commit": "b2cbf8111f532b35eb1c818d8c1f8297f3241000", + "sha256": "0sahfd897g34b59r80kl697yfcfx9s62v8b1p66iv3ivfl9wvswd", "fetcher": "github", "repo": "radian-software/apheleia", "unstable": { "version": [ - 20231105, - 2008 + 20231112, + 32 ], - "commit": "54a192c3454e82be9d5ad910d80796b27d58035f", - "sha256": "0wac6qhv89c6x2scbdxhxdrjhqm3jmm7fzzvirxibyd94fxjzzd3" + "commit": "ddea9bea708ce029cea6126b5be8e9f8979c58b3", + "sha256": "05lg9qych2x31cw8clfngrhzqgs858kcawnk07pyp45563pm0zjl" }, "stable": { "version": [ @@ -4576,20 +4576,26 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20231110, - 1334 + 20231115, + 2156 + ], + "deps": [ + "named-timer" ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" }, "stable": { "version": [ 0, 4, - 1 + 5 + ], + "deps": [ + "named-timer" ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" } }, { @@ -6196,11 +6202,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231022, - 1757 + 20231115, + 1037 ], - "commit": "a32d83a2c8714c5f2fdb8cc8cb6733a2eb1a4e87", - "sha256": "1k3nyp4h9iqz6cx90g469jf2j7kvr4q8mqn2i0han2a406izk9n5" + "commit": "7b3f26d24be4732e001ae3a0e0db35111e68c38f", + "sha256": "00zgkg3biy3lkaj9jsmn7b4nmnlyj0bqsjfc4qabm2mk0yar0is6" } }, { @@ -9248,11 +9254,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20231110, - 943 + 20231112, + 1455 ], - "commit": "0238406db380b733708e4ad7e5a75aeafe6a2640", - "sha256": "1rrjhkhsgfgzcbwgn6hlzh3n87205jj9yk3qpaflqhw83axms5jh" + "commit": "dbe094221fd727b8d3a4bffa84fc754df83c0450", + "sha256": "1m9z3sswm79rawivgz4fw51cp20qznsa9911dci3b2xpnnhpz89i" } }, { @@ -11662,16 +11668,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20231109, - 1008 + 20231112, + 904 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "ac122af751ba9903599c6eb9c3e9e12a375e19d0", - "sha256": "1712a7dhiw6a2bj4qq916dx2gk3124g7shxnizyy3nsvc6q08cdi" + "commit": "2640b72b7eed0b5f702377d3e0d723c23dda792f", + "sha256": "1g31lyzl3fx3bqgd1yrjrpb7a8zbl3sr8jqsssn5f6yp4lm4bqzb" }, "stable": { "version": [ @@ -11800,14 +11806,14 @@ "repo": "positron-solutions/champagne", "unstable": { "version": [ - 20230511, - 1540 + 20231111, + 358 ], "deps": [ "posframe" ], - "commit": "069452fa162d6aefc693c8d0546a84d967218289", - "sha256": "1qby7d95rl1vrkvq5y1i2bmy1bijv9pxm4whfwnhz9fkb3s88r9f" + "commit": "a99e1584207bc03a0cb776f715bd47de1d651010", + "sha256": "09ms3yx7h2ynqyf9mdjp90asahncq7k1mvnbkvj1g9f1l59zk6ns" }, "stable": { "version": [ @@ -11932,14 +11938,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231108, - 1115 + 20231113, + 356 ], "deps": [ "shell-maker" ], - "commit": "a05e30073f42eb6c10dfe0741ff86d3c22e914b4", - "sha256": "07j4pvb7li43c6ldakzfyj88s20f0dnfzn0ilpvf76i5q66hpqcr" + "commit": "50984ba1e833be89c41b9779e8dca5d04cb16a29", + "sha256": "1fvcd3gyipxq9x3yfl5q6i3yx2fq5vwqf6wx4c200awqc1crs89l" } }, { @@ -12571,8 +12577,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231108, - 2054 + 20231114, + 1140 ], "deps": [ "clojure-mode", @@ -12583,14 +12589,14 @@ "spinner", "transient" ], - "commit": "bf9dceca17e912605e2d8327c44ed241e2a556e2", - "sha256": "1wca624gdnrqlkadlqafj0xibma8xgsh9qqpzynr6b8q2vmff98j" + "commit": "5261886ad7c0a8828d022812c7c1c6b503ddd6ba", + "sha256": "1m9bva5wi4mna80qrr401pvghxk54nh773544c5i11fanisyq9sc" }, "stable": { "version": [ 1, 11, - 0 + 1 ], "deps": [ "clojure-mode", @@ -12601,8 +12607,8 @@ "spinner", "transient" ], - "commit": "6e5294624959736c486f7a466bd5e78ce6183ab9", - "sha256": "0zr3p8isidfh9w44cjq50wk13balbswyyn2ycs368afkraqbry5w" + "commit": "9c605cd4938c0055c2766c55606f19ecbf664e8e", + "sha256": "15s8nvzgz4ymayg0k3nia9h7kcrn5c8m4clspgz2pzz3ywh10cfw" } }, { @@ -12883,16 +12889,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231019, - 2047 + 20231112, + 1605 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", - "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" + "commit": "8115bed9d4ce0b7a0765de6fbe6b4efdad23b89e", + "sha256": "1mmlax5z437d96wn3v2gjck3cmx8k8r370rrymiisgjar8sj8bg9" }, "stable": { "version": [ @@ -13524,8 +13530,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20231009, - 1104 + 20231116, + 525 ], "deps": [ "cider", @@ -13538,8 +13544,8 @@ "seq", "yasnippet" ], - "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", - "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" + "commit": "05e90bd9a0f24027011aab1bf041c16a24797e0c", + "sha256": "0y91034nkvx9sz69k5wfynf0cj4rcwnav33n8bq72cknvv67zll8" }, "stable": { "version": [ @@ -14221,20 +14227,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20231006, - 1308 + 20231115, + 1355 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" }, "stable": { "version": [ 3, 27, - 7 + 8 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" } }, { @@ -15266,11 +15272,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231110, - 52 + 20231115, + 2254 ], - "commit": "07d1c41f83d5ad5f6263e726283a05ad12cd37a5", - "sha256": "0f2hnypzdggfw8dxyysf05n51za86qs1z6b8syrdnkyxcm41j793" + "commit": "e22230561ef559b032b4a2d79bef686d494b8ea6", + "sha256": "02lhq2iaxyarvq0h194ivzvw8fncvv0a1hp9dxhd47jr83k0wj84" }, "stable": { "version": [ @@ -17620,14 +17626,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231110, - 926 + 20231115, + 1746 ], "deps": [ "compat" ], - "commit": "f36be0c05b9bea10cc7b477a7c82a196cee7c58a", - "sha256": "0n604z8xviwc58944d33zxq20xyn3i01rvh28av1mx4hvlgjd1zp" + "commit": "d7a0415c4ff3a84b696e5ddbc2ef15d0d45c405d", + "sha256": "15lvjb0hv3vb7xylavi2xsqdxq3b2ryi0zd866h5a3njhkk1sv76" }, "stable": { "version": [ @@ -17890,28 +17896,26 @@ "repo": "tomoya/consult-ghq", "unstable": { "version": [ - 20210606, - 2047 + 20231111, + 1303 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" } }, { @@ -18406,26 +18410,26 @@ "repo": "sshaw/copy-as-format", "unstable": { "version": [ - 20231104, - 1933 + 20231112, + 1710 ], "deps": [ "cl-lib" ], - "commit": "d4a88544d3e89385cc401f2026e8d46ca02e7ca4", - "sha256": "09c5ic11iikldqhdfrym57ry167dxln5bv75vv459xzf0nw9iqaw" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" }, "stable": { "version": [ 0, 0, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "d2376c64334fe3de65d89d6d138a2187f9bf802f", - "sha256": "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" } }, { @@ -18548,14 +18552,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20231108, - 1746 + 20231112, + 819 ], "deps": [ "compat" ], - "commit": "42efcfd28f6286110cc2ba0d90ffd67a81e0667b", - "sha256": "0ns0xli4l53vxmw8bshnqqi0zm85nld6p2vw30psfpgaz70j2zqy" + "commit": "41e35c23a3512df658cdea95b246977923af56f5", + "sha256": "1gpzlrq631839jds991pzplqnz92yifsmvxbylh4rswpzcmrn46g" }, "stable": { "version": [ @@ -20907,14 +20911,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 913 + 20231112, + 449 ], "deps": [ "shell-maker" ], - "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", - "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" + "commit": "bca784daa620767b5e57a5020289cb547c40f8b3", + "sha256": "1gzzfsw0bdyqbq6fgfsl0vwy0z639618sq74kdvk0hnssrbx1f01" } }, { @@ -21021,8 +21025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20231110, - 659 + 20231113, + 706 ], "deps": [ "bui", @@ -21035,8 +21039,8 @@ "posframe", "s" ], - "commit": "f6706fa917aecdd1ebf71ee217724622cc6a97e4", - "sha256": "0jjnhl5hrpvdd4qb3jz6pdjgrp9qjxbm5dbgdhi6bkl2jhxy93fv" + "commit": "755845ae053bbfdd3f7b3dca13efa4be480370b5", + "sha256": "0rj0y85gkn50cly77dmy8g1z16czi1vg6qc9sh75x1vl7s1wr615" }, "stable": { "version": [ @@ -23438,11 +23442,11 @@ "repo": "hjudt/dired-duplicates", "unstable": { "version": [ - 20231109, - 1353 + 20231114, + 2150 ], - "commit": "349eebbd8b3fc10fa2a4551426769d20744e2eb2", - "sha256": "0zpv0112xphvci5rdw04qai9pdjf2ig6jf4kianwjzlgcrma5zar" + "commit": "e07552323b26ce68956f8b03aa66af145bae4d86", + "sha256": "1psa217zsl91qkvlrkysw7ycv9rc6vk8462rf6lfjmvb9bf5hpqm" } }, { @@ -26401,11 +26405,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231109, - 856 + 20231113, + 759 ], - "commit": "642a907fdec8b765e777d0c9656388694a15dae9", - "sha256": "15fsn7dp6jngyl8457rcrsq243r93plamn4wdlidgm3kb05lyaqk" + "commit": "e4a139fe181ed1b576302fb36f3761fbf9914580", + "sha256": "03rincnyz895d0g49gifbjn8b7gr5b37c8fbpk7anrrp29gfr6n1" } }, { @@ -26869,26 +26873,26 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20231103, - 840 + 20231113, + 908 ], "deps": [ "dash" ], - "commit": "2f8ad56c8d9b3e6226b6641de1f8b61571225950", - "sha256": "01dbyplh6gwkk85amrx916h1lxjdbnvps7wqai3ny9wfixh7w0q8" + "commit": "98c53882a6b6703c62d7a59e0dcdf5e29ca2ca95", + "sha256": "17isgyg85fdhhhzn9jh6d0cba19ag7zwkppc1n34i2knm91411hm" }, "stable": { "version": [ 0, 8, - 3 + 6 ], "deps": [ "dash" ], - "commit": "be79e9fd4ba705308ed26a801c1072c0fd46a58c", - "sha256": "14wxlmmm6pylj6zw18q76p82bmlvd4sqgfwmd57fs7gjdv0qgqis" + "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", + "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" } }, { @@ -27181,11 +27185,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20221122, - 427 + 20231113, + 748 ], - "commit": "0c6cf404a49bd68800221446df186fffa0139325", - "sha256": "09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4" + "commit": "c854d128cba8576fe9693c19109b5deafb573e99", + "sha256": "0zfgns9q8bqiwjckfqcywzv00j3984r5kni5xp5rz3wxx8pgqvkv" } }, { @@ -28210,11 +28214,11 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20230525, - 651 + 20231112, + 2210 ], - "commit": "8cabc6d77b41bf0c9982ab56530c088d980bc353", - "sha256": "02hbvs6dqjcjiws3672frgbnr62l2biqjqs0npkhz6b50h99gzzr" + "commit": "1979bec36dba95168c9e6c68bd7d9248502de68e", + "sha256": "0dizx7clclwlgg858kbhg6ds4aj4949anwk0hf72dn08dxadwk81" }, "stable": { "version": [ @@ -28347,28 +28351,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20231007, - 340 + 20231111, + 513 ], "deps": [ "llm", "triples" ], - "commit": "bd7bb3bde2508455471a848d7013e169a81f1de0", - "sha256": "00sj500009y45jf1apdvdl8p5l163vxjk07bryzp4bbk2q6qsfyp" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "llm", "triples" ], - "commit": "74d43f53cf9b11c40cf97de26d871a39c2ec596f", - "sha256": "0gj7ka0whp7wv1izfzgrsrkcizzpvmpjc0v1kzc1hqm8wsd9l4sq" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" } }, { @@ -28889,19 +28893,19 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231107, - 2029 + 20231115, + 1824 ], - "commit": "ce5f3e14d7c5ab21dfb3e50235bfe495808b705a", - "sha256": "01ax4nzdby25szjmy63fmxjd8hf0a6hkkj555xylldq9bx5ax899" + "commit": "2aefc4d2820d922073917c7f87ea83c80c930ca6", + "sha256": "0z98cwzfj71xnq5wk5hgvdf2ar150cr6xs8mxwdi2204mqzzdsnd" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "9ae24a8b62643d6e194d0754611dc014304c1183", - "sha256": "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5" + "commit": "c207e9537255d9167f9c578b2effc864f7e87743", + "sha256": "1jzknbdcvq4dp36f7p5abksd524lrlnmh6wycf0h3513wqnrprf8" } }, { @@ -28912,11 +28916,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20231008, - 2250 + 20231115, + 519 ], - "commit": "06c905bb4ac6bb35035d65ef5de0de9ce6dff763", - "sha256": "0fzdzks18lyx19kigydbdi2lg260p3wiq0v6sf4xb13ypsx6pyfv" + "commit": "c36f31074b09930e8425963f39d5508da6d2c32d", + "sha256": "0vglh3sp9x6z537jngh5jh9j3szbfadryzlwhmrlq7asiinnjq01" }, "stable": { "version": [ @@ -29325,26 +29329,26 @@ "repo": "rnadler/elfeed-curate", "unstable": { "version": [ - 20231001, - 1926 + 20231110, + 1646 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" } }, { @@ -29681,11 +29685,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20231026, - 2028 + 20231112, + 552 ], - "commit": "d5d6010a1bc1b1f5a2422474f701d4573a95aa5b", - "sha256": "055k3za0c5jpa5lgqic9749zsf7vrfzfhcinhhpkrw95amyhpy76" + "commit": "ac9f2cc1482a7ef4b84d87bd990208030bfc5f57", + "sha256": "1nr5x9mq24w5dib39zyb95c7ksdp3k7scgsb1r5ldywjss4z44da" } }, { @@ -29947,14 +29951,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20231025, - 640 + 20231115, + 1851 ], "deps": [ "heex-ts-mode" ], - "commit": "cb536ff3e70b70004687bbf583757f6929ce0238", - "sha256": "1x55zig1jj8qiarhv6hzmam96jzafwlnsanjq3jqnl5rybr8nsxy" + "commit": "d56d5915d4540a4f55f495e27407637d0359c774", + "sha256": "02jys0wnp2s601mgqa6fi3jamjy1dprima1q594wdjf82av2n8sv" } }, { @@ -31110,14 +31114,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231105, - 133 + 20231112, + 1138 ], "deps": [ "compat" ], - "commit": "8c57c361d686d352f22bd570fee4976f6ab42bcc", - "sha256": "0cnv6lzbrl8pa8p4v3llm1alas5p1zs32nndsi626l2aqbjyfx8z" + "commit": "3f08fc8ede9dddad3752223e01643058594781b2", + "sha256": "1a08mpfq79mc1n4g9d07wjf7cm0bgi9a3gxkfdsyw52sy82fdr1b" }, "stable": { "version": [ @@ -31315,16 +31319,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231106, - 2235 + 20231110, + 2356 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "f3701eea3d0159ea9a2b44c5cce3886be73ff3df", - "sha256": "0dblq6d938hxw0y4920653qqp8m6p1g91qgg311idc5azzy3hdp0" + "commit": "e4bba7abbcebdc76d9b709846867d50f8bc98513", + "sha256": "05c63pq3wjmg3ahndsnk67mvv6hv38p5wfd2v7awbngf3la9rrcv" }, "stable": { "version": [ @@ -36173,11 +36177,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20231026, - 1357 + 20231115, + 1445 ], - "commit": "b98c1c6d0b08317c9094bb222739ee037afbe7cd", - "sha256": "05y2sy9kbxk81pg6s45n9d1pymfm7zd0bz5zp6b240hyqc5qx8m8" + "commit": "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f", + "sha256": "0j2zrhdffr3i9bwnaam5n908xmaq9z230sx6flid94cp9pvsxmxb" } }, { @@ -37936,11 +37940,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20231016, - 1415 + 20231112, + 911 + ], + "deps": [ + "markdown-mode" ], - "commit": "a9f5c41f14dcde42bd384274de9b45c2d39f1dc2", - "sha256": "00gacr1rf40r8zgy7gkd7maq905mx6g4mcnczjc2jlxh4iwp6gw1" + "commit": "e606fd40de36ad2131d027dec4f254e59a120dd5", + "sha256": "1chzzpk19z0siylh3z9sc05pjhibj9ld37iakc2v082dhd3f3sxk" } }, { @@ -39153,11 +39160,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20231026, - 905 + 20231114, + 1714 ], - "commit": "149d00ee4cd17ab465db004910b67456db142802", - "sha256": "056hzf4r8bzzmmhlrgh6f0pppsr3spbrpiwb2kpkdbg1fwi9bjkf" + "commit": "5305cc3deaf361f57c67c57d10ade2bd448603e9", + "sha256": "1pg8mp3nghpmif2f94blrbv50xb9xp7pibnyfm0kpgh5gnciz3ab" } }, { @@ -43265,14 +43272,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20230417, - 1142 + 20231114, + 1120 ], "deps": [ "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "495e22f98e3075d0d9a14ebec87771eaf967b996", + "sha256": "1khbknia1vhif6a26mcvx1d1mawvkxb84m16ghhp5vfna6g3sk64" }, "stable": { "version": [ @@ -45926,14 +45933,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20231001, - 1932 + 20231111, + 1149 ], "deps": [ "project" ], - "commit": "58bd510da5d09d9de52f4a6e60882b35445ca17a", - "sha256": "0n4346dc6kd0czj666lpmfq6ir6mrw0i45nkwpym6fhpg9cdynhy" + "commit": "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe", + "sha256": "05kk8pa8dgm2bv9k2rfxi0m1kdpzz40csn7jgl5a38w1l1yjcffl" }, "stable": { "version": [ @@ -46274,6 +46281,21 @@ } }, { + "ename": "gemtext-mode", + "commit": "5f16cf1dd7fd792ed631d2925edc6203fe0d231d", + "sha256": "1hbcsah3z1h95z93srdf5rkjq3icb6gcmq5r8sv6z8k026xy56sb", + "fetcher": "sourcehut", + "repo": "arjca/gemtext-mode.el", + "unstable": { + "version": [ + 20231029, + 2010 + ], + "commit": "431b3b1d7c4310ef09ba16adbc870bc0af2c0e9b", + "sha256": "1zizjq3cx5y7mdgapm2kzc4bs13fcg55nay996350ha986isa834" + } + }, + { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", "sha256": "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc", @@ -50204,11 +50226,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20231108, - 150 + 20231112, + 2012 ], - "commit": "fb0ab4b1e95a6ba97c09ff072fc91ac7c7f22afa", - "sha256": "0vqxf5zfsaa1ddqp80fhyyfpgpi5my1dzxpsd9zzbf7cma383r00" + "commit": "c1091d25db420320de4b121baba99d7ac2e23932", + "sha256": "0b9fcj7zkqxj5928038gnk93shi7k4mpikqir80lypbnnbn96l5f" } }, { @@ -50275,14 +50297,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231108, - 2129 + 20231113, + 211 ], "deps": [ "transient" ], - "commit": "0109d0d1c067aee8fc3228f1f34d766043258cc3", - "sha256": "15lwqgydkzqc4zp9dfyiqlphm14pr5f588gwi8pxw36dmpgik927" + "commit": "17a58d38e7299f254d02c29bbcc9211146394758", + "sha256": "1cy1kkbg477dnf8lz137h7bc7hvm3apvxdq3ycqifwwhfks4cyk4" }, "stable": { "version": [ @@ -52081,19 +52103,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20231026, - 1602 + 20231115, + 1812 ], - "commit": "ef3fe51f7c207db3c55b9a3a720b3af665d2e606", - "sha256": "15d4wkpv35bbzskiwia0jzl9m5pvs5pl70qs6np6yz7hwq4c524r" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" }, "stable": { "version": [ 17, - 4 + 5 ], - "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", - "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" } }, { @@ -52408,16 +52430,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231108, - 1729 + 20231114, + 1504 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "2534c228ef6699cb2588349c44627835fc444278", - "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" + "commit": "74887ba26071fba4c66ac3b4dc11d7d632832394", + "sha256": "1gyd03dln19cjwgrh3m72qik77hdc2waiv61knzk30pq3dds965j" }, "stable": { "version": [ @@ -53269,28 +53291,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20231108, - 612 + 20231113, + 701 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" }, "stable": { "version": [ 0, 2, - 7 + 8 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" } }, { @@ -57944,26 +57966,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20230517, - 1404 + 20231112, + 1536 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" }, "stable": { "version": [ 6, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" } }, { @@ -59309,8 +59331,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231108, - 2105 + 20231112, + 920 ], "deps": [ "compat", @@ -59320,8 +59342,8 @@ "taxy-magit-section", "transient" ], - "commit": "0bb8c90827781241b7c04904e7a348133e084453", - "sha256": "1y8c8dpzj4fvym2sk3ci0sdrkm70w9anyvgpb6q2sa5b25hwgm7f" + "commit": "8aff760d4a8d3a172a6694e1816f309bac1eac95", + "sha256": "0zml0m0y5k1bs6d627f0la9ax9ag74rmxpxzwky5v8r8zqclynfa" }, "stable": { "version": [ @@ -60423,15 +60445,15 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20231110, - 851 + 20231114, + 928 ], "deps": [ "ghub", "transient" ], - "commit": "92e3c429c0da07025624cceb5796ac41edf753e2", - "sha256": "10hw58zln8x8kjyzmfl1vfqj5mqascix9c7rdq884f8ypfynx7p1" + "commit": "7a72a4ea40668a7c4f0f8d60990a5ac298429936", + "sha256": "0v02cjjabm1f14bvhqp559xfv14my9ibjyx2gh3kzb67lhsrlcsr" }, "stable": { "version": [ @@ -63689,6 +63711,21 @@ } }, { + "ename": "jack-ts-mode", + "commit": "d01c726fc20b97e6127603f7bc347a5cf5e21cf8", + "sha256": "12lih23ci6jl6hqg9lv3cfdadvg60k1j6hgxk8w1x04677ri73nw", + "fetcher": "github", + "repo": "nverno/jack-ts-mode", + "unstable": { + "version": [ + 20231110, + 1615 + ], + "commit": "f57f211d96608a90142619a925caeb8808e7c632", + "sha256": "0zvd2xxv5wsljbvpzp7i121hgj7mnlgjd5wjblmf2hhx49al5n01" + } + }, + { "ename": "jade-mode", "commit": "877b5a3e612e1b1d6d51e60c66b0b79f231abdb2", "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94", @@ -64412,14 +64449,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20231104, - 1427 + 20231111, + 850 ], "deps": [ "compat" ], - "commit": "6f6108896744d1da4887b08e4fe4fff403ac10ac", - "sha256": "0jf9p75r13p28n1kv9w85kk9n3nfp4d8p34y76n3rqhh3sib2asg" + "commit": "25279e36701ad0bea1331ccfa009c07fda2f85d0", + "sha256": "0z05znl1cb26j67h7g0wlfazn9sr7p5j59mwdayy3l9157ic6b4i" }, "stable": { "version": [ @@ -64561,19 +64598,19 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20231110, - 1253 + 20231113, + 809 ], - "commit": "cb3185081cc8eba06de30936efa227639fb8a60c", - "sha256": "0805nvz7kssjm3gahm9g8s25by44dm16anz69087jqfkdwxly023" + "commit": "d9ecbd2f1ca15c90a05f11441886ab2e66b9a51f", + "sha256": "1mpqr8ls3xd8iirnjsk2rg3ibr13n853dj3y0hr6baddka1hydfx" }, "stable": { "version": [ - 0, - 8 + 1, + 1 ], - "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", - "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + "commit": "aef9162171118ef8e6ab411b26b763c9c6ea9e2f", + "sha256": "13xa05a798qbpxgkidvf42xxvi582n7sblwvv9kx0b0glclzkpb1" } }, { @@ -64669,11 +64706,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231025, - 2319 + 20231111, + 208 ], - "commit": "b1abef71843dd99349133a75245804aee503c05d", - "sha256": "0xjmpk33rhqlw5f9qjhmyc057l8rbrrzhz460zsljx2wm11cvp6d" + "commit": "0201e351ed0074a72c0987282079c775f3c8fe52", + "sha256": "157f300w61dq9s11f71p4z0nykg8h1f64rnpy3199y6sfjhhglyl" } }, { @@ -65522,8 +65559,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20231026, - 2200 + 20231113, + 2330 ], "deps": [ "dash", @@ -65532,8 +65569,8 @@ "s", "spinner" ], - "commit": "97ca00411e16a2c1815090ca5aa05b3a36776a75", - "sha256": "168x8g2m30ci2msjfk09bbczpa33h4ax57b23hcwy5czk9511w70" + "commit": "16cf8ffafe5ea0925beb97e37a64eab58b2ad95d", + "sha256": "1231rkk629dqi15011bjslwvspvlgnx74xm2q9j1y37ql4zxjx2n" }, "stable": { "version": [ @@ -66118,14 +66155,14 @@ "repo": "Meritamen/kanagawa-theme", "unstable": { "version": [ - 20231023, - 114 + 20231112, + 414 ], "deps": [ "autothemer" ], - "commit": "08debfc56e052ed69c7ecc3b08c687bb5af4a33c", - "sha256": "1mf4w05zhmhdrknfnpfrcvc3126i3vqcsyjwp0n83km1d8wcd1sx" + "commit": "692cc627ccdd0595de3bbc67e313a0363002e444", + "sha256": "0abckxxifh5aw55wk7ykfxi6cm4rd6ya0m8pql9591lyxfi5whxw" } }, { @@ -67406,11 +67443,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231110, - 1334 + 20231114, + 1243 ], - "commit": "b9ccc4896c8af8e8b60a26eb16fffe8a185551d0", - "sha256": "1dy1j72i8ymxlvhrbh3k94l90p3vwfn8bimbrlw100aqz41nz2jd" + "commit": "9688741a59a5ffd71850660dd320b0309a2ba119", + "sha256": "1gxj3fys3py0ldz31f8frmj12f9jyyqj9g8valsy2c87qvg70ag3" } }, { @@ -67543,8 +67580,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20231013, - 1753 + 20231114, + 1528 ], "deps": [ "dash", @@ -67552,8 +67589,8 @@ "transient", "yaml-mode" ], - "commit": "b882de32b6f6a6ee371eb7a7a308f3936031e681", - "sha256": "1ddavmfyyd2rxffvb3cbv28dxrjsa58jbywzgplnx6zyv05frx44" + "commit": "4e3d362b2df2307f7b13140810a3142b835bc9ff", + "sha256": "0lq0c5dd63d19ziw16cfhhzk4z3vjqal1vqjflvdrd2xhdzjk0xn" }, "stable": { "version": [ @@ -67835,8 +67872,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20231106, - 1250 + 20231112, + 2208 ], "deps": [ "f", @@ -67844,8 +67881,8 @@ "request", "s" ], - "commit": "c79bf975ad799e11ead0e2f2ca909222044b35cd", - "sha256": "1n9xnpz6yv7rczl0cjk7qd5962swcf19022hpaf46kva2sw43333" + "commit": "9f0f738c46712f5365d9d75c37ce6d1f8b6e9ba7", + "sha256": "0k54x2znxwq3ji8cvxc37h9fnr0krpyyx954f106fa7gylp86kz4" } }, { @@ -71687,8 +71724,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231110, - 716 + 20231115, + 1221 ], "deps": [ "dash", @@ -71699,8 +71736,8 @@ "markdown-mode", "spinner" ], - "commit": "3c1c583b549d81ab8e23ddd58b0a7f065e6b6f2a", - "sha256": "0di1hg5hxm6ybqz063yjj6b9rpjaxgqgia6k753hyp9p95c0619y" + "commit": "91dbd0240afb5223b2ddfca8326d1c2fb3e8cf7f", + "sha256": "1anibzm7w9arzqpfm6p01v0522j022g2mwa01w0p1idwg6jjiivf" }, "stable": { "version": [ @@ -72638,8 +72675,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231109, - 935 + 20231112, + 914 ], "deps": [ "compat", @@ -72650,8 +72687,8 @@ "transient", "with-editor" ], - "commit": "02630b51896929011a420d9382779c98ecaef687", - "sha256": "06cnhwzxjpqb29km9nxjynapxiajaa87s7q32c4igq4yjp3jy0h0" + "commit": "f4ff817cb2a48f0f7887050c3be469c03a059567", + "sha256": "0y0sfxky27yx0wsxfbqydigm2x4596dyf1x1psn66gfgjm9yjcff" }, "stable": { "version": [ @@ -74058,6 +74095,21 @@ } }, { + "ename": "mark-yank", + "commit": "d186dbd15e567113418449cf1830f7a5fc342580", + "sha256": "1vbqvw55bzvfaf9nxy3bvp8gzg0hxag7srnjyxpy2a1jwy5crq6i", + "fetcher": "github", + "repo": "mkleehammer/mark-yank", + "unstable": { + "version": [ + 20231105, + 2027 + ], + "commit": "7207aabe9edd0872ec6d506a58b942b43926c122", + "sha256": "0r94mm6x9n53ck2gqbrmi0gdahf1xyhp09jpnnv3m1klhi4hwbzg" + } + }, + { "ename": "markdown-changelog", "commit": "1ca43b6cf089d7c75b1fb483d8356a3ca7fec5bd", "sha256": "0cnp6yfhsixl9nl7l6aa9vrnz71ylf6z25hmk7f6w64f7nxsdmr8", @@ -74800,14 +74852,14 @@ "repo": "knu/mc-extras.el", "unstable": { "version": [ - 20181109, - 1735 + 20231113, + 1359 ], "deps": [ "multiple-cursors" ], - "commit": "053abc52181b8718559d7361a587bbb795faf164", - "sha256": "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481" + "commit": "abd98a7c92e71d38494a6bf20853f3ff20e1f013", + "sha256": "0zv8cxhyqkxc3gyyzd18zygjy0xd3fk1x3v5h24yr998wg0fb050" }, "stable": { "version": [ @@ -75188,11 +75240,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231108, - 1124 + 20231115, + 1306 ], - "commit": "f46ebad2216460cf58293b913bb76c5e9bdc968c", - "sha256": "1wirkcwi21s8z3210h9fwqbman2fg2366b05vgmgasphirsjdsw0" + "commit": "53eaad5df01bbdabc9e655dbadebc302d0475f31", + "sha256": "1a2snly1iraxmyal8f61jj0zhcywmyzq6gglf1fqmmcx3xpv8xra" }, "stable": { "version": [ @@ -75931,20 +75983,20 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20231107, - 1317 + 20231115, + 13 ], - "commit": "9d89e352b73ff2222d62b43b8944206582723fef", - "sha256": "14gr1fc1bdwwzll1yq2sc5yaadvb4360lqypvq805bnnhdjqb6hb" + "commit": "5dfd1608d384be3176c4f06fef908933e2fd4a02", + "sha256": "0pknwad9mm0szb4a0ar7wrc8lnwn45vf3vfq0wbflh6071mdnmkv" }, "stable": { "version": [ 0, 5, - 3 + 4 ], - "commit": "89061feace09249a93e8bdaf2474cc953eee604b", - "sha256": "143i9ih18mh26mdq9d9pxnb468n9zmz2xxs49hgzkpyhc5hdcdy9" + "commit": "58b7c6129f941d4eb6cb5c04525970f8e409623a", + "sha256": "146nlsflzfbsdkwni15vhassq7kgf4xjn7vlwn05v1sny2wpscg2" } }, { @@ -76919,11 +76971,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20231031, - 716 + 20231115, + 1302 ], - "commit": "ff70fd4136df589945d06de6926286d70243345b", - "sha256": "16qr26ihf50w536r6646csd2vxl6xgyyzywn095cxs8mq2qp7jzq" + "commit": "bdb18b2ee27344e44e2a17c78524205d02d5174c", + "sha256": "08m6mzh87q05dx7xvfnyqpj0jsg59g626qq8y5nrnmscf7pf0rkz" }, "stable": { "version": [ @@ -79714,20 +79766,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20231002, - 1014 + 20231113, + 1036 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" }, "stable": { "version": [ 0, 2, - 62 + 63 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" } }, { @@ -79815,11 +79867,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20231105, - 653 + 20231115, + 1110 ], - "commit": "a506b43dc241ee07c28ce815068277084afbf09c", - "sha256": "0jahmqvi0hb8jsraj21d1n6wdp827yak2f4bs9ljpmggqvxp40pl" + "commit": "cfda588dc1e865a8a121b9071f3720fd4937492b", + "sha256": "0cnhcyh7s50k60hx572zz2cq83qjjp72qs6ad9gc6abhzzrzr6bj" }, "stable": { "version": [ @@ -80880,14 +80932,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20231024, - 854 + 20231115, + 2126 ], "deps": [ "compat" ], - "commit": "1fb3271e991fb941e8cc480beff74000e3a08a3a", - "sha256": "0ahlri3hlkrlmm6bh094ays6qrw9yd02rghq0hgin006817r8pqz" + "commit": "722c44210a5f2697f449bd6cb2cdcff638b8c0bd", + "sha256": "109z231gz4afg4z0dzyccsx69znvzwy3z4c5z48441brssvna6nj" }, "stable": { "version": [ @@ -82233,14 +82285,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 914 + 20231111, + 2324 ], "deps": [ "chatgpt-shell" ], - "commit": "58bb4d8eb9218be4925201a39596387d160f4593", - "sha256": "1mqwc2wkz2ax4pzi76vqq59v4qjwp221sw4nw91nr6zbk5ws1780" + "commit": "03f8edabb95c6ffc64050d79fdb3091532711b59", + "sha256": "0h94zdx1nn98pg3mdlj6zvlswmj6i1yldnm1hb9pj2hccsdfj3bj" } }, { @@ -83602,11 +83654,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20230415, - 551 + 20231111, + 1100 ], - "commit": "f0b180eeb5ed19bacbce9d6a39e3123f4751f54b", - "sha256": "03xr38xdsjxlcfbw2637wwiwadymhb60pc9ik0zzk69d2ks097k2" + "commit": "f8e3e1cb02f83624624a4e42070059d91f2e8d5c", + "sha256": "0mb5mmw1110a4czg459c4dl6xj99vzp5vgkhp7kkdgakck0pz17z" } }, { @@ -84674,20 +84726,20 @@ "repo": "knu/operate-on-number.el", "unstable": { "version": [ - 20150707, - 623 + 20231114, + 1921 ], - "commit": "ceb3be565a29326c1098244fac0c50606723a56e", - "sha256": "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6", - "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" } }, { @@ -89172,8 +89224,8 @@ "repo": "ichernyshovvv/org-timeblock", "unstable": { "version": [ - 20231109, - 843 + 20231112, + 1748 ], "deps": [ "compat", @@ -89182,8 +89234,8 @@ "persist", "svg" ], - "commit": "7ac198c48646f864f18aef1c7e55c15ab8d8b679", - "sha256": "0m6gzjzv4criydhsz2s3q1kqc3bs11zg5svgjaksb7piks9368ds" + "commit": "72a72bad4644f7b6045403e93e99d7a362b03b9c", + "sha256": "045vrp9d8d6wnmi82vi337w5w7i3cs0jprwiyhkf033bwvvdywwb" }, "stable": { "version": [ @@ -92185,29 +92237,29 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231110, - 1025 + 20231113, + 1518 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "c541e67dbb7f93b888edac908e9b25813ee7e6f7", - "sha256": "0y3qq1hn43xkmv3x807ja088s75hs06lj8fgxa7a16ifaaa0958c" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -92218,25 +92270,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231103, - 1810 + 20231113, + 1518 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -96894,28 +96946,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200420, - 1429 + 20231112, + 658 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" } }, { @@ -99003,19 +99055,19 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20231101, - 2003 + 20230506, + 330 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "0d3b0c61f4f44c3d8770b89edffe481aaf56f4f1", + "sha256": "06xl81cm55g0dcpfh8b8za8mrs5cgjv656z23q5q0ph3war6ifbn" }, "stable": { "version": [ 25, - 0 + 1 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "7f94235e552599141950d7a4a3eaf93bc87d1b22", + "sha256": "0apvjl43f751iy3472cc17wqmnmzlcgn9sw2wxsmddaz9km7kbn3" } }, { @@ -99501,11 +99553,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20230910, - 1438 + 20231111, + 1538 ], - "commit": "67fd542d9b633d729bdc46fca50a8d0bb6ec6ffb", - "sha256": "06r3i7j090pqgxx40ssix34zbjyzl8mpilwakamw6jlzcdhl4lg9" + "commit": "518a5362870b6ef01d2d4a158bd38c7280687256", + "sha256": "1m7gvizfmvf1f6s4x72fszja90zq7sslmywgihzs7585107wy8s3" } }, { @@ -101274,11 +101326,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20231110, - 1508 + 20231115, + 1544 ], - "commit": "24d59b1546d963c2b92f67a8efde951db90182da", - "sha256": "10s29phk21scdgyyl8ya7l23xr07gm5li7kyni25hh91q6fkldaa" + "commit": "296de3c15580805f2d84dd30e01eb9b12f18bc3f", + "sha256": "1w6pxgmm7s769g7falshpvnb0klql3pz3h9461rvgmvxmrraas93" } }, { @@ -102037,16 +102089,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20231021, - 227 + 20231113, + 1910 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "445340ebc5819eeedd73695c9182349349c90b6a", - "sha256": "1x493djnj5012c7jr29gmzy6sdw7s6xh855dgslr16aqimkz7zg8" + "commit": "365063ea8ce8ec6a852cb388088d84147421c3c2", + "sha256": "1ankjwwsbkv5i9x9dbv0lzbs5qrqb486ds2qymdb0w4kg2g3d11z" }, "stable": { "version": [ @@ -102693,14 +102745,14 @@ "repo": "emacs-pe/redis.el", "unstable": { "version": [ - 20220429, - 1758 + 20231111, + 1733 ], "deps": [ "cl-lib" ], - "commit": "a6ad30d6a43b7be083c13f8725b45571d623001a", - "sha256": "048jvvxb6cskhs95n2ngl4cfgf8hbqidvbi1xsyb0gyzvvqbrhj1" + "commit": "84382456beae70677aed2f9558a0b446f8ccc17a", + "sha256": "0zrjfikpnj6pxaj348wnknv9dnzhzqwsi8b26dbsln5zcwl131jz" } }, { @@ -107611,11 +107663,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230709, - 2036 + 20231112, + 442 ], - "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", - "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" + "commit": "b9f193703f34a5ec923b0fdd34f38b3579d04140", + "sha256": "18sw8whar1r3y4jcml2yjf8symm8a6dvmw9ld80cacwyia3d20fn" } }, { @@ -109321,15 +109373,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20231004, - 1552 + 20231112, + 2019 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad", - "sha256": "14yqa8m44d5qll1fidh0d4g9hmpri8ywxfvgq43bzy00lshnprzg" + "commit": "735258a26bb97e85d25f39e4bef83c1f80c12f5d", + "sha256": "1dxy14dp6z4907vdj5mahj6fxv211rxvldyiq29k494bmapixhxw" }, "stable": { "version": [ @@ -111699,11 +111751,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20231110, - 101 + 20231111, + 59 ], - "commit": "db107d1e9a716ffe531a0f73e7044bb8046d34c4", - "sha256": "13iyxz88ckzydhmy4wgfrfwp8dcj0dgb1rxwr5zcpqxrl1aifpjp" + "commit": "18d7cfd411d79d8bc81027a023c72bae96d77059", + "sha256": "0kj1amrxa1ldc4ss0lx1y2jl4iskg68zm20yldw059gwlg61p13q" } }, { @@ -112450,11 +112502,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20231030, - 539 + 20231115, + 1901 ], - "commit": "eafeda97eb8942e5e2f1fe6ebf7472de9ce405dd", - "sha256": "1myrv3awf8v1haas63fhy7s81jkbbfv6zlbsb2nl8j723d5vm8jn" + "commit": "97fa0664ee4852b18201a3fcac265ac8c52a4a4b", + "sha256": "154r3xrif4nzdqsfyb6skw0ddbi15j1crnqrqv6yclf4s14icz1m" }, "stable": { "version": [ @@ -112991,11 +113043,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230925, - 1808 + 20231113, + 756 ], - "commit": "6d0f9b34eba1abde6ee72e10c2b4dfdd18712065", - "sha256": "0p0pgfwd987ylsm8lhdkammqy6afx2bb582fb3lrjhj27dn572f1" + "commit": "22f449a30d6d36a42c59c1d31e3538aafff19e90", + "sha256": "11pj8fh65wz02q9mhyd4yqpis5n3k2wc919l19ygl4kh5h60ailg" } }, { @@ -114498,11 +114550,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20231110, - 633 + 20231111, + 809 ], - "commit": "970961c63c5949599f684d7b663608e4fe5de635", - "sha256": "02p98bwwwxd7qsxb967y5glgggwh27vh7sc606zy1hyhsx8nkigi" + "commit": "48cc227507c3d079a2ceaf6939406ab158b534eb", + "sha256": "06m2dgfm61iprikv2j0nz63x84l15mzrs0qxn0j3p6flr7aq21n8" } }, { @@ -115569,15 +115621,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20231108, - 717 + 20231116, + 1 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3e7bc49ccd579b2e68d00620424b9c10e38f56e5", - "sha256": "1bq1if84piww0mb9ciji7l2n2ac57c01kb6vldc96imhpri2fnny" + "commit": "08441b4daedbb2688edb2dd3cac0aa71cca675f7", + "sha256": "1fish0g8dvd6m0lgzy2k92g5dk52swynyyqhv6pyj2wjmwb7cx6f" }, "stable": { "version": [ @@ -116871,21 +116923,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231106, - 1400 + 20231110, + 2354 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" }, "stable": { "version": [ 2023, 11, - 6, + 13, 0 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" } }, { @@ -117532,11 +117584,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230807, - 2218 + 20231114, + 1615 ], - "commit": "8207b4140fd1b3eff2ec4b9818e67148139cb72f", - "sha256": "02ipyb19s961k05kmbika302rfipzcgpvm0g1q3pxn7arxs9s3kl" + "commit": "f809e49e8a53fdfd05dd5c345b52588014668de9", + "sha256": "19f47gd1l9wdqxyrmxa7jwffh59s3dz922b4aybh73q9x5db7lbf" } }, { @@ -118247,15 +118299,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231103, - 2312 + 20231112, + 923 ], "deps": [ "compat", "seq" ], - "commit": "b4a29636365d12a8079c3908ff8ffce5f84b85d3", - "sha256": "1ckdjqlp063gprmy74b0ghl9zhwblkahifbqailww1wcbv40fmsz" + "commit": "3cd1de1695084df089cc90cff89b32dfd6ca5a0a", + "sha256": "0j7cww8ip51nqn3qyw027ki7bcg4m7lmh6xxv8ahxsh6mb0iqcdv" }, "stable": { "version": [ @@ -118722,26 +118774,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20231105, - 656 + 20231115, + 1119 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" }, "stable": { "version": [ 0, 12, - 77 + 79 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" } }, { @@ -119156,20 +119208,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20231110, - 50 + 20231111, + 250 ], - "commit": "090a74deeff29530dbc0837ec3151dac8aa497e7", - "sha256": "0gswbpdnbyjp9jb6mgxsws11dp7nxi02w3f4bqc6d2z4zc7fd16d" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" }, "stable": { "version": [ 0, 6, - 6 + 9 ], - "commit": "f0cf4cf93f2877a07c61fb4d10d3fe51be4da3a8", - "sha256": "08kgx6a23a7g941bl6zxmkclwbiqsspx3z2vlpnzjwpqda1b3nxc" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" } }, { @@ -121095,20 +121147,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20231019, - 2145 + 20231113, + 2331 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" }, "stable": { "version": [ 1, 3, - 3 + 4 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" } }, { @@ -122174,11 +122226,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230825, - 2151 + 20231114, + 2309 ], - "commit": "e1e551f6340d58e7782f2c1df7b397229a1c4fe3", - "sha256": "0d22h72mnngi55v1ksa22gwxbyw8flwi6x8wx1c5hfvl59ww8nsl" + "commit": "1edcf0c3758c70acb9393fda7dfbc5957bb0fbeb", + "sha256": "1wjrfzmalkgk9778kc4maz7khq1dli0x27ifyhgi8zvgy899pykc" }, "stable": { "version": [ @@ -122388,14 +122440,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20231110, - 927 + 20231112, + 816 ], "deps": [ "compat" ], - "commit": "0492a686375cec2fab961ecd09f0eecf233810a7", - "sha256": "0fxr95780afcqw9fcc1r4yb3d5d02imqjv762iyqv7iszm61hacs" + "commit": "49a1eb5f3653a3155bff6ff631b336989de61b18", + "sha256": "0fick90jrpgpxsim3n953vbffj572jgxk0cnqlkan5v6pp2px5y6" }, "stable": { "version": [ @@ -123353,8 +123405,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20231031, - 802 + 20231113, + 717 ], "deps": [ "dash", @@ -123362,8 +123414,8 @@ "org-roam", "s" ], - "commit": "f4f220896aaaeee41b2341b74c1b9a554cf9c015", - "sha256": "03yhrrwnm5wgwy2k72cj9bgsmsbm0ylrlnr2dh5rzaaiwxq1kxvn" + "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a", + "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6" }, "stable": { "version": [ @@ -125041,11 +125093,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ @@ -125064,11 +125116,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index d3aabb739ec81..789420fdfc6ed 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -89,6 +89,8 @@ , withX ? !(stdenv.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" , withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withSmallJaDic ? false +, withCompressInstall ? true # Options , siteStart ? ./site-start.el @@ -337,6 +339,8 @@ mkDerivation (finalAttrs: { ++ lib.optional withTreeSitter "--with-tree-sitter" ++ lib.optional withXinput2 "--with-xinput2" ++ lib.optional withXwidgets "--with-xwidgets" + ++ lib.optional withSmallJaDic "--with-small-ja-dic" + ++ lib.optional (!withCompressInstall) "--without-compress-install" ; env = lib.optionalAttrs withNativeCompilation { diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 7d3b964fb15c7..323218f9437bf 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -12,6 +12,17 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; + patches = [ + # Fixes implicit int error in rescript grammar when building with clang 16. + # https://github.com/nkrkv/tree-sitter-rescript/pull/227. + (fetchpatch { + url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; + hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; + extraPrefix = "runtime/grammars/sources/rescript/"; + stripLen = 1; + }) + ]; + cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index d029145934afb..94d554abd5912 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.4"; + version = "6.7.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-YKK46PeCMOTNOTpMrIgem+Au70Xj+tTHxOhC8alF3ms="; + sha256 = "sha256-Y0g4mpEf4+hApHFHaqB8esVep2OyqWLo7YGLf/7eCYg="; }; dontBuild = true; diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index 55db4096ce153..aa336ce45e213 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -48,6 +48,6 @@ mkDerivation rec { description = "2D molecule editor"; homepage = "https://sourceforge.net/projects/molsketch/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fortuneteller2k ]; + maintainers = [ maintainers.moni ]; }; } diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index f1c38d2915dc4..a7e0e4c770577 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -212,7 +212,7 @@ rec { # having no RC generated should autodisable init.vim wrapping nvim_autowrap = runTest nvim_via_override '' - ! grep "-u" ${nvimShouldntWrap}/bin/nvim + ! grep ${nvimShouldntWrap}/bin/nvim ''; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 0fbb54df01acd..d61a2fe5e5a81 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -7,8 +7,10 @@ , neovimUtils , vimUtils , perl +, lndir }: -neovim: + +neovim-unwrapped: let wrapper = { @@ -62,7 +64,7 @@ let # wrapper with most arguments we need, excluding those that cause problems to # generate rplugin.vim, but still required for the final wrapper. finalMakeWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ++ commonWrapperArgs @@ -72,36 +74,45 @@ let in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; - symlinkJoin { - name = "neovim-${lib.getVersion neovim}${extraName}"; + stdenv.mkDerivation (finalAttrs: { + name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; + + __structuredAttrs = true; + dontUnpack = true; + inherit viAlias vimAlias withNodeJs withPython3 withPerl; + inherit wrapRc providerLuaRc packpathDirs; + inherit python3Env rubyEnv; + withRuby = rubyEnv != null; + inherit wrapperArgs; + # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop - substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + lib.optionalString withPython3 '' + + lib.optionalString finalAttrs.withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + lib.optionalString (rubyEnv != null) '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + + lib.optionalString (finalAttrs.rubyEnv != null) '' + ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + lib.optionalString withNodeJs '' + + lib.optionalString finalAttrs.withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + lib.optionalString withPerl '' + + lib.optionalString finalAttrs.withPerl '' ln -s ${perlEnv}/bin/perl $out/bin/nvim-perl '' - + lib.optionalString vimAlias '' + + lib.optionalString finalAttrs.vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + lib.optionalString viAlias '' + + lib.optionalString finalAttrs.viAlias '' ln -s $out/bin/nvim $out/bin/vi '' + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = - [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; + [ "${neovim-unwrapped}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ] ++ commonWrapperArgs; in '' echo "Generating remote plugin manifest" export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim @@ -139,26 +150,33 @@ let makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} ''; - paths = [ neovim ]; + buildPhase = '' + runHook preBuild + mkdir -p $out + for i in ${neovim-unwrapped}; do + lndir -silent $i $out + done + runHook postBuild + ''; preferLocalBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper lndir ]; passthru = { inherit providerLuaRc packpathDirs; - unwrapped = neovim; + unwrapped = neovim-unwrapped; initRc = neovimRcContent; tests = callPackage ./tests { }; }; - meta = neovim.meta // { + meta = neovim-unwrapped.meta // { # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (neovim.meta.priority or 0) - 1; + priority = (neovim-unwrapped.meta.priority or 0) - 1; }; - }; + }); in lib.makeOverridable wrapper diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index 8822912640079..2e67e83e972b3 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/curlpipe/ox"; changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index d68925e752f45..57ad28b5b2dac 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -28,6 +28,7 @@ in buildFHSEnv rec { xorg.libICE xorg.libSM zlib + libudev0-shim # qsys requirements xorg.libXtst xorg.libXi @@ -53,7 +54,6 @@ in buildFHSEnv rec { xorg.libX11 xorg.libXext xorg.libXrender - libudev0-shim libxcrypt-legacy ]; @@ -65,8 +65,7 @@ in buildFHSEnv rec { progs_to_wrap=( "${unwrapped}"/quartus/bin/* "${unwrapped}"/quartus/sopc_builder/bin/qsys-{generate,edit,script} - # Should we install all executables? - "${unwrapped}"/modelsim_ase/bin/{vsim,vlog,vlib,vcom,vdel,vmap} + "${unwrapped}"/modelsim_ase/bin/* "${unwrapped}"/modelsim_ase/linuxaloem/lmutil ) @@ -96,7 +95,6 @@ in buildFHSEnv rec { # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when # starting most operations in many containerized environments, including WSL2, Docker, and LXC # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 # # But, as can be seen in the above resource, LD_PRELOADing libudev breaks @@ -104,7 +102,7 @@ in buildFHSEnv rec { # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD # for non-ModelSim wrappers. if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then - export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi ''; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 4b59da01ba21b..bbb8d39a5f7a2 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml -, qtquick1, libGLU }: +, libGLU }: stdenv.mkDerivation rec { pname = "qxmledit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ]; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml libGLU ]; qmakeFlags = [ "CONFIG+=release" ]; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 16598d02485c3..62e1ae0d9525f 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.178.4", + "version": "3.181.23", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-amd64.deb", - "hash": "sha512-6er/a9PqhKU4aagAxsbVdoXbRBNUr3Fa8BPWfuQ74Q4ai+iYlPjd4q50cTJQ4wJ5ucGyopgBEJq4/xYNunw6Ig==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-amd64.deb", + "hash": "sha512-zWjST3guI0qifvZIwSLJ0nIpU12Mu3+m25Xdoqv0BQC7tscChEdCGUAJRUKHEf0b8l4uvp8qBGHiBOfbrIi//w==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-arm64.deb", - "hash": "sha512-lvvXCK3XOIH9HS1EU5eVBo4W8VoE4iM1Ve1XkZ/CysYBYLaXojXyybeN5Iw1Rmuk3trq/7RebjkNx/rxhsU0LQ==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.181.23/standard-notes-3.181.23-linux-arm64.deb", + "hash": "sha512-7R5Ym44mrVgUiqdt6NL8F9uUUOroQRxwn30xKThyIQm2HGRUJivRfOws98El9zV8bKG1khk4DZaMiLQSMjrtaQ==" } } } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index b9a386684f9ed..1f66a581dbe51 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qt5compat, quazip +, qtwayland , hunspell , wrapQtAppsHook, poppler, zlib, pkg-config }: @@ -27,8 +28,16 @@ stdenv.mkDerivation (finalAttrs: { qttools quazip zlib + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/bin/texstudio.app" "$out/Applications" + rm -d "$out/bin" + ''; + meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' @@ -39,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://texstudio.org"; changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; }; }) diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 72db4262c8773..b27ab8bbb69bd 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -8,6 +8,7 @@ , poppler , qt5compat , qttools +, qtwayland , withLua ? true, lua , withPython ? true, python3 }: @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { qt5compat qttools ] ++ lib.optional withLua lua - ++ lib.optional withPython python3; + ++ lib.optional withPython python3 + ++ lib.optional stdenv.isLinux qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index 887a9a8e69239..f6b241c9d07f0 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; preBuild = "substituteInPlace Makefile --replace '$(DESTDIR)/usr/local' $out"; + makeFlags = [ "CC:=$(CC)" "LINK:=$(CC)" ]; meta = with lib; { description = "An efficient hex editor"; homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 0179dabe39454..83d61b37bfc67 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1897"; + version = "9.0.2048"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; + hash = "sha256-zR2iPiD4/gf5BnxYoe3cx2ebGWE1P2bY4Cg15gveFgg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ac3dabe5436ea..42958d277a4b8 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 = "2023-10-16"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "9f8062c7c40ec082c49f10e20818333a972b8063"; - sha256 = "0k8y48rrzqf8r1mbyi370grgxa28612qwm67mwsk3zhnm3496060"; + rev = "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced"; + sha256 = "1xmnzr1hccgdaadjc8i207bz44272ng5aaaypdacaag2pciapq3s"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-12"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "a937222abcc2843c13f0a92576a215d391829811"; - sha256 = "1snvkv6ba4kciz4xq2810ffsg4nnlzjp5vddj9x68q2bvssh8xlc"; + rev = "9fb873af43568464f9a1936fc334dfa3d7a59418"; + sha256 = "0w81xzrvjcwp5a6glyk3dcmghvbb4amlhxbbl71lz9k9w0dzcwac"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2"; - sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8"; + rev = "d82a994d66a9c6c700f240498304bd6d68fb33f0"; + sha256 = "0rjndafp4nz0qbaf614q92zkqcsqmr9i2v1c32q8cm1hxkapaf6q"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2023-11-08"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "50e237facda4b9c3761c3f3e9df185cfdf3d91e8"; - sha256 = "1iyxw4j499qwwhygwqspsq5573smrd1rcnyh74vk0sj058d3l03y"; + rev = "1ccd99e113324602b4eca41fd24ba6f991e8f05d"; + sha256 = "09cmg0w967f9x04g686w9s31yz9jx1qg7rb0jibdjv7khyl1cvqs"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-11-12"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "b085a8952dfa3a0fe245a8aae2799236833001f1"; - sha256 = "04pz7cn876dqysr8ky5wfffi6zybvzqz7hx59z7fbf59x4jzlpfg"; + rev = "41ab08a3c56b2543263873e0f1a7d1f3267180fc"; + sha256 = "1d0d9c89i56qh6rks1sp8fzw6a09jyvqclya70vwxdyayz48mspc"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -2119,12 +2119,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2023-10-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "a2ff356633bfc2b4638925eee172d43173420d3b"; - sha256 = "1pi4jgc8h48gqdik5kzvlvswh9y9f8rbz6hchng5n5ybnsf3w88a"; + rev = "b8bcea8d40866bfa33a7f7b24979781039bfc76f"; + sha256 = "1jiqpgz31whbplv1hs10y8ais5vgya8sz86ahfrbj4c3w34sxvry"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "ca3dfba94600aa62bfc88ae37cbd4f17eaea2553"; - sha256 = "192r845pyszbl5jwxzs36pvjn4c4si4n0ywnqlia0w03vac4zz8g"; + rev = "a36c68d2cd551e49883ddb2492c178d915567f58"; + sha256 = "1c9b4y41wf9kr4almhmqvg59nhslc6s5lgkpvv2mhchrqkm7zsba"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2444,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-11-10"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485"; - sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5"; + rev = "406295abeb7eedae3bcee3f0db690ada605c629c"; + sha256 = "1kiw5vkx3kqd5niyjnpimihd0cb5w8fz8pyq6sfh5am7ycvg5nfj"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -3046,12 +3046,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-11-11"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "c41904a3dcc103587b1157da13d565a0a5f9f3a5"; - sha256 = "0q0b5llz4jmpqlv4yx929wbhsnqjd62ng5kjmiwl3nylz1gndgmk"; + rev = "d308748aa5ea44e9df35d2f5333cd2de148fcf3c"; + sha256 = "0zymllwlf4kvrg3ns9ygsxj44z3yvvcdb8srigx2ffhjgqnri0kw"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3131,24 +3131,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-10-23"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "7db13d3f609640e9f12d7d6f1251e6a8f964f579"; - sha256 = "0ih5c2llvw5sx7qxck12v5blh9kgc7kv643cjkqzhlf9cplpvihp"; + rev = "ed7bd2581318aebc409f54fa4756023d2e6fb7d6"; + sha256 = "1pbq011s78pq2agjy7gkqkzn9zr5slnik1m5h8mplz9bb28pjb0a"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-11-10"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "517ffd8366e4065ba66e0fb0c8e8ce192906db5d"; - sha256 = "1b38zb5nisyk5msz045vw5ibl35jd31zskj26qm93z8h29b3f0xa"; + rev = "8f573b0b089567aa9c544b029000c97e715e5f58"; + sha256 = "0rhnvlji6qvwj8mafgw2jwyx8ixmw4ir73gbywlvhpay3nzal8rb"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3300,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-11-07"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "62a9f4fd4fcf46cb87b7868323a1e9aef5b08028"; - sha256 = "19bhhdkqx24jyz1xc7v39563gqa7y8y2aai4pgl7n5mbrvcr9bsy"; + rev = "8bfa1a88d19d86756ef468ad2e499e0337084317"; + sha256 = "190rf7v70jchjj4vrg7sf8ish99kf9n3jqkb009hd8kv68j65lpd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3505,12 +3505,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-09-21"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "34dcdfa0c75df667743b2a50dd99c84a557376f0"; - sha256 = "09dks17yi1cbk4gviv7kw7r04rcn8ridq75slm3vxf3jkid095ns"; + rev = "91651e6afaf6f73b0ffb8b433c06cd4e06f90403"; + sha256 = "1dsxlhsfhdd37l8z9pg2f5s0r4rafk6jl92wz1zcbhf6iswa6vy7"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3637,12 +3637,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-11-08"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "e1046726cf0cedf15ae0ff40537a421b79968c3e"; - sha256 = "0yh5yrlv0a73yjgwb23vl91lb38h121w4zxf9wavrk262qqkm903"; + rev = "640d6415baf6b12c20c16fdd177f106c5575d6c1"; + sha256 = "1yrqa1zj6jyf3r6cb6s06mxk6fb4wwdzw08x454f9amw93cah25m"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3805,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-10-26"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "af0f583cd35286dd6f0e3ed52622728703237e50"; - sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86"; + rev = "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55"; + sha256 = "0xgw0p6wb33wlb4lnnjj1adxsll6lnmq3niabqzricsz4phmvf4f"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3865,12 +3865,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-11-09"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "38f6402fa5362f2c31a31439294d9e24eda46b13"; - sha256 = "143wi05bh6fdcfcm7lrx4x2qh4srdw022c107476p3gcasswkihr"; + rev = "e749ff85ffec5a4ef11cb8252a2030be5726cb6c"; + sha256 = "0811lkf5cr9qsp4as3lqq04w545ygmxj1sad66gabvk8lcq7indj"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4045,12 +4045,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-10-27"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "8cc4dec29a177cb7c33a900ccf45b451684c30a0"; - sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k"; + rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5"; + sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "3076ac21d6ffc6d0100eb5878a1b77c6a53d8871"; - sha256 = "0fc0npgmv6zxc3v5rzxh9lqa0868pyj4kcsyg8vw9qwl1waz6pa9"; + rev = "88c3ddac1885f3ee0e9b4664296b10d30a04c731"; + sha256 = "159rr16jic7cwc6ai539a8gvzjr2klnmhdyyp0c8nr0jl298y3cj"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4128,12 +4128,12 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2023-07-27"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "74a083a3c32a08be24f7dfcc6f448ecf47857f46"; - sha256 = "1ak7j159c0lv6pxiq4nld6svzx3465r6f1xwpawwrxlzhi5a14yz"; + rev = "e3d7bfdf40e41a020d966d35f8b48d75b90367d2"; + sha256 = "1acxyy5317qf4ry0z32xkk3aasp233nss0nyd8dzfkf631klvzi2"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-11-10"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "bb3dc1a9fa34c3577bca627b848625e94a93efe8"; - sha256 = "0ikqzwsfapyq84d2lfdz2cjl83ppxdlg32220fgsxjxad1d2qran"; + rev = "cf58d40c90a36c2b2ec6629e84bee9617a7a31c6"; + sha256 = "0dxyvf6yrdvl0hhnwzsa9im20r100kr4dsvrfa7djbib1n8qvy65"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-10"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "f458f33e6ba0f3bfee233b90fb9318d42941d972"; - sha256 = "14kspw9s6wsgh0afyskkyqdbr68l7fiq75r1d22a3ffvc8m5a81w"; + rev = "2a4975130a39d9317595bb356b2ff5663f7d8a77"; + sha256 = "1r785mgavpc54lr9220n80mp8x90j20snwzicp80ahn407vs10n0"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-12"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a4868d184b0cf5114d5b0ee6aa13b1c5c4fb47fa"; - sha256 = "0q4nhp3bgbxfzg8x9grhpqfdvs7z6z4sxiz9vdm7q1ch9vq2g12q"; + rev = "47ff75ce2fcc319fe7d8e031bc42a75473919b93"; + sha256 = "17ab2q4xq1phhn2pxci0qjib1fjr5yl9lqpwf2sy49plhg7ix4zp"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5196,12 +5196,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-11-01"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "bb874e8d832b66fa734b7b048d52eb9ed736bdcf"; - sha256 = "0m3k26sn52l34gc39gj913470n35bcw6vbp4wciqdhg8l4slliav"; + rev = "8a9ee4e11a3e23101d1d1d11aaac3159ad925cc9"; + sha256 = "0snk9as2m5dz3m0iki4mrs8j5kd3zr0bfpwxi0i70y4hzxaqlwm1"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab"; - sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs"; + rev = "8055851d16831370f5249c30a04f2eafcb0b76d3"; + sha256 = "0dk9r44i9anrjs84s1139vcxmfpw006cqbblis8lhbmwa7m6vhkp"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "283a3fc8e01191095d33c078031c577e8f9427b9"; - sha256 = "0r70gssbdkplmfacbcafr1d9hh0k61ybpcw65lplx7ya8q62yb0k"; + rev = "424503af246033f177a11c9959424bbb3640f077"; + sha256 = "1ykncpyd7yf73clxifcjsm1lvsy8mzy84j5z203gpl2zwpcnn1sc"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5315,12 +5315,12 @@ final: prev: luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-11-10"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "46c91e814732c1630b8a8b50d04acbf54b8320fa"; - sha256 = "1bx2sjqr2rvyl2zyc4rymg1sl67gw542vfpl857dx7yhabr9xj4d"; + rev = "1f4ad8bb72bdeb60975e98652636b991a9b7475d"; + sha256 = "174pwxjdnb1gxxrnvz6zplr5r2cwjq79si1ns1ymziq4lrxjnni8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5424,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-11-09"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3"; - sha256 = "143yq3hydkp54m2mw04rirqs7zgl7wp09jdlq5q9nb4v7ll7nmgg"; + rev = "ab640b38ca9fa50d25d2d249b6606b9456b628d5"; + sha256 = "16lc26ypiq29jnmxdqhvlj30q1lbfin89cdahchils8fir6pn3sg"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5472,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-11-02"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "eb52634ec1f6cc186f85640ae4bf3ee80bb10551"; - sha256 = "1lb58jxkz2kzf0zqbba3znxckadi09yna9lmyq3my59xzkaqa7p4"; + rev = "a74108b417cff78d15074f6f68a8f997e718f404"; + sha256 = "1vfndgk09kvrwj3kviff4c8wsi8gd7pym5wg0r17jflmqr7y2y5m"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-11"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f2b89efbbad1943657e43f474fe308fceb63597e"; - sha256 = "1yyqb3plmzmfpidcij66j3mcg37ysf3bs1s5wyyi7hxqw6hqqhk4"; + rev = "92e2ae609f612f11f7e8e45d13614fcdff9f89b9"; + sha256 = "0fwg6k01njgybj1ca9iy92psi2slq227zlmp74z97fh1m9sn6b8l"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5604,12 +5604,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-11-11"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "3918f17ab136a469a81881a194068609f0a878d4"; - sha256 = "1xkfg8hmglyx8y8b2hlv40n904naiar1abb29r2lvdwri8aksql5"; + rev = "d22c02c007170ab432ca3e166a1da56297767e87"; + sha256 = "0pvx8bsl4623mx4fgym993dnws62vfnaz90mrcfp7kska3p1d4p2"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5628,12 +5628,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2023-11-10"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "29763c6d49eaa8d0c9c9093a88fb38db34ba4875"; - sha256 = "1hxr0grv8fcaik3kbcd323jz5zgqc0k353n7lrrs0ka2qicz94k5"; + rev = "413d0eab0d37d770759b4e2aba9205182fa796da"; + sha256 = "0xaxiqdf99901fpwv7h4a03k7qfqdnr9rfmrj1yx6rcai2yiwxyc"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -5688,12 +5688,12 @@ final: prev: nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; - version = "2023-04-22"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "jbyuki"; repo = "nabla.nvim"; - rev = "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e"; - sha256 = "17iw6ca9b8mrw68f4zkghnf3if76yrpj5fn8cp8829zpm722l6b1"; + rev = "f5aff14fa3d60f4be568c444be84400812823648"; + sha256 = "0ynqz7hmbxswxlnw411ah6n1bsd6saq8l5s8lrmbfas91zm5hy0x"; }; meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; @@ -5940,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-11-11"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "0f6e7acfd86b052acf78baccba04d5c61dcbbc0d"; - sha256 = "0glq1ywx1q8sqs3fkq071cqmwa6sn18glx1l0gmyvaxr0q9bijmh"; + rev = "230ff118613fa07138ba579b89d13ec2201530b9"; + sha256 = "13ma0zh6jbh8dbinczbanwf1jy20sac9qxx7v9h174gbyzpc079m"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5988,12 +5988,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "f93a984ee75ba6d532d85419619cc6e91d954ee9"; - sha256 = "0aisb4kwjys02za4rp2ai9qk64f3rx8xwwz1y20ki9q6729623d5"; + rev = "627b5b543f4df551fcddb99c17a8e260c453400d"; + sha256 = "0b3cv7w6ic9wbfnr11p0f1dnfzpwlnx10lw6wyhlfg8mwx8dvksb"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6024,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-11-08"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d3c5687a78cffc25026ff31d2fcbd61a2a3e067f"; - sha256 = "02yrcxmgx7va1h2nnabazwm7bwzffl5cmm4cbjssdhpsg6ahb2yk"; + rev = "987e415247547a372d0356f76444cf402436c727"; + sha256 = "00ppnr40s8lhlvga1m87xgwrdnyzj6as4522jl0n31lx7f90bvpm"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6096,12 +6096,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-11-08"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "55090798a2eed2dd00fc1b2774bc6bf309a3bd0b"; - sha256 = "1p5372c7n9ihyk8dnkwj4fb1as7q2md5xhqy5j17q7nviskvzq0s"; + rev = "095fad9481f5a678625a99dc06e9991c5d11efc8"; + sha256 = "1wqdhyr4z377y2gjlc4vg0v9wnnxwyxbcj5ahmihj1nfwrj1l7pa"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6168,12 +6168,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2023-11-12"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "009328955066ae6c170d24bb0de5f168d8760ff8"; - sha256 = "1i6lkbq5iadn9as9fy9lw1m1aw3vj00j6hxrrflgpnf3wqkvxb6a"; + rev = "d424d262d01bccc1e0b038c9a7220a755afd2a1f"; + sha256 = "1sg8m77hik1gffrqy4038sivhr8yhg536dp6yr5gbnbrjvc35dgm"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6216,12 +6216,12 @@ final: prev: neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-08-23"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "7904f8c0fedbe615ee3d75beb810d3e1426b05c6"; - sha256 = "13lsns5wdkp9ay4a11pp6hvhd8isqd5vzag89alwlazsdnmirmvd"; + rev = "0e85312566c6ef0aa7456503e4038cc5541e7df4"; + sha256 = "0jcbmh0w8zvhdkk111cvsb56j67bc2l0vf7dcyswn50p96djq5g0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6241,24 +6241,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "6f4b11212ef7a83889a3b488f562242198ddae4a"; - sha256 = "00h283dx9k9bdd89379q200h5kg7x02fk7cb6fac6ybnnbvp53pm"; + rev = "9bb7981e4753daaf705350b3d98305a488b82dff"; + sha256 = "1q229xqsv9in0n78hpi0sj6apqyzs9iqbhwnh57swd0v4x85ync6"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-10-11"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "65ab61c77aa1c245f16982ffe1a4d31589e18023"; - sha256 = "168597vm0645c3n6lijw18308kn6lhjp5k9jcnlc0jg640znczsf"; + rev = "d8b00a91e440474da20a8e9acdb0d72051078b8b"; + sha256 = "1z400jfjy3nqxn8024kbampnbnawzxacqz7k3mv2l72brgyp62bn"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6325,12 +6325,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-10-09"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "03e036a310379f132d4e39387e9076396132ce3f"; - sha256 = "1s3816q710qymv62zz6vld178lmfqgfh8wq5s0hcc26rpk8ap85h"; + rev = "f4e58d5278344440f65c5a5177f16711337e44f7"; + sha256 = "1ysg0vh7kw1sqpzdhgy13j9aljwk47jh5ss2y3k54j8a1qrx5c3j"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6433,12 +6433,12 @@ final: prev: nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-10-25"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "4c588f182090e01edadeecb127a353cb08d1e39f"; - sha256 = "1pibwk0vrb10h2r9x2s4ja54ballc548wb6cqdbdpcjfz4z5j14z"; + rev = "0cb04e9245b000daf32f04aae5f606011a6aa3b5"; + sha256 = "1rws27wc2l3qahvbfd5b2i1js9kwldxxsfsn0abah96q2m1i3q85"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6601,12 +6601,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-10-28"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef"; - sha256 = "0wa15f4p6ggngc8jkjfi4s5l0g6fm9va49825khnw94my45b5h5g"; + rev = "fa9be1679db7bf57d44128a018db43da5488a07f"; + sha256 = "0cqmdkxksridq4qgdfjcvinqq274lqidpblgijv5iqa14zzng0b0"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6697,12 +6697,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-11-08"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "ff99797242f37dbc118baad3d31aa125e08da90f"; - sha256 = "1dnsrk07q3va0p52xq6qsqh0iqxfgxx45xnw0cxhya732i4jlbdk"; + rev = "9d37797e6f9856ef25cfa266cff43f764e828827"; + sha256 = "0a57bswr6w0nmxj1fmvn24w60ibgh1gyqx586qhz1fq5i4jfjva8"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6937,12 +6937,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-11-08"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9d81c11fd185a131f81841e64941859305f6c42d"; - sha256 = "1pwn5c0hjm3wpzzybbakxgpq4bd7f6aygvslhivi4inzn48dla90"; + rev = "e154fdb6d70b3765d71f296e718b29d8b7026a63"; + sha256 = "156hp1i8vm0fpy5vbcx0ihazblnly72vjsiy8bf9f30i9rvq9knv"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6961,12 +6961,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2023-05-23"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42"; - sha256 = "186advam53j32xgiwg05wbgq3ab8zzkq3lnam6gad9101qp4wgf1"; + rev = "e0be843877e7ae756ef1ee7a441ca0b9e1677da9"; + sha256 = "0xib2xayrnf96r07rd7xdahpza41155npkdjxmr48h52gjj15nbl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7176,24 +7176,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-11-09"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "002fa927c9567ba70ab69225fd49f1e70c1290f8"; - sha256 = "1358imc5s0h0z4lyh2zyyiahcy5dl0jlkpc6iscfij6irlqv4jzr"; + rev = "b1db01865791b324918a7835984c0f96112df37c"; + sha256 = "1smxkw2pkmcbhypmcmssbnq0cpi2jsq7ihsm9nzp7mpvxz21gd34"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-11-10"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "775ae0e5a451dd6c5d15de7a828ea72d2c54e8cf"; - sha256 = "1ldbq4qfajysfrplawba8jv6v6lcvnvfz18pas198npn2gp9kgna"; + rev = "15fcab91e6a4e2a3e41dc55c5b3471f66c11ce39"; + sha256 = "1aqycpp4h274bhgx284fy632p89wx54cgjmqd1f0x1i2i94rvgap"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7224,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "90a28fd7637b66e055af62387ecee06f7cbd3173"; - sha256 = "0vzvbw8fh2j1l1sjkk5dfj5l5yghp5fk9pparvar1cyadpa6mcsh"; + rev = "6516abf5ac7d017480c8c8e08c0d24066bcb8d43"; + sha256 = "1vwjwqb5fsvf6bdj3c2wrja00jm3p4q2xhp7zg1na2nxsclswnqs"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7284,12 +7284,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-10-25"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6692a6512a53b494984eac247ced40e8165dc2ca"; - sha256 = "0060s3w35r03h7g3dykx1dj31ns9dsmnlxm2rz100y7mvbxi7qcc"; + rev = "a3a75d094cc880dcd1fd9745fea2f0cd84662110"; + sha256 = "0zjlcsmz3381ir4sl2n7r2b91d7x5hp12g03v27y381p9q5kg41y"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7404,12 +7404,12 @@ final: prev: nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; - version = "2023-10-27"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "3f4f176a6dd50c8588cfbe1b0e9cbea39018003e"; - sha256 = "11mrgrdhcqsw1xg9pldby8gp0wpkmbcf9c9nbahxd73s77b5a0b4"; + rev = "ba0e291cb5c0249838132e197dac082777bdc7d6"; + sha256 = "079w1n62dr8fyn3c6594dgvm5546c2lmaka4bqb1dxkmw9pfqfa1"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7452,12 +7452,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-11-12"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "c9b5422a845bff25ddeb8057b42afbf0f7b25e32"; - sha256 = "08x62lpjir0zhmscln14id0lz59wqmvdixacz7z9ghi00r7lrwxf"; + rev = "74ab63b598cca206888e83090ed6312aac324b4c"; + sha256 = "0habi91wq7q6i49x20ipli9kd84iflpz0wb2lfwnmhii1dfvmifh"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7476,12 +7476,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-11-11"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "9192f310afe34ab925d61add187a5ff278879333"; - sha256 = "1wcw0xjh44ik1j9gaalrwl86d7mp4v5hcdas3qy3bg8w8aqvgwaw"; + rev = "7c8f18e90cad4f56c4e22a49101668735639f286"; + sha256 = "1mfjnzfg4z5hzribzadlmgjjihh5dx55swjrjljmgsbj7jn4nqws"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7500,12 +7500,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-11-12"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "07201e6bd3b43a193d891cec844dfd1f23e775d1"; - sha256 = "0rpp9ddyq7yd462mlf99khrpway04vi892538ss8zqmz2lazchrn"; + rev = "a18a58015b46f02b4fe537ebfffd82e46110ff24"; + sha256 = "0ry2scnw8hzd3snjhbp71zc6mnna2bwn6icr3frsgdj1p5rfissn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7524,12 +7524,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2023-11-11"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "cfa2da7f469f1e759f2a961bc25fa4ccfe1795c2"; - sha256 = "0r1nm8l736vvrxhqnszk65siphkn59473y88qahxzhfj4b98qgd3"; + rev = "0855a89e00a5822c3a482a82e5223fcf2e9ede13"; + sha256 = "09riinjjh96nrs357ay886j8gs6cgkhj3zwngm44pf8p04w2w81n"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7572,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "874ae6e9445a5eb5ba430e5fd10212450a261ad7"; - sha256 = "0dn56zpbjxggcsbm7z6f1b4kcwsspj09ynzjkl8bq0l45qf3v50i"; + rev = "46e1f776f0a714099b9160604fbb62fba2540376"; + sha256 = "1c3i4hzr68izlk3r4lain0v1kqh1l078gc8bf8mj7vgwa67mplj0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-11"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "075a64addc33390028ea124a1046a43497f05cd1"; - sha256 = "1rkwc97h9pnxrzqq1bp72cr6182rvh0bi3c9dfq91q51g70a651h"; + rev = "d87629647614b779fb2aad8f0042fe2864253ea6"; + sha256 = "04y1hygrpgkfb9y7ncbdrmqbzzvlr3f1xn3dgmyswl1cb602525b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977"; - sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv"; + rev = "f3ec0d8a1b4e07d7ed2da6b9a9f10864a83c4be4"; + sha256 = "1kbx404z9ziy2ylj9qkmrdkhb4mjhvijnrb29hdbjh1hymhghxzp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7680,12 +7680,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d"; - sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s"; + rev = "ead792ccdace6a9d64a8119909af243ed0105465"; + sha256 = "0s55gcdh6yi0mpszqaj10sm25nk6wichli6zavs7ywg29nfxl3h8"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7715,12 +7715,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-11-12"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "068053c5921b04d4ecb5fafc2e71b4f04cc35e80"; - sha256 = "08kgrmcxv3rcf8lmvh4fif5njicvsirgsb8v48zhcg1ppn36c412"; + rev = "a6132d058f23d15686f07b8e1ca252e060a0e0ce"; + sha256 = "0ijlsw9x3g2h48wvcagp1h4pvyjrrlc1cn0jni5pqs6fqjlcbypk"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7739,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-11"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "3fafeea5f339223e888fd15eb4032260849cb038"; - sha256 = "14vwqj74icbh1zk23k833jfprh4bdb7yq850c4rn7cs6bl06nwrp"; + rev = "e2f6e0e299e193d7e9c48634d355f7a6eb3020b4"; + sha256 = "06588a1ksahy51vszi7ri5i40yy2hxbp2zgrd1xnlc2xk0bxzbqh"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7847,24 +7847,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-11-09"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "154721cebecde111242377901760b6d175e49d84"; - sha256 = "06503m702f9ff59vpqz7al7my90k9rca1ll7mvwzdfrsfllkpggf"; + rev = "5d6bed660ff18878a9096b3acef9c444b85021ac"; + sha256 = "1y1d1fa5m5wch2daskshmwm934qgbaca9s1340y36bhysbdd7ifj"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-11-10"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "3727410e4875ad8ba339c585859a9391d643b9ed"; - sha256 = "0h9d24y213bwr0nh3kalmfvsjiqkj3jjq9c81x3vkdy6g12kfdxm"; + rev = "af04969c437e0c46a2b3c86d7892458e878ecc40"; + sha256 = "17mi1hs3jmmrxqxhykqf0xj91ssxzzzig7gmdlyak6pgwln2ziyr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7920,12 +7920,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-11-12"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "f3a7349156453500f1c053a1f8034a3975b1d793"; - sha256 = "0xr665dmv8h87c681f114d3vmb9rh0g7map5m70gixdnd60v009p"; + rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea"; + sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8439,12 +8439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-10-17"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "14a80ffab90567e360eb97b19039c4c16913ad79"; - sha256 = "1ak24ydzrak1al1nf6kdfjivlfh03hsyibyf7x1gnzwgm35i1v4a"; + rev = "4e9910b1c4cbd49d8ccd001e7a59b700c57cd71b"; + sha256 = "170d89xh104fzcmnd8az65jvdr2bs3lyaqw8icpbav7vfi7d099a"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8511,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-11-11"; + version = "2023-11-19"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "a5e8fb4960f905a52031b28113cf43088cfeae22"; - sha256 = "0d3yfy7a7jc0g4y3x6fff2skbkhp3hjjk0p4q2a66s6rm626pg6z"; + rev = "072210357169394dff90d30ccfe0ac92530a9317"; + sha256 = "03ky9w9lvsb48lihx6lnmsj67w39hc79qhajr148zlldby7cw2v6"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8762,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-12"; + version = "2023-11-19"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "36cbeceb6602ce97f04d5526fd238957b77dd263"; - sha256 = "108zzz088ll08h55ij0bb81ak53cyxbzfigkfvj31c8v2i3j9jr9"; + rev = "540ff82e5f47f3e39bd583acfbd813f4ac90d4a6"; + sha256 = "096i4rrs2yjrhixwzcwh9ppiq5cjdvn3in6b0m4qh9wk3i0kxrvx"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8930,12 +8930,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-10-18"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "6c592e9e78e68cd2bf4385da1b2a633219a22aab"; - sha256 = "1a32yhdq9pbl9xz9brgn54171b059yrsp635r6crzp380nfpw1hf"; + rev = "41378567217097a3d78b624c9f11d29436381e99"; + sha256 = "0dwh7zb8l83d8l63ps6qc5am7r95bnyavz5r8qpxnzgzdic2r5nv"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8954,12 +8954,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2023-02-25"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "eb7f35f6a652f60d3b4f262d64d4846adbd4d104"; - sha256 = "0n3n80sq9kxamih47q1z6lsbh7adic612cklikva379kqygmvdlj"; + rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b"; + sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -9051,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "8a2c15665fab760ecfd854329d2170a6ab40aa83"; - sha256 = "0b9zd8v8l2d89wsc8qfgk51pqs8wrfr6fj9vcdq2v7f648ly19lw"; + rev = "149ad2d3c297a11135322d00a2a3cef35911b278"; + sha256 = "1lkcid96ngaw1yyyin639x1icybd97g7016m9n4y2xrmkdbx32h4"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9219,12 +9219,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2023-11-05"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "89e6e2ed2e3d8fc55479ad642d260a95bb731d1a"; - sha256 = "1499ajkpq7vbapwn4s96wcmc5mnxrlidb7p34nhns41cn8kfss3n"; + rev = "9531bfb26257f0d06f7ea2b7ecb4f13095d430ab"; + sha256 = "0k1gm1qijdwsrpc0rd6b1q71l6gi2hr8sh6nfslah3dgncgpy21d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9244,12 +9244,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-09-25"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "8ea4c4f5caf61ac4ab887fc53eabc916985db881"; - sha256 = "0z6i35gcf4qcy9cgsrg2bg2alh0sk6zxqvid8lgkmds4qgrvhxp3"; + rev = "ffe6b8e975bb2f218cbeb3e785d2f12d9f88b37d"; + sha256 = "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9352,12 +9352,12 @@ final: prev: substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2023-10-11"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "cf35db50188f3d7de624ae391c9bb9f2e9de5610"; - sha256 = "0v1svihxdh74ip1hmbc2aj95znlgvgb8z7ifxyz5sb1bk774460h"; + rev = "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714"; + sha256 = "0jf6r6zxgr4709lfl2ry7z8qh4zql8w4x56bqj0jfkga35l9c7c1"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -9715,12 +9715,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-11-05"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "3044ff9e38d1ed8d7818d72d9f951ed9d1b0563d"; - sha256 = "0p1k1cfapbws0snf43idcrh326z2zcz3l05m3jv8dg9j7mmaps4w"; + rev = "f41675fddb1ea9003187d07ecc627a8bf8292633"; + sha256 = "05qvb1fsnby5c5x5my601lavbk3m9w10dnq6i55yp42ksrk8zjki"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9812,12 +9812,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-10-29"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "30f95237af9a9bbbd386742ec40e489bf09f8ead"; - sha256 = "1svw724jlhchsl191bmgr50zbjl9vghkaxk3j8g0nzvrn9677b22"; + rev = "d946dba3dbf71005434aeae5a4aa5589b09649bc"; + sha256 = "1sha737v9ixzf2d336ykvh5kszb5bi2vb4i5ms4ffayf10lhk30g"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -9896,12 +9896,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2023-11-10"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "a3dcb6e32a3a59a5570a7cda33171eeef9753345"; - sha256 = "1vx3zfb2mc56ggk1j2kh9xzpnid963wvg2ibhq1c7vzf0d3wigc0"; + rev = "d3afc1c105535a90caec092ce27a113f77ba7b84"; + sha256 = "0cpkjl6pffwdrh1hawpd042gpnyqbg2r8f1nz0fwdk175bgsx2s8"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -9957,12 +9957,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-11-06"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "20bf20500c95208c3ac0ef07245065bf94dcab15"; - sha256 = "096vv98xxdqy96ipz6lbricfr74bkc3r58x1si1816lnm0j896r5"; + rev = "18774ec7929c8a8003a91e9e1f69f6c32258bbfe"; + sha256 = "1vihb6l5xiqbrs1g4c1blpkd0c995hwv2w6sr5b86zzmk70g0c7k"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10065,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-12"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "51e043c27478823d3d914ccf8e373b189a084836"; - sha256 = "1fggk1k1wfgrcapv2z8s7j9k1nkxc1g33c87pjld7dsm6477fvms"; + rev = "65fcc8fb79ceef644af6861558bb534562ef6c0e"; + sha256 = "12dhchvn9mgs3pndiq6bnjn44ixx3famf5ad3vhhw0h7331p7v9v"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10246,12 +10246,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2023-11-08"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7b6e1ce4bfd679071a16ed212be6b3b1e0840dd4"; - sha256 = "02n5231gq3097a2ldgl5mflm0182mfcxc7wv801fd6gj3d021ls7"; + rev = "1d6e89f4790aa04eaae38fa9460a3ee191961c96"; + sha256 = "1f7zrzv0f2di1vkavgyqa80mx686rii0gsygl8rs3qrr9bc17zd5"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10342,12 +10342,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2023-10-19"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "102ba313f87e1f9f9864f681dd7779cac8f6d3ea"; - sha256 = "1sadhwdwcdb5qibp4xsw1g3skfgyq6rv86cmlb15ys6r4dv0lyws"; + rev = "11f50fb66132c0bac929533b64536a8a7c490435"; + sha256 = "10dw4v8z8akgbp745f4ir0jnspxa1lji7adpgqa9fvkw78yws1n1"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -10426,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-11-10"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "790da1ea008bac817ec80eb941286120e3e59b74"; - sha256 = "0q084havhpxkws9ppw4hiv1sjq53w3q1sdfh492rkcrsrpppvgyv"; + rev = "fe51253418442af7c5e5884e084bdc574b5be5fb"; + sha256 = "12zpkskk81nagai3rip7ak0k7nz5imj07bphkalchf6lrr464bli"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10906,12 +10906,12 @@ final: prev: vim-alias = buildVimPlugin { pname = "vim-alias"; - version = "2021-05-25"; + version = "2023-11-18"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-alias"; - rev = "9d1a86284c223fad488137075867ba1c1bd20599"; - sha256 = "1fqa39j3ax7cvj7bn33r545zwbplmf4b6n7z5jgqqn8h03hsq7x1"; + rev = "4fb8430816ecd12952c44bf1891ec554249f21b3"; + sha256 = "0919drb2ml1xfm3y2g9nvqh6l3n2hjmsbrw6g72lgqh7l02xlalz"; }; meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; @@ -11590,12 +11590,12 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2023-10-15"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "bcdf3ff768cc7e544a0f78b0383d8719c2116569"; - sha256 = "1dnmm54inx7qbwk5dbng1g4448hfcls2fzld36i7dgv3calplg9z"; + rev = "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2"; + sha256 = "07shhzgg5f4zci1md5gmns0h4xq3hxvak4c78glm807kcw22rj70"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; @@ -11686,12 +11686,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2023-06-18"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "bbf53b30ca1e718625b9b84b1d32379e470ddad7"; - sha256 = "1pg1w587lkj0vx1qcf7916928jm72c5j0jjj9804bdxdwixygyza"; + rev = "babbf69f7bb5274f0461e04a59d3e059bee27314"; + sha256 = "1j38m972z5qca8rl5i0w8rhvv1r2ipqvajh07b006dn8smaz33zs"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -12070,12 +12070,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-10-05"; + version = "2023-11-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "6e81602e9d7ff7dc1c96c66fedc38fca1262d57c"; - sha256 = "1354apq2hcizp96p5y3ig2v8i0aq358qyifi8m3qzx6sh5ql0vgp"; + rev = "b1d93789faf8bfe1f3e17eec03b8312c2939fcf2"; + sha256 = "11rykxacg9qlwyf0j4p6w8qqjr5yi1inmghyb4mvd5d0zp61p5w0"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12876,12 +12876,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-11-08"; + version = "2023-11-16"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "743cbe28d8e6acd82eb7db6bac11c50661ec16a9"; - sha256 = "16vdabnq8rxkbi5bccr0fjxjhm0n7d3r1sdx1459s4b5h6his9bw"; + rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a"; + sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13128,12 +13128,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-09-17"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "7613a3f702ae7ff2794b659a9769494203f5cb67"; - sha256 = "0fa56dn9jmqz0hwd2jjc9g4j0rqyw5d5v64vzs8lq6r52fvzcm6j"; + rev = "3d99f09affd1ea6b9289949d5b282c43fe21eab8"; + sha256 = "08983vwgcaz2ydl4pf5nlzjli7aa88bmdp3m56519ihfhj2s1s22"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13357,12 +13357,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-11-07"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "dae763bc4665516f354c20d84e53355a810682a2"; - sha256 = "1yddbd9wazxh95wrkw5lnb8fmlk3q4zj051f4qjn13rbj4j0ch6l"; + rev = "247324e0170e19de0018e7c8e437f83b6f0ef6fc"; + sha256 = "0l3rlah48969kkz2r6xl9r8plg7n4an1pk5cy92ly94x6yw5awkm"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -13657,12 +13657,12 @@ final: prev: vim-orgmode = buildVimPlugin { pname = "vim-orgmode"; - version = "2022-12-09"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "jceb"; repo = "vim-orgmode"; - rev = "b27feaba9a316e8307cfd7a56797b378fb52df83"; - sha256 = "0b2y49ylbrp1i5r5abznziv1n43d063mib07v4ila0873k7fzir6"; + rev = "83982349e45e6d27d186ad82050f86c3233a16f0"; + sha256 = "1gw9x3lf379kpscb47vg14cmfspcj04kif6q38xvd5szkw8mq50f"; }; meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; @@ -14293,12 +14293,12 @@ final: prev: vim-scriptease = buildVimPlugin { pname = "vim-scriptease"; - version = "2022-05-30"; + version = "2023-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "18511d389675d773994215ddb572ccdc2b72f52b"; - sha256 = "1mzs4x6y68akysbibprfif1dksaafhcyhddkcyh3da6by6sp5l0l"; + rev = "cdb5981d47ac98221a408ae2e7cae66524d9e872"; + sha256 = "1f5y96lkbj8zfm6lc3izynb4dz914vli2yqpn1gw9y3llj43n5bn"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -14822,12 +14822,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-10-28"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "5880b17c3baf31a22077538dad5d88c658874303"; - sha256 = "1j42sdr24z7hg3n5g1paa3a5gc4sfdyp0rl43qqa2kvnghpzk93z"; + rev = "6d054a713d601291c01c42197796644cf00ca9f2"; + sha256 = "0lf82ka9x1fkgczqxkbvlqygp6glcn1baq8ix0y60jn3kqccpm4s"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15242,12 +15242,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-11-02"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3c6c5bf17f4ae6c53396667ce3405df02a80b894"; - sha256 = "0n8db9y20fmm4zngmhpnr3pcpjrm78071mmq96wx1nfgn544hsld"; + rev = "87c6861ea81700ec4a6a27c81413cf07cb2c883c"; + sha256 = "0j2rnrz2cx0zsvqbx4glpdij89nbxwq6iyb385jvv7lhm4fyary8"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15567,12 +15567,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-11-04"; + version = "2023-11-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7d1dbd0eebe041fbda4d1132622bf051b1546497"; - sha256 = "130v7kqf14r46ndn199lc74fm4dxiky3c14kilx4adnifac7qywb"; + rev = "a630f0f75d9468d10c9125f2f1b0049e479c2f54"; + sha256 = "0f1p93jmhfp6fvl29v58rgwcvqa5lh1ks44w7gp6yh2w0i78s200"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16024,12 +16024,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-12"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "9f3c13bbcf16fcaec3a429c03743a13e5923f3e3"; - sha256 = "06m4mz3s53n5rw62jdrz66ygfqx02r0m7ixb14cl327hy1dfnsgc"; + rev = "a8dfb969e76d1a0752d98b5347be9ffb9bca9592"; + sha256 = "07xmcvb06w4khjc2z8h3i1c63fhkk4d76xjzwxs8lhzwfm4w3n86"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 4f00a46348ca9..3e80713f88714 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -160,12 +160,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=25371f9"; + version = "0.0.0+rev=212a80f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "25371f9448b97c55b853a6ee8bb0bfb1bca6da9f"; - hash = "sha256-6o5D9rOYZ8qTSslTrkK2+7f6WWXF50u5tbxYEaEUbkc="; + rev = "212a80f86452bb1316324fa0db730cf52f29e05a"; + hash = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -292,12 +292,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=a90f170"; + version = "0.0.0+rev=a714740"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "a90f170f92d5d70e7c2d4183c146e61ba5f3a457"; - hash = "sha256-e9Mz84lssaPR80hlogyjXx+jA8gD8YVp4T06qC6gRVI="; + rev = "a71474021410973b29bfe99440d57bcd750246b1"; + hash = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -326,12 +326,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=3161aed"; + version = "0.0.0+rev=d33ee2c"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "3161aed045130c900f870ef53fad93a574317769"; - hash = "sha256-Eo92hl3mT2qV2L4hfmUNXdAleRKeyGUQuV6VE/Cg6nw="; + rev = "d33ee2caab572f7b46cef12e090331b9ed1c02e2"; + hash = "sha256-9fQ0z7DozjGdcQZG36w419mFXIVDeafkG+ciQHgh0EE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -714,12 +714,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=3f93ccc"; + version = "0.0.0+rev=b2afa4f"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "3f93cccaf278cc4c9cf9a373ea2f6389174d634c"; - hash = "sha256-TjyAaxEtGVjnBdcw1uyeQhotNhZlQKvN1SgbZwKvm3M="; + rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122"; + hash = "sha256-Z1wutK2NyI5EMwTezeZp/g8JFD0p7kqBGCuh9Amyjgo="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -736,12 +736,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=bea82d3"; + version = "0.0.0+rev=c9082ed"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "bea82d337801e472e35b5cd08038afdf13263768"; - hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE="; + rev = "c9082edab87b145e97090b133167cb53626d9f58"; + hash = "sha256-bwuPykagBFfTJ87C5oNcUWmKs9eBBYPZ0UOC/8zbbF8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -901,12 +901,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=b553906"; + version = "0.0.0+rev=e135399"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; - hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; + rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; + hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -934,12 +934,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=f2902bd"; + version = "0.0.0+rev=ac65c93"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "f2902bd614e3916bdf65e1bc9ad45ebd08417bba"; - hash = "sha256-tuie4Yzauejf+5Par2qnWfaQgOLhROL2le1+UTq5cSY="; + rev = "ac65c934b3214e96e0f854be009a3bd51549bd14"; + hash = "sha256-rTBal4RBOFBKfb9cydvWH+JtCCMOlnnGMPb2X7LXRjE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1011,12 +1011,12 @@ }; ini = buildGrammar { language = "ini"; - version = "0.0.0+rev=7f11a02"; + version = "0.0.0+rev=bcb84a2"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; - rev = "7f11a02fb8891482068e0fe419965d7bade81a68"; - hash = "sha256-IIpKzpA4q1jpYVZ75VZaxWHaqNt8TA427eMOui2s71M="; + rev = "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5"; + hash = "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU="; }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; @@ -1220,23 +1220,34 @@ }; leo = buildGrammar { language = "leo"; - version = "0.0.0+rev=91d7aa6"; + version = "0.0.0+rev=23a9534"; src = fetchFromGitHub { owner = "r001"; repo = "tree-sitter-leo"; - rev = "91d7aa606f524cf4f5df7f4aacb45b4056fac704"; - hash = "sha256-8nea6Qg0eT5ciif+tzD13TcFqP9/uJVxgVSW93OdiVY="; + rev = "23a9534d09d523d0dcee7dbf89e7c819e6835f6f"; + hash = "sha256-21Vqvc3HjmKi1FRKyswMcf8rPjkyAbjTayDYMsTUsBg="; }; meta.homepage = "https://github.com/r001/tree-sitter-leo"; }; + linkerscript = buildGrammar { + language = "linkerscript"; + version = "0.0.0+rev=f99011a"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-linkerscript"; + rev = "f99011a3554213b654985a4b0a65b3b032ec4621"; + hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-linkerscript"; + }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=b35882f"; + version = "0.0.0+rev=91d2708"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "b35882f2e1460867ddddcbe8af586e6807d4676f"; - hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0="; + rev = "91d2708e12a5869154a85190b13ac89cb1414189"; + hash = "sha256-2wnGHQXx5QHkXSBsxjULIRlbXj7CBxWxFjef3n9lmew="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1319,24 +1330,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=7ce4c69"; + version = "0.0.0+rev=f9820b2"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"; - hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0="; + rev = "f9820b2db958228f9be339b67d2de874d065866e"; + hash = "sha256-0T0P018Zb4tfU2D4PLhiW8tunOInlRtrHajPOVqOpwc="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=7ce4c69"; + version = "0.0.0+rev=f9820b2"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"; - hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0="; + rev = "f9820b2db958228f9be339b67d2de874d065866e"; + hash = "sha256-0T0P018Zb4tfU2D4PLhiW8tunOInlRtrHajPOVqOpwc="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1498,12 +1509,12 @@ }; objdump = buildGrammar { language = "objdump"; - version = "0.0.0+rev=64e4741"; + version = "0.0.0+rev=28d3b2e"; src = fetchFromGitHub { owner = "ColinKennedy"; repo = "tree-sitter-objdump"; - rev = "64e4741d58345c36ded639f5a3bcd7811be7f8f8"; - hash = "sha256-v5skJKQ/c0YeGVj3Vs+SNnFqTkp0mblZU4DyJ9hg7s4="; + rev = "28d3b2e25a0b1881d1b47ed1924ca276c7003d45"; + hash = "sha256-OPqIhgItghXplQ78Vlwd0G6KtDWTVkaG17RPqx1b5JY="; }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-objdump"; }; @@ -1611,12 +1622,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=33e3016"; + version = "0.0.0+rev=0a99dec"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"; - hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc="; + rev = "0a99deca13c4af1fb9adcb03c958bfc9f4c740a9"; + hash = "sha256-MfCws6WvaYJPoxoSdk1OUkqfVGCNtfMDTyndSZpABqI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1766,12 +1777,12 @@ }; purescript = buildGrammar { language = "purescript"; - version = "0.0.0+rev=5ef5592"; + version = "0.0.0+rev=85a9095"; src = fetchFromGitHub { owner = "postsolar"; repo = "tree-sitter-purescript"; - rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c"; - hash = "sha256-V9cuENH/tpXt9mfZqJ2v4dxJvbwEHU8Ri+UxQafWemY="; + rev = "85a90951c10f118f819c1137f669800246890db7"; + hash = "sha256-F5xkMYK5WYn+Fuf/vWGaywX+hrjOqGUlg9EjHMS6yDg="; }; meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; }; @@ -1788,12 +1799,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=82f5c99"; + version = "0.0.0+rev=4bfdd90"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "82f5c9937fe4300b4bec3ee0e788d642c77aab2c"; - hash = "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk="; + rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"; + hash = "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1975,12 +1986,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=48e0533"; + version = "0.0.0+rev=79456e6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "48e053397b587de97790b055a1097b7c8a4ef846"; - hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; + rev = "79456e6080f50fc1ca7c21845794308fa5d35a51"; + hash = "sha256-57CuGp7gP+AVYIR3HbMXnmmSAbtlpWrOHRYpMbmWfds="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2086,24 +2097,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=a768c95"; + version = "0.0.0+rev=82ee140"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "a768c956b6aee72ffebb5df7f7c0b3702eaa2fbd"; - hash = "sha256-bfW7uox0/4bW5J5hXcKDfNXtKSI4BFk7f5J0bhMDpbw="; + rev = "82ee140f4ee7652a4915ac9e9f60c4d66f7637d7"; + hash = "sha256-fNKLvE9uXQlsCqO2F8ahxWigTmYu6f2TgRBgGbXvszk="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2121,12 +2132,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=5f928f4"; + version = "0.0.0+rev=d8fffdf"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "5f928f404d2aa024abce8657778fc10c03f1511f"; - hash = "sha256-7W6vuaZjDZgoaxJexPPBjJZlutlTT+hTFL1dq9k2NSo="; + rev = "d8fffdf0902bf55994fd2e8a0a46e221ca988589"; + hash = "sha256-PowCYtL56lLGJaXFEdtPGAXaqYF0/u/mqDCjXHmyps0="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2143,12 +2154,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=6ac08de"; + version = "0.0.0+rev=1651e63"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "6ac08decae456ef2fc307977d9210f86d75d4eca"; - hash = "sha256-heXyWK3yPqej2jbTFYTDR3uY6JH4KvPVyCDjZzVNcTw="; + rev = "1651e637d57c667708add5440d3726f07e97d953"; + hash = "sha256-jshQhWIeMcsUA7g2RGuH3DSfBfRhRx9dMOJVm/92Jkw="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2243,12 +2254,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=884a034"; + version = "0.0.0+rev=b904af3"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "884a034e0ae29ce72649041a603deacdfb4a3275"; - hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY="; + rev = "b904af353fb2f1df6ac45d8d3e3a5ee85a6cc306"; + hash = "sha256-MGdwcw9T3hemUHfgQmdTp20MW08AQcVWGRHxkP/6N5Y="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2275,14 +2286,25 @@ generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; }; + templ = buildGrammar { + language = "templ"; + version = "0.0.0+rev=6b9dff6"; + src = fetchFromGitHub { + owner = "vrischmann"; + repo = "tree-sitter-templ"; + rev = "6b9dff614d5bab902cb6989bfcaa180636218159"; + hash = "sha256-89CJkVuNWm3V3Iz8iCx1pLIJwhyPcEfDB3ZqqiwZEdU="; + }; + meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; + }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=b553906"; + version = "0.0.0+rev=e135399"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "b5539065432c08e4118eb3ee7c94902fdda85708"; - hash = "sha256-okLwoDGgK6aM5+8oelfRnuKqIimTs8Hc0N8Ikrm2eY0="; + rev = "e135399cb31b95fac0760b094556d1d5ce84acf0"; + hash = "sha256-Ylxpj+e9YGhyRRRCCVs0g/zhwHpwGELxG2i+E3SFmpQ="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -2322,12 +2344,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=204e858"; + version = "0.0.0+rev=d99cb5c"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "204e858899f7dd5713dea7b0148d6aa477d4a18f"; - hash = "sha256-AzCXFr6YAmbmEiBEN6MI+MeBDoEDrJB2vcZl/OEUqmg="; + rev = "d99cb5c77bb0e733176d607a0875ac30e17e1e72"; + hash = "sha256-ShZlFHokmy3hhfTeh+/anz7a2bGDwWAdWIdi3X/lchQ="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2480,12 +2502,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=099a85f"; + version = "0.0.0+rev=2f24b03"; src = fetchFromGitHub { owner = "v-analyzer"; repo = "v-analyzer"; - rev = "099a85fbd34a8b9db9f83da19f184bd4c1886e7c"; - hash = "sha256-0Z4sljC+rkBRSPdLpzSawLdNcwE0QqrowULs9NXFrrc="; + rev = "2f24b0377ddb865eb4285634f6945cb4ee3f395c"; + hash = "sha256-DLtG1RzoDC252O1FItP9vDZyt/MpV4bR7tcMSOLINWA="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/v-analyzer/v-analyzer"; @@ -2580,12 +2602,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=238200d"; + version = "0.0.0+rev=f6423ec"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "238200d172538d5ff1228a929ea543465acfc410"; - hash = "sha256-a/8lbO8/+XhD3i6hjAxCA1rpovlkVHnDxz8xkc3bPoY="; + rev = "f6423ecace1ef34f57dc77db031504ce21ebfaaf"; + hash = "sha256-uIUIXHxHWedJ5oH1u/88degVAzklzN97AYc5B39nFwE="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5e6f03ec8cecb..a27f8650f425e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -847,6 +847,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; + neotest = super.neorg.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim nui-nvim ]; }; @@ -999,7 +1003,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-Rqs9INcc53SYGXHRyeTbLkGGU035i2i6n6A4ekFKve0="; + cargoHash = "sha256-ITrjY15Haz8hEztWym4q8YW2h0R8/kOYPaIYJu87sN4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch b/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch index da0222fbbe421..e0980a3ccb092 100644 --- a/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch +++ b/pkgs/applications/editors/vim/plugins/patches/coq_nvim/emulate-venv.patch @@ -1,15 +1,15 @@ diff --git a/coq/__main__.py b/coq/__main__.py -index 5a6c6fd2..e0d9eec8 100644 +index dd40afc1..36bcca21 100644 --- a/coq/__main__.py +++ b/coq/__main__.py @@ -78,7 +78,7 @@ _EXEC_PATH = Path(executable) _EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name _REQ = REQUIREMENTS.read_text() - + -_IN_VENV = _RT_PY == _EXEC_PATH +_IN_VENV = True - - + + if command == "deps": @@ -152,7 +152,7 @@ elif command == "run": try: @@ -21,15 +21,15 @@ index 5a6c6fd2..e0d9eec8 100644 else: import pynvim_pp diff --git a/coq/consts.py b/coq/consts.py -index 5a027fe9..a3e0c5a4 100644 +index 804e92ab..5c090a93 100644 --- a/coq/consts.py +++ b/coq/consts.py -@@ -9,7 +9,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent +@@ -10,7 +10,7 @@ TOP_LEVEL = Path(__file__).resolve(strict=True).parent.parent REQUIREMENTS = TOP_LEVEL / "requirements.txt" - - + + -VARS = TOP_LEVEL / ".vars" +VARS = Path.home() / ".cache/coq_nvim/vars" - + RT_DIR = VARS / "runtime" RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3" diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 92518ad77c532..4db45ddc84986 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -150,6 +150,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[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" @@ -201,6 +210,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] +name = "camino" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] + +[[package]] name = "cargo-lock" version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -213,6 +231,29 @@ dependencies = [ ] [[package]] +name = "cargo-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -361,6 +402,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] +name = "colorsys" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54261aba646433cb567ec89844be4c4825ca92a4f8afba52fc4dd88436e31bbd" + +[[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -399,6 +446,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[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.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -442,6 +498,41 @@ dependencies = [ ] [[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 = "deranged" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -572,6 +663,16 @@ dependencies = [ ] [[package]] +name = "flate2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -810,6 +911,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] +name = "highlighter" +version = "0.1.0" +dependencies = [ + "anyhow", + "colorsys", + "once_cell", + "rgb2ansi256", + "serde", + "syntect", + "tracing", + "utils", +] + +[[package]] name = "home" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -923,6 +1038,12 @@ dependencies = [ ] [[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" @@ -1096,6 +1217,37 @@ dependencies = [ ] [[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 = "linter" +version = "0.1.0" +dependencies = [ + "async-trait", + "cargo_metadata", + "once_cell", + "parking_lot", + "paths", + "regex", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] name = "linux-raw-sys" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1128,7 +1280,7 @@ dependencies = [ [[package]] name = "maple" -version = "0.1.46" +version = "0.1.47" dependencies = [ "built", "chrono", @@ -1156,9 +1308,12 @@ dependencies = [ "futures", "grep-matcher", "grep-searcher", + "highlighter", "icon", "ignore", "itertools", + "linter", + "maple_derive", "matcher", "once_cell", "parking_lot", @@ -1181,6 +1336,18 @@ dependencies = [ ] [[package]] +name = "maple_derive" +version = "0.1.0" +dependencies = [ + "darling", + "once_cell", + "proc-macro2", + "quote", + "syn", + "types", +] + +[[package]] name = "matcher" version = "0.1.0" dependencies = [ @@ -1195,9 +1362,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -1309,6 +1476,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1385,6 +1574,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "plist" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +dependencies = [ + "base64 0.21.2", + "indexmap 1.9.3", + "line-wrap", + "quick-xml", + "serde", + "time 0.3.27", +] + +[[package]] name = "printer" version = "0.1.0" dependencies = [ @@ -1407,6 +1610,15 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + +[[package]] name = "quote" version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1474,25 +1686,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick 1.0.4", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick 1.0.4", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -1503,9 +1715,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" @@ -1547,6 +1759,12 @@ dependencies = [ ] [[package]] +name = "rgb2ansi256" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebca96b1c05912d531790498048bab5b7b97a756a7bb9df71fa4ef7ef9814e1" + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1628,6 +1846,12 @@ 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" @@ -1805,6 +2029,27 @@ dependencies = [ ] [[package]] +name = "syntect" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "flate2", + "fnv", + "once_cell", + "onig", + "plist", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "thiserror", + "walkdir", + "yaml-rust", +] + +[[package]] name = "thiserror" version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2486,3 +2731,12 @@ dependencies = [ "cfg-if", "windows-sys 0.48.0", ] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index e5ff07f4d8d47..5e4466af79639 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.46"; + version = "0.47"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-KWBuoZ2GxjwIu7L1PPq/7u3iuYFp5QrlsleL2RQTdUE="; + hash = "sha256-CYv5AZsGvN2dtN7t58b50a8PH7804Lnm4d4wAX6Mm5Q="; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ace04b883728d..5f3366ebc1fef 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -20,6 +20,7 @@ , millet , shfmt , typst-lsp +, typst-preview , autoPatchelfHook , zlib , stdenv @@ -343,8 +344,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.8.2"; - sha256 = "0kw9asv91s37ql61blbb8pr7wb6c2ba1klchal53chp6ib55v5kn"; + version = "1.0.1"; + sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -2297,37 +2298,26 @@ let }; }; + # Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this + # extension mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29"; - }; - }; - in - { + mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.6.1"; - } // sources.${stdenv.system}; + version = "0.9.1"; + sha256 = "sha256-GHD/i+QOnItGEYG0bl/pVl+a4Dvn7SHhICJ14VfqMjE="; + }; + + buildInputs = [ + typst-preview + ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ jq moreutils ]; - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json + ''; meta = { description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; @@ -2745,7 +2735,6 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; @@ -2758,9 +2747,13 @@ let nativeBuildInputs = [ jq moreutils ]; + buildInputs = [ + typst-lsp + ]; + postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json ''; meta = { @@ -3554,15 +3547,15 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.23"; - sha256 = "sha256-NauXoYTAka8qXNPYlW5g7r6NNX1x8cnvDRbEGkRsMoY="; + version = "0.0.24"; + sha256 = "sha256-/MLeBsnUdzcDB4nUrugEF05HKqC30G9muYKvmlnLM7U="; }; meta = { description = "VSCode language extension for Uiua"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; homepage = "https://github.com/uiua-lang/uiua-vscode"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tomasajt wackbyte ]; + maintainers = with lib.maintainers; [ tomasajt wackbyte defelo ]; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index a22cf7cd4cd49..ec47f8c1b8de0 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 = "1v2lcbmb0g3pw58mmiqd2j9c7r7dcl371nxc6w9rsmcbf7s0f8h0"; - x86_64-darwin = "11if8l556rsvacwbsknv2hnqfwkad99klgnwx4kjcbm8g63ra3ab"; - aarch64-linux = "1fmahjn99cvylm8r4cf4b1654gyyk6n6mqad1l0cncpypdxc2pdw"; - aarch64-darwin = "053jnxpkpfh5a8nfx557ib6byhi4dd1dnxasp4igy59cbx25an9q"; - armv7l-linux = "0qc48mg34pkr23p3wnlczvfspfii3qn6ikbkgj1qsagxn9ycqjak"; + x86_64-linux = "1h2s90h1a4b4r9rqafd5fj95mx21xqlp3msv8fxfjd2kkfl8bdcl"; + x86_64-darwin = "1cprq4cy01cmyqrvv5p9f09k7h5p4nj9jbk4lrlnyj1z2xvhcls1"; + aarch64-linux = "0g9j14vnan10r014309s6mdkizjfpbd83bf1kxx2kk625n87xszc"; + aarch64-darwin = "10rw2dy3khpxa292zygxi67amxd6s351ha8nxvav5m9xfxlgd2qn"; + armv7l-linux = "0bw0hfhvwv7wbh2daxgxaxm34v5z5ak4nmmk45ksxc4xsmjc5v23"; }.${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.84.2.23314"; + version = "1.84.2.23317"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 3858ddf55b0dc..98ac7c66dfe6d 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -16,6 +16,7 @@ , hidapi , imgui , libpng +, libusb1 , libzip , libXrender , pugixml @@ -32,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-47"; + version = "2.0-59"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak="; + hash = "sha256-dw77UkhyJ+XJLYWT6adUuTd+spqNr3/ZOMLaAVWgzmc="; }; patches = [ @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { hidapi imgui libpng + libusb1 libzip libXrender pugixml diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 4a6d229762b0e..d0c9d8450e2b4 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , SDL , SDL_net @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + patches = [ + (fetchpatch { + url = "https://github.com/joncampbell123/dosbox-x/commit/006d5727d36d1ec598e387f2f1a3c521e3673dcb.patch"; + includes = [ "src/gui/render_templates_sai.h" ]; + hash = "sha256-HSO29/LgZRKQ3HQBA0QF5henG8pCSoe1R2joYNPcUcE="; + }) + ]; + nativeBuildInputs = [ autoreconfHook copyDesktopItems diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index d117a93fba4aa..9fd9901461617 100644 --- a/pkgs/applications/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix @@ -1,6 +1,13 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qtdeclarative }: - -mkDerivation rec { +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qtbase +, qtdeclarative +, qtquickcontrols +, wrapQtAppsHook +}: +stdenv.mkDerivation rec { pname = "firebird-emu"; version = "1.6"; @@ -12,16 +19,23 @@ mkDerivation rec { hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE="; }; - nativeBuildInputs = [ qmake ]; + # work around https://github.com/NixOS/nixpkgs/issues/19098 + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto"; + + nativeBuildInputs = [ wrapQtAppsHook qmake ]; + + buildInputs = [ qtbase qtdeclarative qtquickcontrols ]; - buildInputs = [ qtbase qtdeclarative ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/${pname}.app $out/Applications/ + ''; meta = { homepage = "https://github.com/nspire-emus/firebird"; description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ pneumaticat ]; - # Only tested on Linux, but likely possible to build on, e.g. macOS - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index 1b95dec89face..f69a9c3206cd5 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: +{ stdenv, lib, writeText, fetchurl, upx, libGL, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }: let - libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc libGL libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation { pname = "kega-fusion"; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 2e84a8f2091c2..68814ca5ba58e 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -37,8 +37,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and # rebuild it with empty NIX_LDFLAGS. - rm loader/wine64-preloader - make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" + for preloader in wine-preloader wine64-preloader; do + rm loader/$preloader &> /dev/null \ + && ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \ + || echo "loader/$preloader not built, skipping relink." + done ''; }) // rec { inherit version src; @@ -109,7 +112,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # uses property syntax in one place. The first patch is necessary only with older # versions of Wine. The second is needed on all versions of Wine. (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch) - ./darwin-metal-compat.patch + (lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch) + (lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch) # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. ./darwin-qos.patch ] @@ -203,6 +207,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { fromSource binaryNativeCode # mono, gecko ]; + broken = stdenv.isDarwin && !supportFlags.mingwSupport; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch new file mode 100644 index 0000000000000..181b2a0d1a47a --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.18.patch @@ -0,0 +1,12 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) +- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); + + done: + [pool release]; diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/pkgs/applications/emulators/wine/darwin-metal-compat.patch index 181b2a0d1a47a..8176be8ef3830 100644 --- a/pkgs/applications/emulators/wine/darwin-metal-compat.patch +++ b/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -1,12 +1,13 @@ diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +index fbbe16efcbf..2db375ff3d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m -@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp +@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) -- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); - - done: - [pool release]; +- return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); + else + return -1; + } diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 813d032bf9648..1bd1d6a8214d8 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 = "8.17"; + version = "8.20"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-8BeFvTFix05l3rE6oK3XEeN8SERUcZvt0OjCsaNGm34="; + hash = "sha256-SNa3a9ZDBaICBX+8GdkiwfSWJfbRqYJZJ8ChhXJzmYI="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "8.0.0"; + version = "8.1.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-dbP0XcodyJhX/p6TLaeHEPZMxtSe8asMcjoXcIW0cRs="; + hash = "sha256-DtPsUzrvebLzEhVZMc97EIAAmsDFtMK8/rZ4rJSOCBA="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -116,8 +116,8 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases - version = "8.17.1"; - hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg="; + version = "8.20"; + hash = "sha256-CiWTXjUR1+GY+MO7djHfVUH71zSo3lpH9IaqS5zCeJ8="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; @@ -127,12 +127,12 @@ in rec { wayland = fetchFromGitLab { # https://gitlab.collabora.com/alf/wine/-/tree/wayland - version = "8.0"; - hash = "sha256-whRnm21UyKZ4AQufNmctzivISVobnCeidmpYz65vlyk="; + version = "8.2"; + hash = "sha256-Eb2SFBIeQQ3cVZkUQcwNT5mcYe0ShFxBdMc3BlqkwTo="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "2f80bd757739f2dd8da41abceae6b87d2c568152"; + rev = "b2547ddf9e08cafce98cf7734d5c4ec926ef3536"; inherit (unstable) gecko32 gecko64; diff --git a/pkgs/applications/file-managers/joshuto/default.nix b/pkgs/applications/file-managers/joshuto/default.nix index 937991ede40b4..f2bb672923060 100644 --- a/pkgs/applications/file-managers/joshuto/default.nix +++ b/pkgs/applications/file-managers/joshuto/default.nix @@ -1,22 +1,37 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "kamiyaa"; repo = "joshuto"; rev = "v${version}"; - hash = "sha256-b13CLfWidqfYhHC9wY84kd3elsjWGxBMGr5GXHzUhfs="; + hash = "sha256-d2r8xPGnH/299wjEijilgqy3u/xJgtRmwzJdHt0sA+o="; }; - cargoHash = "sha256-gMX8hvt20V4XUd0nnXGA4fyOUfB7ZY1eeme9HgYopL0="; + cargoHash = "sha256-amgqoL7NYfl3WzTtgvDoBX46rsL9248rbCis6MHVQhE="; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + postInstall = '' + installShellCompletion --cmd joshuto \ + --bash <($out/bin/joshuto completions bash) \ + --zsh <($out/bin/joshuto completions zsh) \ + --fish <($out/bin/joshuto completions fish) + ''; + meta = with lib; { description = "Ranger-like terminal file manager written in Rust"; homepage = "https://github.com/kamiyaa/joshuto"; diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index af4064abbec16..4e08dc0543e9f 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/jarun/nnn/blob/v${version}/CHANGELOG"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "nnn"; }; }) diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix index e67346c517159..25e93ace7c04e 100644 --- a/pkgs/applications/file-managers/noice/default.nix +++ b/pkgs/applications/file-managers/noice/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ iogamaster ]; }; } diff --git a/pkgs/applications/gis/grass/clang-integer-conversion.patch b/pkgs/applications/gis/grass/clang-integer-conversion.patch new file mode 100644 index 0000000000000..85145f45c37d0 --- /dev/null +++ b/pkgs/applications/gis/grass/clang-integer-conversion.patch @@ -0,0 +1,21 @@ +diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c +--- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500 ++++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500 +@@ -52,9 +52,16 @@ + + db_get_login2("mysql", name, &user, &password, &host, &port); + ++ const char* errstr; ++ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr); ++ if (errstr != NULL) { ++ db_d_append_error("%s", errstr); ++ return DB_FAILED; ++ } ++ + connection = mysql_init(NULL); + res = mysql_real_connect(connection, host, user, password, +- connpar.dbname, port, NULL, 0); ++ connpar.dbname, port_number, NULL, 0); + + if (res == NULL) { + db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 0f250a80b9704..cd0d6dbc93863 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -81,12 +81,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - # On Darwin the installer tries to symlink the help files into a system - # directory - patches = [ ./no_symbolic_links.patch ]; + patches = lib.optionals stdenv.isDarwin [ + # Fix conversion of const char* to unsigned int. + ./clang-integer-conversion.patch + ]; # Correct mysql_config query - patchPhase = '' + postPatch = '' substituteInPlace configure --replace "--libmysqld-libs" "--libs" ''; diff --git a/pkgs/applications/gis/grass/no_symbolic_links.patch b/pkgs/applications/gis/grass/no_symbolic_links.patch deleted file mode 100644 index ef09b97b70371..0000000000000 --- a/pkgs/applications/gis/grass/no_symbolic_links.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/include/Make/Install.make b/include/Make/Install.make -index 0aba138..8ba74bc 100644 ---- a/include/Make/Install.make -+++ b/include/Make/Install.make -@@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) - -$(INSTALL) config.status $(INST_DIR)/config.status - -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null - --ifneq ($(findstring darwin,$(ARCH)),) -- @# enable OSX Help Viewer -- @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) --endif -- - $(INST_DIR) $(UNIX_BIN): - $(MAKE_DIR_CMD) $@ - -diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh -index 04e63eb..c9d9c2c 100755 ---- a/macosx/app/build_html_user_index.sh -+++ b/macosx/app/build_html_user_index.sh -@@ -140,7 +140,6 @@ else - # echo "<tr><td valign=\"top\"><a href=\"$HTMLDIRG/$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX - # make them local to user to simplify page links - echo "<tr><td valign=\"top\"><a href=\"global_$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX -- ln -sf "$HTMLDIRG/$i" global_$i - done - done - fi -@@ -183,8 +182,3 @@ echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"> - </html>" > $i.html - done - --# add Help Viewer links in user docs folder -- --mkdir -p $HOME/Library/Documentation/Help/ --ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon --ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 96a53b5efbac6..e611a56a66247 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + # https://github.com/autotrace/autotrace/pull/105 name = "imagemagick7-support.patch"; - url = "https://github.com/autotrace/autotrace/pull/105.patch"; + url = "https://github.com/autotrace/autotrace/compare/170488e1871d50aad7a800b901e33ded7d31773a...c26a2a059926c595a00839c8d9961e9381206579.patch"; hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; }) ]; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index b525d16b390ff..f54a1c1023015 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.10"; + version = "3.9.11"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; + hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; }; nativeBuildInputs = [ @@ -30,8 +30,11 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro + numpy + pillow pychromecast send2trash + zeroconf ]; buildInputs = [ @@ -45,6 +48,9 @@ python3.pkgs.buildPythonApplication rec { libXrandr ]); + # Workaround for eoyilmaz/displaycal-py3#261 + setupPyGlobalFlags = [ "appdata" ]; + doCheck = false; # Tests try to access an X11 session and dbus in weird locations. pythonImportsCheck = [ "DisplayCAL" ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5cd574bf9b79c..79e66d8ed9880 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, libGL , libjpeg , libexif , giflib @@ -17,6 +18,7 @@ , sane-backends , libXpm , libepoxy +, pixman , poppler , mesa , lirc @@ -42,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config which ]; buildInputs = [ + libGL libexif libjpeg libpng @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { libdrm libXpm libepoxy + pixman poppler lirc mesa diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index af41424d58c3c..16447ac6d4d71 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, fetchpatch , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-1dz04RcaoP79EoE+SsatXm2wMRCbNnmAzMECYk3y3jg="; }; + patches = [ + # upstream PR: https://github.com/derf/feh/pull/723 + (fetchpatch { + name = "fix-right-click-buffer-overflow.patch"; + url = "https://github.com/derf/feh/commit/2c31f8863b80030e772a529ade519fc2fee4a991.patch"; + sha256 = "sha256-sUWS06qt1d1AyGfqKb+1BzZslYxOzur4q0ePEHcTz1g="; + }) + ]; + outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 0ee58e009c262..0aa5d6b553500 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; - version = "0.10.0"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; - sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; + hash = "sha256-T5SFcdz5yrInE6+ydJqtstEYF0MvHquRZ7nvlCOVNzE="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; @@ -69,11 +69,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "unofficial Electron-based Figma desktop app for Linux"; + description = "Unofficial Electron-based Figma desktop app for Linux"; homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ercao kashw2 ]; - knownVulnerabilities = [ "CVE-2023-5217" ]; + mainProgram = "figma-linux"; }; }) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 857365cd66d53..1ef114c9c4964 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-rwt81Z+Bp8uZlR4iuGQEDKBu/Dr9Rqg7d9SsCdofTUU="; + hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 8145d05b9a715..653dad23b638a 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://www.geeqie.org/"; - maintainers = with maintainers; [ jfrankenau pSub markus1189 ]; + maintainers = with maintainers; [ pSub markus1189 ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 5e1fbe375876b..f3587cf2ea5d4 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -56,13 +56,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; - version = "2.10.34"; + version = "2.10.36"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; - sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM="; + sha256 = "sha256-PTvDxppL2zrqm6LVOF7ZjqA5U/OFeq/R1pdgEe1827I="; }; patches = [ diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index 9cc53a9c521a8..dc077e63e302c 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "v${version}"; - sha256 = "sLJ+Fk+ePrmJeSllGd30uEQ/uFDl5CIob//1cDLKZHg="; + sha256 = "sha256-Ha9PTvr6XNGhe4I0ZUwrdbsNHWhz+Ubw2gp+ctLTO64="; }; # needed for wrapGAppsHook to function diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 91f38633e6ddf..8bddaa96abd5d 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 = "549"; + version = "552"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-y3WFQhPE8H0198Xu3Dn9YAqaX8YvFJcdt90tebTg7qw="; + hash = "sha256-MaS9WxYlbQ7V/2mrETKS0UyWb5IzCrSwDcp4UlVS3zk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 9e0206a91c9b3..676cb3452afaa 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -17,6 +17,7 @@ , gtk3 , darwin , perl +, wrapGAppsHook }: rustPlatform.buildRustPackage rec { @@ -39,6 +40,7 @@ rustPlatform.buildRustPackage rec { pkg-config nasm perl + wrapGAppsHook ]; checkFlagsArray = [ "--skip=tests::net" ]; # requires network access @@ -74,6 +76,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; license = licenses.mit; + mainProgram = "oculante"; maintainers = with maintainers; [ dit7ya figsoda ]; }; } diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 490a89b30b862..e6d0319950d59 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -100,6 +100,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 2e77a4d66e617..c678290754e9f 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,30 +18,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.10", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", "bitflags 1.3.2", @@ -76,24 +65,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -115,9 +103,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -125,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -168,9 +156,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -186,7 +174,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -217,7 +205,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.22", + "rustix 0.37.23", "slab", "socket2", "waker-fn", @@ -225,9 +213,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -257,7 +245,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 0.37.22", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -302,9 +290,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autocxx" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a19c80ba8384f11f11024462523829c2989a3fd7afb8ac70637abdd25bd3b8a" +checksum = "1ba64dd33efd8f09724143d45ab91b48aebcee52f4fb11add3464c998fab47dc" dependencies = [ "aquamarine", "autocxx-macro", @@ -314,9 +302,9 @@ dependencies = [ [[package]] name = "autocxx-bindgen" -version = "0.62.1" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f11671d76c2c02f3e6906bb06b13a9046cd069d095ff14a94d9c9a7bd40a20" +checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa" dependencies = [ "bitflags 1.3.2", "cexpr", @@ -326,32 +314,33 @@ dependencies = [ "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", "which", ] [[package]] name = "autocxx-build" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37823c07a43c1a8d09aaad7ba8785df1b3160dcf0ee1c4e7e83177e9ebc2d804" +checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd" dependencies = [ "autocxx-engine", "env_logger 0.9.3", "indexmap 1.9.3", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "autocxx-engine" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa19cbb6614361e61806db4526bd373415dfe0cb95f6bf811a2ddbd6fa4a8115" +checksum = "5918896fc1d44a647345fd5e8c74208424e394a76bdd2942398f4aff81ec7ab1" dependencies = [ "aquamarine", "autocxx-bindgen", @@ -371,7 +360,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 1.0.109", + "syn 2.0.29", "tempfile", "thiserror", "version_check", @@ -379,22 +368,22 @@ dependencies = [ [[package]] name = "autocxx-macro" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7313f823cd7e017cf80b46254d9bd78e4cb86b33b7e2cd08e1af312ee7bc77cf" +checksum = "8e594e68d030b6eb1ce7e2b40958f4f4ae7150c588c76d76b9f8178d41c47d80" dependencies = [ "autocxx-parser", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "autocxx-parser" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a16532d5349c8f165534d95ce2cf70a4aefaf1f33146fe8273f77d3a2f817796" +checksum = "2ef00b2fc378804c31c4fbd693a7fea93f8a90467dce331dae1e4ce41e542953" dependencies = [ "indexmap 1.9.3", "itertools 0.10.5", @@ -404,15 +393,15 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.29", "thiserror", ] [[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", @@ -472,9 +461,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block" @@ -492,7 +481,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -523,11 +512,11 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -537,9 +526,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc", @@ -554,11 +543,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[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 = [ "jobserver", + "libc", ] [[package]] @@ -578,9 +568,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -620,9 +610,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.10" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -631,43 +621,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.10" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", ] [[package]] -name = "clap_complete" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6b5c519bab3ea61843a7923d074b04245624bb84a64a8c150f5deb014e388b" -dependencies = [ - "clap", -] - -[[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cmake" @@ -733,12 +713,6 @@ dependencies = [ ] [[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] name = "core-foundation-sys" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -806,9 +780,9 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-channel" @@ -861,19 +835,15 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "cssparser" -version = "0.29.6" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "matches", - "phf 0.10.1", - "proc-macro2", - "quote", + "phf 0.11.2", "smallvec", - "syn 1.0.109", ] [[package]] @@ -883,14 +853,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "cxx" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88abab2f5abbe4c56e8f1fb431b784d710b709888f35755a160e62e33fe38e8" +checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" dependencies = [ "cc", "cxxbridge-flags", @@ -900,31 +870,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.97" +version = "0.7.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f6f8cddb97c1510ef1e7e849a40d60cd97377766187633ac6b9162dd862fd8" +checksum = "665584721578167d2658c879999867a3874d90494f5aa6325518540a8ee7b67c" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "cxxbridge-flags" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3816ed957c008ccd4728485511e3d9aaf7db419aa321e3d2c5a2f3411e36c8" +checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" [[package]] name = "cxxbridge-macro" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" +checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -985,6 +955,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] +name = "data-url" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" + +[[package]] name = "derive_builder" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1021,32 +997,21 @@ 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 = "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" +name = "dialoguer" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "console", + "shell-words", + "tempfile", + "zeroize", ] [[package]] @@ -1057,9 +1022,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519b83cd10f5f6e969625a409f735182bea5558cd8b64c655806ceaae36f1999" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" @@ -1082,9 +1047,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1094,9 +1059,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[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", ] @@ -1129,15 +1094,15 @@ dependencies = [ [[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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1171,9 +1136,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exr" -version = "1.6.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a7b44a196573e272e0cf0bcf130281c71e9a0c67062954b3323fd364bfdac9" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" dependencies = [ "bit_field", "flume", @@ -1201,6 +1166,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1221,9 +1192,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1265,9 +1236,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab2e12762761366dcb876ab8b6e0cfa4797ddcd890575919f008b5ba655672a" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" dependencies = [ "roxmltree", ] @@ -1365,7 +1336,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1382,7 +1353,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -1426,11 +1397,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1440,9 +1410,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1453,11 +1423,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1469,9 +1438,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1486,9 +1455,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", @@ -1496,19 +1465,19 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust", - "rstar 0.10.0", + "robust 1.1.0", + "rstar", ] [[package]] name = "geo-types" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1019f6d372c5b53143f08deee4168d05c22920fe5e0f51f0dfb0e8ffb67ec11e" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" dependencies = [ "approx", "num-traits", - "rstar 0.10.0", + "rstar", "serde", ] @@ -1523,17 +1492,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" @@ -1577,17 +1535,16 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1603,9 +1560,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1616,11 +1573,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1639,24 +1596,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1670,9 +1626,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1681,9 +1637,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1692,9 +1648,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1704,11 +1660,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1720,9 +1675,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1736,11 +1691,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1753,15 +1707,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1773,9 +1726,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1813,9 +1766,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" @@ -1853,9 +1803,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "humantime" @@ -1916,9 +1866,9 @@ dependencies = [ [[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", @@ -1962,9 +1912,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1982,9 +1932,8 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "ink-stroke-modeler-rs" version = "0.1.0" -source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=3752d28280934c21eec31b14c59cb70f9574d6e7#3752d28280934c21eec31b14c59cb70f9574d6e7" +source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=b67f11b2c174a9ae4a54c22313cf8c218ff0946a#b67f11b2c174a9ae4a54c22313cf8c218ff0946a" dependencies = [ - "anyhow", "autocxx", "autocxx-build", "cmake", @@ -2009,23 +1958,42 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] [[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "rustix 0.38.2", + "hermit-abi 0.3.2", + "rustix 0.38.9", "windows-sys 0.48.0", ] [[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] name = "is_ci" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2060,9 +2028,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2160,11 +2128,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf", "gdk4", "gio", @@ -2177,9 +2144,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -2215,24 +2182,19 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "librsvg" -version = "2.56.2" -source = "git+https://gitlab.gnome.org/GNOME/librsvg?tag=2.56.2#5c74c40bb3f4f7e6c347e7712e0293188e70c6ed" +version = "2.57.0-beta.2" +source = "git+https://gitlab.gnome.org/GNOME/librsvg?rev=58c52b742d7623b9a4e94975fb65cbf4a9ff13f1#58c52b742d7623b9a4e94975fb65cbf4a9ff13f1" dependencies = [ - "anyhow", - "byteorder", "cairo-rs", "cast", - "chrono", - "clap", - "clap_complete", "cssparser", - "data-url", + "data-url 0.3.0", "encoding_rs", "float-cmp", "gdk-pixbuf", "gio", "glib", - "itertools 0.10.5", + "itertools 0.11.0", "language-tags", "libc", "locale_config", @@ -2249,7 +2211,6 @@ dependencies = [ "selectors", "string_cache", "system-deps", - "thiserror", "tinyvec", "url", "xml5ever", @@ -2272,9 +2233,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "locale_config" @@ -2301,9 +2262,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 = "mac" @@ -2337,7 +2298,7 @@ checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", "phf 0.10.1", - "phf_codegen 0.10.0", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -2385,9 +2346,9 @@ dependencies = [ [[package]] name = "miette" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a236ff270093b0b67451bc50a509bd1bad302cb1d3c7d37d5efe931238581fa9" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "backtrace", "backtrace-ext", @@ -2406,13 +2367,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.9.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4901771e1d44ddb37964565c654a3223ba41a594d02b8da471cc4464912b5cfa" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2433,18 +2394,18 @@ dependencies = [ [[package]] name = "moveit" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d756ffe4e38013507d35bf726a93fcdae2cae043ab5ce477f13857a335030d" +checksum = "87d7335204cb6ef7bd647fa6db0be3e4d7aa25b5823a7aa030027ddf512cefba" dependencies = [ "cxx", ] [[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -2459,9 +2420,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -2474,7 +2435,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -2524,12 +2485,6 @@ dependencies = [ ] [[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2541,9 +2496,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", "serde", @@ -2568,7 +2523,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2594,9 +2549,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -2608,7 +2563,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", ] @@ -2670,9 +2625,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2707,10 +2662,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "option-ext" -version = "0.2.0" +name = "open" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] [[package]] name = "optional" @@ -2726,9 +2686,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "palette" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1641aee47803391405d0a1250e837d2336fdddd18b27f3ddb8c1d80ce8d7f43" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" dependencies = [ "approx", "fast-srgb8", @@ -2738,22 +2698,21 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "pango" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", @@ -2763,9 +2722,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2775,11 +2734,10 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bf29cb1c2e73817944f66011fb12135e1c6d268e8e4c5cfc689101c25822cf" +checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "glib", "libc", @@ -2789,9 +2747,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94dfd38d9bf8ff5f881be2107ba49fcb22090d247aa00133f8dadf96b122b97a" +checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2824,16 +2782,16 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "parry2d-f64" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f612055f319eb83e67841fdf00248eee26045a1759b5d94fa9c6ecce7c1e78d" +checksum = "82bb5868f03fac0eb9ff77ab24dd6c2e7606b44f0ff745784a49de4e67486e78" dependencies = [ "approx", "arrayvec", @@ -2853,9 +2811,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-slash" @@ -2864,6 +2822,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2877,22 +2841,11 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[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]] @@ -2901,22 +2854,12 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.2", + "phf_macros", "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" @@ -2927,22 +2870,12 @@ dependencies = [ [[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", + "rand", ] [[package]] @@ -2952,21 +2885,7 @@ 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.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 1.0.109", + "rand", ] [[package]] @@ -2979,16 +2898,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.23", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", + "syn 2.0.29", ] [[package]] @@ -3018,7 +2928,7 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "piet" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" +source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" dependencies = [ "kurbo", "unic-bidi", @@ -3027,7 +2937,7 @@ dependencies = [ [[package]] name = "piet-cairo" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=1d8a6fd627d8d6492bc42a42c734205a981077f8#1d8a6fd627d8d6492bc42a42c734205a981077f8" +source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" dependencies = [ "cairo-rs", "pango", @@ -3039,29 +2949,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3077,9 +2987,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3116,24 +3026,22 @@ dependencies = [ [[package]] name = "poppler-rs" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1ec912c55fee25056d29dbe119c5f3b83ec521760f6381f01f3bd033ad7203" +checksum = "8eeee26af64d7c1bfdb436d831fb78e65a325ade17f380e6bee7af2bc9859b8e" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gio", "glib", "libc", - "once_cell", "poppler-sys-rs", ] [[package]] name = "poppler-sys-rs" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bee91b998f39990a8600149c5b62a113e13ea5eabe1e577985756f45cf5e28" +checksum = "568f80975a5d4270c97bbfd6283f873b2204c92b67b803237c2e705fde4362a1" dependencies = [ "cairo-sys-rs", "gio-sys", @@ -3145,9 +3053,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -3173,12 +3081,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -3216,16 +3124,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.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3241,46 +3143,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" 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 0.2.1", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.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]] @@ -3290,16 +3168,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]] @@ -3308,7 +3177,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -3318,25 +3187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -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", + "rand", ] [[package]] @@ -3345,7 +3196,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -3390,15 +3241,6 @@ 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" @@ -3407,21 +3249,22 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.8.4" +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3430,9 +3273,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rgb" @@ -3445,16 +3288,18 @@ dependencies = [ [[package]] name = "rnote" -version = "0.7.1" +version = "0.8.2" dependencies = [ "anyhow", + "base64", "cairo-rs", - "directories", "fs_extra", "futures", "gettext-rs", "gtk4", + "ijson", "image", + "itertools 0.11.0", "kurbo", "libadwaita", "log", @@ -3467,17 +3312,20 @@ dependencies = [ "piet-cairo", "poppler-rs", "pretty_env_logger", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "rayon", "regex", "rnote-compose", "rnote-engine", + "rough_piet", + "roughr", "same-file", "serde", "serde_json", "svg", + "thiserror", "unicode-segmentation", "url", "winresource", @@ -3485,12 +3333,17 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.7.1" +version = "0.8.2" dependencies = [ "anyhow", + "atty", "clap", + "dialoguer", "indicatif", "log", + "nalgebra", + "open", + "parry2d-f64", "rnote-compose", "rnote-engine", "smol", @@ -3498,10 +3351,11 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.1.0" +version = "0.8.2" dependencies = [ "anyhow", "base64", + "clap", "ink-stroke-modeler-rs", "kurbo", "log", @@ -3509,12 +3363,13 @@ dependencies = [ "num-derive 0.4.0", "num-traits", "once_cell", + "palette", "parry2d-f64", "piet", "piet-cairo", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "regex", "rough_piet", "roughr", @@ -3524,16 +3379,18 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.1.0" +version = "0.8.2" dependencies = [ "anyhow", "approx", "base64", "cairo-rs", "chrono", + "clap", "flate2", "futures", "geo", + "gio", "glib", "gtk4", "ijson", @@ -3550,15 +3407,17 @@ dependencies = [ "piet", "piet-cairo", "poppler-rs", - "rand 0.8.5", + "rand", "rand_distr", - "rand_pcg 0.3.1", + "rand_pcg", "rayon", "regex", "rnote-compose", "rodio", + "rough_piet", + "roughr", "roxmltree", - "rstar 0.11.0", + "rstar", "semver", "serde", "serde_json", @@ -3577,6 +3436,12 @@ 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 = "rodio" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3610,7 +3475,7 @@ dependencies = [ "num-traits", "palette", "points_on_curve", - "rand 0.8.5", + "rand", "svg_path_ops", "svgtypes 0.8.2", ] @@ -3626,17 +3491,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" @@ -3669,9 +3523,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.22" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", @@ -3683,22 +3537,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.2" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -3718,15 +3572,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -3742,23 +3596,24 @@ dependencies = [ [[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 = "selectors" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cssparser", "derive_more", "fxhash", "log", - "phf 0.8.0", - "phf_codegen 0.8.0", + "new_debug_unreachable", + "phf 0.10.1", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -3766,38 +3621,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3815,15 +3670,20 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" +checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" dependencies = [ - "nodrop", "stable_deref_trait", ] [[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.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3831,9 +3691,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3863,9 +3723,9 @@ dependencies = [ [[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 = "simplecss" @@ -3878,15 +3738,15 @@ dependencies = [ [[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", ] @@ -3903,9 +3763,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "smawk" @@ -3948,7 +3808,7 @@ checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", - "robust", + "robust 0.2.3", "smallvec", ] @@ -4166,9 +4026,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -4190,9 +4050,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -4202,15 +4062,14 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix 0.37.22", + "fastrand 2.0.0", + "redox_syscall", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -4257,29 +4116,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4325,9 +4184,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -4346,9 +4205,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -4452,19 +4311,15 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -4531,7 +4386,7 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" dependencies = [ - "data-url", + "data-url 0.2.0", "flate2", "imagesize", "kurbo", @@ -4613,12 +4468,6 @@ 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.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" @@ -4650,7 +4499,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4684,7 +4533,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4724,9 +4573,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -4778,7 +4627,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4796,7 +4645,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4816,17 +4665,17 @@ dependencies = [ [[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 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]] @@ -4837,9 +4686,9 @@ 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 = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4849,9 +4698,9 @@ 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 = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4861,9 +4710,9 @@ 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 = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4873,9 +4722,9 @@ 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_x86_64_gnu" @@ -4885,9 +4734,9 @@ 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 = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4897,9 +4746,9 @@ 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_msvc" @@ -4909,24 +4758,24 @@ 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.7" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winresource" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd38cf1ae6704c0bd03ee663068b8303b9c4bb069f83143c21ef25b19d1bc30" +checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329" dependencies = [ "toml", "version_check", @@ -4962,6 +4811,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 78aa102c7765c..e62359730eba7 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -6,6 +6,7 @@ , cargo , cmake , desktop-file-utils +, dos2unix , glib , gstreamer , gtk4 @@ -25,21 +26,21 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-QcgmL6lLi/3QXnlcEsVyTqNUfjSm+R+nhRzRvw8M9Qc="; + hash = "sha256-cIy2+Q6HSLwbT0XXDK88Z0mdu46vWSZNTVl8MphXhw0="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ink-stroke-modeler-rs-0.1.0" = "sha256-1abfrPehOGc/ye/iFIwYPd6HJX6P8OP2vGBSJfeo+c8="; - "librsvg-2.56.2" = "sha256-uCHKDC4nc7J0k9qsmzF6etkWOoNq51Dddd9uQw5DOT0="; - "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU="; + "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M="; + "librsvg-2.57.0-beta.2" = "sha256-8k5KWhm9PIpdmf2DByTyrqX5mGAa+a7ZDGmVO2ERhTU="; + "piet-0.6.2" = "sha256-WrQok0T7uVQEp8SvNWlgqwQHfS7q0510bnP1ecr+s1Q="; }; }; @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { appstream-glib # For appstream-util cmake desktop-file-utils # For update-desktop-database + dos2unix meson ninja pkg-config @@ -79,10 +81,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - pushd build-aux - chmod +x cargo_build.py meson_post_install.py - patchShebangs cargo_build.py meson_post_install.py - popd + dos2unix build-aux/*.py # FIXME remove once updated to 0.9.0 + chmod +x build-aux/*.py + patchShebangs build-aux ''; meta = with lib; { diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index 2dfc42c97ae48..2ab5c5562670f 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -20,7 +20,7 @@ mkDerivation rec { homepage = "https://github.com/vigri/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages (vigri's fork)"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; platforms = with platforms; gnu ++ linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index d1f796e42fee1..de01630587578 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-12"; + version = "3.32-14"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-DZktq07MoXBg2AwHOoPLTbON/giSqDZOfmaMkZl1w1g="; + hash = "sha256-pnzvfXH4KC067aqqH9h1+T3K+6IzIYw8IJCMdmGrN6c="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index fec378d384376..65450d515668b 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/muennich/sxiv"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ h7x4 ]; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index 46e83d77ca9a8..791ce9ad9a63b 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config -, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +, curl, leptonica, libarchive, libpng, libtiff, icu, pango, opencl-headers, fetchpatch , Accelerate, CoreGraphics, CoreVideo }: @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook - autoconf-archive ]; buildInputs = [ + curl leptonica + libarchive libpng libtiff icu diff --git a/pkgs/applications/graphics/texturepacker/default.nix b/pkgs/applications/graphics/texturepacker/default.nix new file mode 100644 index 0000000000000..14769c02af0eb --- /dev/null +++ b/pkgs/applications/graphics/texturepacker/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, autoPatchelfHook +, wrapQtAppsHook +, qtbase +, qtdeclarative +, qtsvg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "texturepacker"; + version = "7.1.0"; + + src = fetchurl { + url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; + hash = "sha256-9HbmdMPTp6qZCEU/lIZv4HbjKUlEtPVval+y0tiYObc="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtdeclarative + qtsvg + ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp usr/lib/texturepacker/{libGrantlee_Templates.so.5,libHQX.so.1.0.0,libPVRTexLib.so} $out/lib + cp usr/lib/texturepacker/TexturePacker $out/bin + cp -r usr/share $out + ''; + + meta = { + changelog = "https://www.codeandweb.com/texturepacker/download"; + description = "Sprite sheet creator and game graphics optimizer"; + homepage = "https://www.codeandweb.com/texturepacker"; + license = lib.licenses.unfree; + mainProgram = "TexturePacker"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index c40de85767a30..4c516e3ac82c0 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; + hash = "sha256-vY3BTbCLf3JOB+eILMvaFUIgG3UBkSdckFAdC4W0OnU="; }; postPatch = '' diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index f36d91df5978a..78fc52996dc51 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff -, gpsd, perl, protobuf3_21 +, gpsd, perl, protobuf_21 }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - protobuf3_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts + protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts knewstuff gpsd ]; preConfigure = '' diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 5d5c981526d98..2a46cfd50035d 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,25 +9,25 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.18" else "8.10.20-1.BETA"; + version = if channel == "stable" then "8.10.20" else "8.10.20-1.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-3oK8Jzz4+TY4IW8oAenzHo7KQeP58iZ+on5PNliBn7I="; + hash = "sha256-KOKqI64uI454ryLy/zdD0jxgY3GekBFoh028ftt1Twg="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-OsmgHPlAt9K7ytXMM8BANGcKcD3U1OLd2MLfOS4lc6Q="; + hash = "sha256-8MDJFG5d81Alxs1hqLw7DP+Pte+haGKfiZ/erGvks5A="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-wozym2QOLLUf4F+MwdIZfwN+VHkNewB+ZJZEkVNnb/c="; + hash = "sha256-T+f19Q/pzsC6lh8OF/w/pzRLBfAdlk1gwQz8funkx8Q="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-v1FZIsvFyIx81BORgDtZBP9jTRY6/0p537trOGf8mcM="; + hash = "sha256-kmal5wfqCKAlg7c+xVHM39qrucr+Kaxr4pNBYwKfs5g="; }; }; beta = { diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 89ff023f86fe6..9030421dbee48 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.22.0"; + version = "2.23.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-MWNbwCJ5ltAV1qmy8LPYkb6VTH0UVi2S5QEZZfpcnGM=" "zip"; - i686-linux = fetch "linux_386" "sha256-lqwEm7fCiM2WNZvlAt/HeqI2zxnal/OMbTMGvvmXkvY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-GfQ441a5mIgCTtxnk6L9UXodNGXek7f/jxJXWYJUb+0=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-yF0dy4MUgvSJUremXFfxCIHcGmYrCcjofcv1sBD9qyI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-WBUHS1qoKHGJb6ktw8BD3V0H0419BO3EyTh675UnZRA=" "zip"; + i686-linux = fetch "linux_386" "sha256-pulMvdE8COwRBk3IBBXqYPk2+A1XuCN9TxtGqm1HFeM=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-w0ieg9MxjmkABc4LRZIGyfDjbOter0pKRigLZBhosz4=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-fRkvkLnhr0oZCcCGhQd53Oj8uTxsgaSUkxD7p7CPOwI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 6047c08264301..4291da80576d0 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "unpacking $src..." diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index f17a939b53cfc..71af8bc4c432f 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.35.4"; + version = "0.35.25-beta"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU="; + sha256 = "sha256-55VT4t/SNl13Gdh7LG4SqLN9uo0cYDu0LnPFIuZ7Sm0="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7a6db59bf66dc..24ea7287160b7 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic -, zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath +, 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 @@ -30,15 +30,19 @@ let url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; }; + libdecor' = libdecor.overrideAttrs (old: { + # Blender uses private APIs, need to patch to expose them + patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; + }); in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.5"; + version = "4.0.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-QAHA/pn22HLsfH6VX4Sp7r25raFxAPS1Gergjez38kM="; + hash = "sha256-/jLU0noX5RxhQ+26G16nGFylm65Lzfm9s11oCWCC43Q="; }; patches = [ @@ -53,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp - opencolorio openexr openimageio openjpeg python zlib zstd fftw jemalloc + opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb @@ -65,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: rec { openpgl ] ++ lib.optionals waylandSupport [ - wayland wayland-protocols libffi libdecor libxkbcommon dbus + wayland wayland-protocols libffi libdecor' libxkbcommon dbus ] ++ lib.optionals (!stdenv.isAarch64) [ openimagedenoise diff --git a/pkgs/applications/misc/blender/libdecor.patch b/pkgs/applications/misc/blender/libdecor.patch new file mode 100644 index 0000000000000..73c32f983cc20 --- /dev/null +++ b/pkgs/applications/misc/blender/libdecor.patch @@ -0,0 +1,34 @@ +diff --git a/src/libdecor-plugin.h b/src/libdecor-plugin.h +index ba80ce6..59199dd 100644 +--- a/src/libdecor-plugin.h ++++ b/src/libdecor-plugin.h +@@ -132,12 +132,6 @@ struct libdecor_plugin_interface { + struct wl_surface * + libdecor_frame_get_wl_surface(struct libdecor_frame *frame); + +-int +-libdecor_frame_get_content_width(struct libdecor_frame *frame); +- +-int +-libdecor_frame_get_content_height(struct libdecor_frame *frame); +- + enum libdecor_window_state + libdecor_frame_get_window_state(struct libdecor_frame *frame); + +diff --git a/src/libdecor.h b/src/libdecor.h +index af67e2f..b5eba41 100644 +--- a/src/libdecor.h ++++ b/src/libdecor.h +@@ -532,6 +532,12 @@ bool + libdecor_configuration_get_window_state(struct libdecor_configuration *configuration, + enum libdecor_window_state *window_state); + ++int ++libdecor_frame_get_content_width(struct libdecor_frame *frame); ++ ++int ++libdecor_frame_get_content_height(struct libdecor_frame *frame); ++ + #ifdef __cplusplus + } + #endif diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b8b7eb435acd9..7b4ec4bd774b6 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 = "6.29.0"; + version = "7.0.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-w9mvMKm76w5sDfW0OYxhZuhIOYKdUH3tpiGlpKNC2kM="; + hash = "sha256-VAnzacz/8LYCVMCjHXqd4B+NUFmiMqdxQqpyap+UMNc="; }; patches = [ @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { zeroconf jeepney pycryptodome + xxhash # the following are distributed with calibre, but we use upstream instead odfpy ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 04c30deef773e..33e834100044d 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; - rev = version; - hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZGw6gESKaio89mt3VPm/uqHwlUQ0/8vIydv/WsOYQ20="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/clipcat/Cargo.lock b/pkgs/applications/misc/clipcat/Cargo.lock index 2de6f6644dc8d..98a83f11c0fad 100644 --- a/pkgs/applications/misc/clipcat/Cargo.lock +++ b/pkgs/applications/misc/clipcat/Cargo.lock @@ -1,21 +1,44 @@ # 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 = "0.7.15" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.11.0" +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 = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi 0.3.9", + "libc", ] [[package]] @@ -29,9 +52,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.38" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "app_dirs" @@ -46,12 +69,6 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] name = "arrayvec" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -59,34 +76,35 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "async-stream" -version = "0.3.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] @@ -95,79 +113,91 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] [[package]] name = "autocfg" -version = "1.0.1" +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 = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "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.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "beef" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474a626a67200bd107d44179bb3d4fc61891172d11696609264589be6a0e6a43" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "byteorder", "serde", ] [[package]] name = "bindgen" -version = "0.54.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c0bb6167449588ff70803f4127f0684f9063097eca5016f37eb52b92c2cf36" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", - "cfg-if 0.1.10", "clang-sys", - "clap", - "env_logger 0.7.1", "lazy_static", "lazycell", - "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", - "shlex", - "which 3.1.1", + "shlex 1.2.0", + "syn 2.0.39", ] [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake2b_simd" -version = "0.5.11" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "boxfnonce" @@ -176,65 +206,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] -name = "byteorder" -version = "1.4.2" +name = "bumpalo" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytes" -version = "1.0.1" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "cc" -version = "1.0.66" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ "nom", ] [[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.19" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time", - "winapi 0.3.9", + "wasm-bindgen", + "windows-targets", ] [[package]] name = "clang-sys" -version = "0.29.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -243,13 +280,13 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -258,7 +295,7 @@ dependencies = [ [[package]] name = "clipcat" -version = "0.5.0" +version = "0.5.1" dependencies = [ "app_dirs", "bincode", @@ -287,132 +324,81 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] -name = "constant_time_eq" -version = "0.1.5" +name = "core-foundation-sys" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "crossbeam" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", - "crossbeam-epoch 0.8.2", + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] name = "crossbeam-channel" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", + "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.1", - "crossbeam-utils 0.8.1", + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" -dependencies = [ - "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.1", - "lazy_static", - "memoffset 0.6.1", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.2.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", + "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "lazy_static", + "cfg-if", ] [[package]] @@ -431,8 +417,18 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + +[[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]] @@ -446,7 +442,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", - "syn", + "syn 1.0.109", +] + +[[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 0.10.0", + "syn 1.0.109", ] [[package]] @@ -455,18 +465,29 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ - "darling_core", + "darling_core 0.10.2", + "quote", + "syn 1.0.109", +] + +[[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", + "syn 1.0.109", ] [[package]] name = "defer-drop" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ae055245e14ed411f56dddf2a78caae87c25d9d6a18fb61f398a596cad77b4" +checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57" dependencies = [ - "crossbeam-channel 0.4.4", + "crossbeam-channel", "once_cell", ] @@ -476,11 +497,11 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" dependencies = [ - "darling", + "darling 0.10.2", "derive_builder_core", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -489,27 +510,27 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" dependencies = [ - "darling", + "darling 0.10.2", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "dirs" -version = "2.0.2" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "cfg-if", + "dirs-sys-next", ] [[package]] -name = "dirs-sys" -version = "0.3.5" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", @@ -517,6 +538,12 @@ dependencies = [ ] [[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -524,15 +551,15 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.6.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -542,19 +569,28 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.7.1" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "libc", + "windows-sys", ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "fixedbitset" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -568,9 +604,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -583,9 +619,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -593,15 +629,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -610,42 +646,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" -dependencies = [ - "once_cell", -] +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.12" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -656,8 +688,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -672,37 +702,32 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", ] [[package]] -name = "getrandom" -version = "0.2.2" +name = "gimli" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -] +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.0" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -710,43 +735,63 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.10", "tracing", - "tracing-futures", ] [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +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 = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] name = "http" -version = "0.2.3" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -755,40 +800,38 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.0" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", + "pin-project-lite", ] [[package]] name = "httparse" -version = "1.3.5" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "1.3.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.4" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -800,8 +843,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.5", - "socket2", + "pin-project-lite", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -809,6 +852,29 @@ dependencies = [ ] [[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 = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -816,12 +882,22 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.6.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", ] [[package]] @@ -835,20 +911,29 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.21" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[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 = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -862,39 +947,78 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.85" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" -version = "0.5.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cc", + "cfg-if", "winapi 0.3.9", ] [[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 = "librocksdb-sys" -version = "6.11.4" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b56f651c204634b936be2f92dbb42c36867e00ff7fe2405591f3b9fa66f09" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "lz4-sys", + "zstd-sys", +] + +[[package]] +name = "libz-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", ] [[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] name = "log" -version = "0.4.14" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lz4-sys" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" dependencies = [ - "cfg-if 1.0.0", + "cc", + "libc", ] [[package]] @@ -903,127 +1027,125 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] name = "memchr" -version = "2.3.4" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" -version = "0.5.6" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.6.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] -name = "mio" -version = "0.7.7" +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 = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", + "adler", ] [[package]] -name = "miow" -version = "0.3.6" +name = "mio" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ - "socket2", - "winapi 0.3.9", + "libc", + "wasi", + "windows-sys", ] [[package]] name = "multimap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "nix" -version = "0.14.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", - "cfg-if 0.1.10", + "cfg-if", "libc", - "void", ] [[package]] -name = "nom" -version = "5.1.2" +name = "nix" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "memchr", - "version_check", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", ] [[package]] -name = "ntapi" -version = "0.3.6" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "winapi 0.3.9", + "memchr", + "minimal-lexical", ] [[package]] -name = "num-integer" -version = "0.1.44" +name = "num-traits" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "num-traits", ] [[package]] -name = "num-traits" -version = "0.2.14" +name = "num_cpus" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "autocfg", + "hermit-abi 0.3.3", + "libc", ] [[package]] -name = "num_cpus" -version = "1.13.0" +name = "object" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ - "hermit-abi", - "libc", + "memchr", ] [[package]] @@ -1038,9 +1160,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.5.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "peeking_take_while" @@ -1050,9 +1172,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" @@ -1061,54 +1183,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" dependencies = [ "fixedbitset", - "indexmap", -] - -[[package]] -name = "pin-project" -version = "0.4.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" -dependencies = [ - "pin-project-internal 0.4.27", + "indexmap 1.9.3", ] [[package]] name = "pin-project" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" -dependencies = [ - "pin-project-internal 1.0.5", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.27" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1117,10 +1219,26 @@ 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 = "ppv-lite86" -version = "0.2.10" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.39", +] [[package]] name = "proc-macro-error" @@ -1131,7 +1249,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1148,23 +1266,17 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1192,7 +1304,7 @@ dependencies = [ "prost", "prost-types", "tempfile", - "which 4.0.2", + "which", ] [[package]] @@ -1205,7 +1317,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1219,37 +1331,30 @@ dependencies = [ ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quote" -version = "1.0.8" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", "rand_core", - "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", @@ -1257,131 +1362,112 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.2", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core", + "getrandom", ] [[package]] name = "rayon" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg", - "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel 0.5.0", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.1", - "lazy_static", - "num_cpus", + "crossbeam-deque", + "crossbeam-utils", ] [[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.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", + "getrandom", + "libredox", + "thiserror", ] [[package]] name = "regex" -version = "1.4.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", - "thread_local", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.1.9" +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 = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ - "byteorder", - "regex-syntax", + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rocksdb" -version = "0.15.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", ] [[package]] -name = "rust-argon2" -version = "0.8.3" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.1", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1390,42 +1476,85 @@ 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 = "rustix" +version = "0.38.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[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.5" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[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 = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.123" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.62" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1434,9 +1563,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "1.6.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42fa8fb0da0bf5aa7dd5d8fe1f9ec769833eb7cf97ff89942903809e600de908" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "serde", "serde_with_macros", @@ -1444,21 +1573,36 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "1.3.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1197ff7de45494f290c1e3e1a6f80e108974681984c87a3e480991ef3d0f1950" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[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 = "sharded-slab" -version = "0.1.1" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -1480,35 +1624,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "skim" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac8dcb2f57eba70ce16c6844af6caa63dc642d404630aae5dc3b4cb48353962" +checksum = "4b9d19f904221fab15163486d2ce116cb86e60296470bb4e956d6687f04ebbb4" dependencies = [ + "atty", "beef", - "bitflags", + "bitflags 1.3.2", "chrono", "clap", "crossbeam", "defer-drop", "derive_builder", - "env_logger 0.6.2", + "env_logger", "fuzzy-matcher", "lazy_static", "log", - "nix", + "nix 0.19.1", "rayon", "regex", - "shlex", + "shlex 0.1.1", "time", "timer", "tuikit", @@ -1518,15 +1669,18 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "snafu" @@ -1546,21 +1700,88 @@ checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "socket2" -version = "0.3.19" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ - "cfg-if 1.0.0", "libc", "winapi 0.3.9", ] [[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[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", + "serde_derive", + "syn 1.0.109", +] + +[[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", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.109", +] + +[[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.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1573,10 +1794,16 @@ 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 = "structopt" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ "clap", "lazy_static", @@ -1585,57 +1812,68 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.14" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[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 = "1.0.60" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "tempfile" -version = "3.2.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "cfg-if 1.0.0", - "libc", - "rand", - "redox_syscall 0.2.4", - "remove_dir_all", - "winapi 0.3.9", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys", ] [[package]] name = "term" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" dependencies = [ - "dirs", + "dirs-next", + "rustversion", "winapi 0.3.9", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -1651,44 +1889,73 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.1.43" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" dependencies = [ + "const_fn", "libc", + "standback", + "stdweb", + "time-macros", + "version_check", "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 1.0.109", +] + +[[package]] name = "timer" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1699,39 +1966,38 @@ dependencies = [ [[package]] name = "tokio" -version = "1.2.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", "pin-project-lite", "signal-hook-registry", + "socket2 0.5.5", "tokio-macros", - "winapi 0.3.9", + "windows-sys", ] [[package]] name = "tokio-macros" -version = "1.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "tokio-stream" -version = "0.1.3" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1981ad97df782ab506a1f43bf82c967326960d278acf3bf8279809648c3ff3ea" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -1740,9 +2006,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.3" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ "bytes", "futures-core", @@ -1753,19 +2019,33 @@ dependencies = [ ] [[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.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "tonic" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba8f479158947373b6df40cf48f4779bb25c99ca3c661bd95e0ab1963ad8b0e" +checksum = "2ac42cd97ac6bd2339af5bcabf105540e21e45636ec6fa6aae5e85d44db31be0" dependencies = [ "async-stream", "async-trait", @@ -1778,12 +2058,12 @@ dependencies = [ "http-body", "hyper", "percent-encoding", - "pin-project 1.0.5", + "pin-project", "prost", "prost-derive", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.10", "tower", "tower-service", "tracing", @@ -1792,30 +2072,31 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e8546fd40d56d28089835c0a81bb396848103b00f888aea42d46eb5974df07" +checksum = "c695de27302f4697191dda1c7178131a8cb805463dda02864acb80fe1322fdcf" dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "tower" -version = "0.4.4" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd7b451959622e21de79261673d658a0944b835012c58c51878ea55957fb51a" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", - "pin-project 1.0.5", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", "rand", "slab", "tokio", - "tokio-stream", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -1823,23 +2104,22 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.23" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d40a22fd029e33300d8d89a5cc8ffce18bb7c587662f54629e94c9de5487f3" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -1848,31 +2128,32 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.12" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f080ea7e4107844ef4766459426fa2d5c1ada2e47edba05dc7fa99d9629f47" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "pin-project", "tracing", ] @@ -1888,20 +2169,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -1909,11 +2190,11 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.15" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "chrono", "lazy_static", "matchers", @@ -1931,47 +2212,59 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tuikit" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b14d0a62e5faec84af47c1e7804ff49092c6f05b890f52502928a45d9bbc6c1" +checksum = "667c8e002675e76d98358d8869021793a472d28e3a50fbd750284a1d211abd09" dependencies = [ - "bitflags", + "bitflags 1.3.2", "lazy_static", "log", - "nix", + "nix 0.24.3", "term", "unicode-width", ] [[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] -name = "unicode-xid" +name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "utf8parse" -version = "0.1.1" +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 = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" @@ -1981,64 +2274,110 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "void" -version = "1.0.2" +name = "vte" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +checksum = "6e7745610024d50ab1ebfa41f8f8ee361c567f7ab51032f93cc1cc4cbf0c547a" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] [[package]] -name = "vte" -version = "0.3.3" +name = "vte_generate_state_changes" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "utf8parse", + "proc-macro2", + "quote", ] [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +name = "wasm-bindgen" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] [[package]] -name = "which" -version = "3.1.1" +name = "wasm-bindgen-backend" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ - "libc", + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", ] [[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] name = "which" -version = "4.0.2" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ - "libc", - "thiserror", + "either", + "home", + "once_cell", + "rustix", ] [[package]] @@ -2071,9 +2410,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 0.3.9", ] @@ -2085,6 +2424,81 @@ 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", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "x11-clipboard" version = "0.6.0" source = "git+https://github.com/xrelkd/x11-clipboard?tag=v0.6.0#de648ede312e6b236e3b92119a014cac064b9e38" @@ -2104,6 +2518,16 @@ dependencies = [ [[package]] name = "xdg" -version = "2.2.0" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "zstd-sys" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index c25d1e52e165f..7ab1e60c63bec 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg -, pkg-config, llvmPackages, clang, protobuf, python3 }: +{ lib +, fetchFromGitHub +, installShellFiles +, rustPlatform +, rustfmt +, xorg +, pkg-config +, protobuf +, python3 +}: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; + sha256 = "sha256-dV17xP6xG6Nyi6m0CdH8Mk4Y0giDtsv/QiM23jF58q0="; }; cargoLock = { @@ -35,6 +43,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; + buildInputs = [ xorg.libxcb ]; buildFeatures = [ "all" ]; @@ -51,5 +60,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; + mainProgram = "clipcatd"; }; } diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index f87f971012d9c..8e9852334e209 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-RIzOkJx1eSik+3N6rSh+3LY2VZmbzNYyV5wpLQHFU2A="; + hash = "sha256-OQ45GV+bViIejGC03lAuvw/y8v1itA+6pFC4H/qL744="; }; vendorHash = null; diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index a380a06741e7c..50172b9d1cb45 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -5,7 +5,6 @@ , openssl , gtk3 , stdenv -, rust }: rustPlatform.buildRustPackage rec { @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { # default installPhase don't install assets installPhase = '' runHook preInstall - make install PREFIX="$out" TARGET="target/${rust.toRustTarget stdenv.hostPlatform}/release/effitask" + make install PREFIX="$out" TARGET="target/${stdenv.hostPlatform.rust.rustcTarget}/release/effitask" runHook postInstall ''; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ed7fb78708222..db625793adc7f 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Misterio77/flavours"; changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k misterio77 ]; + maintainers = with maintainers; [ moni misterio77 ]; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 72acbe02bbaef..d4b89db84ef55 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.10"; + version = "13.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; + hash = "sha256-EJpyWuOyUVb34F5Pg8KPF9R3f3VpvZVeg8WBZ1oGbbE="; }; buildInputs = [ diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/applications/misc/keepass-diff/default.nix index 3f88c00b4f5ae..5e03c0f2cac43 100644 --- a/pkgs/applications/misc/keepass-diff/default.nix +++ b/pkgs/applications/misc/keepass-diff/default.nix @@ -1,17 +1,15 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "keepass-diff"; - version = "1.1.3"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "Narigo"; - repo = pname; - rev = version; - sha256 = "sha256-jd/cUkTHylLwzxolQUzMlXHauCfXUhcUr/1zKpdngbo="; + src = fetchCrate { + inherit pname version; + hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4="; }; - cargoSha256 = "sha256-2e2lGG72HmX7AFk0+J3U62Kch5ylrqvaIpitRF546JA="; + cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU="; meta = with lib; { description = "A CLI-tool to diff Keepass (.kdbx) files"; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index cbcb88b9d1a86..2690db2d9fbfc 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -18,17 +18,10 @@ let maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; }; - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = '' - mkdir deps/ - cp -p $src deps/$pluginFilename - ''; - sourceRoot = "deps"; - + dontUnpack = true; installPhase = '' mkdir -p $out/lib/dotnet/keepass/ - cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + cp $src $out/lib/dotnet/keepass/ ''; }; in diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 271d571a5314d..a8de9a4ddec85 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ (with python3.pkgs; [ setuptools-scm sphinx - sphinxcontrib_newsfeed + sphinxcontrib-newsfeed ]); propagatedBuildInputs = with python3.pkgs;[ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ make -C doc man installManPage doc/build/man/khal.1 diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 33423f474af35..842499f845a68 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/snakedye/kile"; license = licenses.mit; platforms = platforms.linux; # It's meant for river, a wayland compositor - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; mainProgram = "kile"; }; } diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index ba004e343844b..d7db123ef4e3e 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,28 +1,19 @@ { stdenv, lib, substituteAll, makeWrapper, fetchFromGitHub, fetchpatch, ocaml, pkg-config, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz, -libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }: +libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps, darwin }: assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "criticic"; repo = pname; rev = "v${version}"; - hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE="; + hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU="; }; - patches = [ - (fetchpatch { - name = "system-makedeps.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps.patch?h=llpp&id=0d2913056aaf3dbf7431e57b7b08b55568ba076c"; - hash = "sha256-t9PLXsM8+exCeYqJBe0LSDK0D2rpktmozS8qNcEAcHo="; - }) - ./fix-mupdf.patch - ]; - postPatch = '' sed -i "2d;s/ver=.*/ver=${version}/" build.bash ''; @@ -30,7 +21,9 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; - buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ]; + buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ] + ++ lib.optionals stdenv.isLinux [ libGLU libGL ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { install -d $out/bin install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify - + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" @@ -60,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/llpp/fix-mupdf.patch b/pkgs/applications/misc/llpp/fix-mupdf.patch deleted file mode 100644 index 1a3c2516fc113..0000000000000 --- a/pkgs/applications/misc/llpp/fix-mupdf.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/link.c -+++ b/link.c -@@ -1522,8 +1522,9 @@ static void *mainloop (void UNUSED_ATTR *unused) - if (pdf && nameddest && *nameddest) { - fz_point xy; - struct pagedim *pdim; -- int pageno = pdf_lookup_anchor (state.ctx, pdf, nameddest, -+ fz_location location = fz_resolve_link (state.ctx, state.doc, nameddest, - &xy.x, &xy.y); -+ int pageno = location.page; - pdim = pdimofpageno (pageno); - xy = fz_transform_point (xy, pdim->ctm); - printd ("a %d %d %d", pageno, (int) xy.x, (int) xy.y); diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index 4bdb2b03291fe..acbf4c053c4a1 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -23,6 +23,7 @@ , glib , graphene , gtk4 +, libGL , libadwaita , libdrm , mesa @@ -92,6 +93,7 @@ stdenv.mkDerivation rec { glib graphene gtk4 + libGL libadwaita libdrm mesa @@ -102,6 +104,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace src/main.rs \ + --replace "libGL.so.1" "${libGL}/lib/libGL.so.1" + SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop diff --git a/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch b/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch new file mode 100644 index 0000000000000..c658b237dddb7 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0003-Fix-cpp-build.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/wrap/cpp.py b/scripts/wrap/cpp.py +index 51ac5f1..b5c0b5a 100644 +--- a/scripts/wrap/cpp.py ++++ b/scripts/wrap/cpp.py +@@ -4595,7 +4595,7 @@ def cpp_source( + */ + typedef unsigned long size_t; + ''')) +- if state.state_.macos: ++ if state.state_.linux or state.state_.macos: + f.write( textwrap.dedent(''' + /* + Workaround on MacOS: we need to define fixed-size int types diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 606649d5bb12d..db08bd5c14ce7 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,13 +1,13 @@ { stdenv , lib , fetchurl -, fetchpatch , fetchFromGitHub , copyDesktopItems , makeDesktopItem , desktopToDarwinBundle , buildPackages , pkg-config +, fixDarwinDylibNames , freetype , harfbuzz , openjpeg @@ -26,19 +26,26 @@ , enableGL ? true , freeglut , libGLU +, enableOcr ? false +, leptonica +, tesseract +, enableCxx ? false +, python3 +, enablePython ? false +, which +, swig , xcbuild , gitUpdater # for passthru.tests , cups-filters -, python3 , zathura +, mupdf }: -let - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); +assert enablePython -> enableCxx; + +let freeglut-mupdf = freeglut.overrideAttrs (old: rec { pname = "freeglut-mupdf"; @@ -53,47 +60,58 @@ let in stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.5"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; + sha256 = "sha256-blZ5zfqu+cfoniljlSIM4sEz7T3K1RpHhmczbG6uxwY="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch ./0002-Add-Darwin-deps.patch + ./0003-Fix-cpp-build.patch ]; postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" - ''; - # Use shared libraries to decrease size - buildFlags = [ "shared" ]; + patchShebangs scripts/mupdfwrap.py + + # slip in makeFlags when building bindings + sed -i -e 's/^\( *make_args *=\)/\1 """ $(echo ''${makeFlagsArray[@]@Q})"""/' scripts/wrap/__main__.py + + # fix libclang unnamed struct format + for wrapper in ./scripts/wrap/{cpp,state}.py; do + substituteInPlace "$wrapper" --replace 'struct (unnamed' '(unnamed struct' + done + ''; makeFlags = [ "prefix=$(out)" + "shared=yes" "USE_SYSTEM_LIBS=yes" "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" ] ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] - ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; + ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ] + ++ lib.optionals (enableOcr) [ "USE_TESSERACT=yes" ]; nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] + ++ lib.optionals (enablePython) [ which swig ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] - ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then - with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] - else - [ freeglut-mupdf libGLU ] - ) + if stdenv.isDarwin then + with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] + else + [ freeglut-mupdf libGLU ] + ) + ++ lib.optionals enableOcr [ leptonica tesseract ] ; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -102,6 +120,12 @@ stdenv.mkDerivation rec { rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; + postBuild = lib.optionalString (enableCxx || enablePython) '' + for dir in build/*; do + ./scripts/mupdfwrap.py -d "$dir" -b ${lib.optionalString (enableCxx) "01"}${lib.optionalString (enablePython) "23"} + done + ''; + desktopItems = [ (makeDesktopItem { name = pname; @@ -136,7 +160,7 @@ stdenv.mkDerivation rec { Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdf-third + Libs: -L$out/lib -lmupdf Cflags: -I$dev/include EOF @@ -148,7 +172,16 @@ stdenv.mkDerivation rec { ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf" '' else lib.optionalString (enableX11) '' ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" - ''); + '') + (lib.optionalString (enableCxx) '' + cp platform/c++/include/mupdf/*.h $out/include/mupdf + cp build/*/libmupdfcpp.so $out/lib + '') + (lib.optionalString (enablePython) ('' + mkdir -p $out/${python3.sitePackages}/mupdf + cp build/*/_mupdf.so $out/${python3.sitePackages} + cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py + '' + lib.optionalString (stdenv.isDarwin) '' + install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so + '')); enableParallelBuilding = true; @@ -156,6 +189,7 @@ stdenv.mkDerivation rec { tests = { inherit cups-filters zathura; inherit (python3.pkgs) pikepdf pymupdf; + mupdf-all = mupdf.override { enableCurl = true; enableGL = true; enableOcr = true; enableCxx = true; enablePython = true; }; }; updateScript = gitUpdater { @@ -169,7 +203,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index e5bd2f46aba53..b70e34e73d3b0 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -9,6 +9,7 @@ , rsync , wrapQtAppsHook , qtbase +, qtpositioning , qtsvg , libGLU , libGL @@ -28,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.08.18-8"; + version = "2023.11.17-17"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY="; + hash = "sha256-3oGcupO49+ZXyW+ii4T+wov4qweDnLO+VkXSAIh7qJ4="; fetchSubmodules = true; }; @@ -65,6 +66,7 @@ in stdenv.mkDerivation rec { # Most dependencies are vendored buildInputs = [ qtbase + qtpositioning qtsvg libGLU libGL diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index f631312b6faa7..a52729d52c772 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -24,11 +24,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_86e"; + version = "150_90c"; src = fetchurl { - url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; + url = "https://web.archive.org/web/20231028212419/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-rFSdl7BgnuJAj6w5in0/yszO8b5qcr9b+wjF1WkAU70="; }; unpackPhase = '' @@ -104,7 +104,7 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - homepage = "https://parsecgaming.com/"; + homepage = "https://parsec.app/"; changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/applications/misc/safecloset/default.nix index bf3e8866f7a15..ce774e5a668f1 100644 --- a/pkgs/applications/misc/safecloset/default.nix +++ b/pkgs/applications/misc/safecloset/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "safecloset"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Canop"; repo = "safecloset"; rev = "v${version}"; - hash = "sha256-ZvJbPbKS7HZ9R4Z9bMrXVjKtIdKE5dkp115dmHv7uJY="; + hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws="; }; - cargoHash = "sha256-vyn/rcptkJLjXg8qjAnzc2bDjz2r0LsGa8toyybgdbM="; + cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index 329bf2aada875..3a59a2542eaf2 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -58,7 +58,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" + --replace "-lmupdf-threads" "-lgumbo -lharfbuzz -lfreetype -ljbig2dec -ljpeg -lopenjp2" \ + --replace "-lmupdf-third" "" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ --replace "/etc/sioyek" "$out/etc" diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index 9c6c8f93f3f72..6d0b4ec0e1d76 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-5WIITzm9yZWB847WHL+okwpULdwHegtZfvsVrAzwTO0="; + hash = "sha256-Z+paJAuzUnCdCSx2UHg1HV14vDo3jWsyUrcbEnvqTm0="; }; - vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc="; + vendorHash = "sha256-H2kSTsYiD9HResHes+7YxUyNcjtM0SLpDPUC0Y518VM="; ldflags = [ "-s -w" @@ -21,6 +21,9 @@ buildGoModule rec { # used at runtime, but not installed by default postInstall = '' cp -r ${src}/jsHelper $out/bin/jsHelper + cp -r ${src}/CustomApps $out/bin/CustomApps + cp -r ${src}/Extensions $out/bin/Extensions + cp -r ${src}/Themes $out/bin/Themes ''; doInstallCheck = true; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 17692a22b7b94..2fe734fde00e7 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}"; + ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; doCheck = true; diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 8d1e1910cbc94..3e8f101f871e5 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Sweets/tiramisu"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wishfort36 fortuneteller2k ]; + maintainers = with maintainers; [ wishfort36 moni ]; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 0faa36302fc9b..e74cb435e212b 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ="; + sha256 = "sha256-0L/5i+m0rh1VjsZ0N2cshi+Nw951ASjMf5y6JxV53ko="; }; nativeCheckInputs = with python3Packages; [ pytest ]; @@ -30,4 +30,3 @@ python3Packages.buildPythonApplication rec { }; } - diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix index 83821b29e6699..384b5362a4ad3 100644 --- a/pkgs/applications/misc/tvbrowser/default.nix +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "tvbrowser"; - maintainers = with maintainers; [ jfrankenau yarny ]; + maintainers = with maintainers; [ yarny ]; longDescription = '' TV-Browser shows TV program data arranged like in printed TV programs after downloading it from the internet. diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index 888913dd1e2de..f18e572c67054 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.6.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-m6vt4wpLpKJJNP8qCCeLMgNfAAZengDGjBVmFI5ZeSQ="; + hash = "sha256-cm6z7MVAbFxfkSTaCfh8wZhtgXdfVQopqEk+w+hPZpI="; }; - vendorHash = "sha256-q22t4/eum/RSWyzVQfJ0VZkEHgBu12nyRgmkJffi7PM="; + vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 96f033744e6b2..232a4456e60ee 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.4"; + version = "5.15.6"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-5pEpYnJFHQKEfTve07ngFVDAOM9+kwrx6hc30gEwsko="; + sha256 = "sha256-WOWDekh9rcXeiN/ejiYC4BELhJwd98GkmyDOLN26ayU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 2c36b3411cdda..e1cf49f61aec5 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.8.0.31"; + version = "5.8.0.33"; src = requireFile { name = "${pname}_${version}_amd64.deb"; url = "https://www.upwork.com/ab/downloads/os/linux/"; - sha256 = "sha256-tQV6v0U6xxqBl7nQaBhXSrc9iv+7SPHfABTiJJQDnPI="; + sha256 = "sha256-MU0usTAfNNMN8OYmS6dWU6Xk2o5dg5J0V7OQiv3dLug="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index ce70c5e9e5995..e69b6330fef8a 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -38,6 +38,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/firecat53/urlscan"; changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dpaetzel jfrankenau ]; + maintainers = with maintainers; [ dpaetzel ]; }; } diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 09b3eabf1845c..e0ca06af8aa3e 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index d70918f2e7ce3..b54df7e951689 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # Fix dbus interface headers. See # https://github.com/davidbrazdil/volnoti/pull/10 (fetchpatch { - url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch"; sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; }) ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 1e4ec0f7653f5..f6eb5cfd45e1a 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura"; + postPatch = '' + sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build + ''; + passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 17492b5a1c78d..d51f3816ef754 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.59.124"; + version = "1.60.118"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-uY9i0TxTsSvOfMA98amxwWpQh1nsRVEgxeSZ2sv8NEU="; + sha256 = "sha256-Lo9F7z8gJJRId7LBfVTj18C65swDr8C7Mt1gNmXoSoY="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ff0c83527aabf..9fd1dd05a7f30 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -47,6 +47,7 @@ , glibc # gconv + locale # postFixup: , vulkan-loader +, libglvnd # Package customization: , cupsSupport ? true, cups ? null @@ -479,7 +480,7 @@ let # libpci (from pciutils) is needed by dlopen in angle/src/gpu_info_util/SystemInfo_libpci.cpp chromiumBinary="$libExecPath/$packageName" origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" + patchelf --set-rpath "${lib.makeLibraryPath [ libGL libglvnd vulkan-loader pciutils ]}:$origRpath" "$chromiumBinary" ''; passthru = { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 4714704c0e79c..d11dce5a1051f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2023-09-12"; }; }; - hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; - hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; - version = "119.0.6045.123"; + hash = "sha256-8xPm3vNF0HjfL7ewTz7iz7GMfiJi6mhMK1YSC7VeoSM="; + hash_deb_amd64 = "sha256-xAm7bPsnnJD7UWNTtHKMv5enHo3rM9w0M81QPqZVlP4="; + version = "119.0.6045.159"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2023-09-12"; }; ungoogled-patches = { - hash = "sha256-4EbfM62KuG8nHrYWwp183V5G9ac7FICjpyJahnKbQjE="; - rev = "119.0.6045.123-1"; + hash = "sha256-kgUrYXy2avfwfRckSYI6YPMW1uuvl2Osg4Vr9Q1ksMc="; + rev = "119.0.6045.159-1"; }; }; - hash = "sha256-UR8EowMYZ668qQ/6C9C/M+0HSguyUGKVhY46FTG+ShA="; - hash_deb_amd64 = "sha256-PIBWkCwU/7N242wR/WmpJDDJKLDGk/sJxPxa05bOQSE="; - version = "119.0.6045.123"; + hash = "sha256-8xPm3vNF0HjfL7ewTz7iz7GMfiJi6mhMK1YSC7VeoSM="; + hash_deb_amd64 = "sha256-xAm7bPsnnJD7UWNTtHKMv5enHo3rM9w0M81QPqZVlP4="; + version = "119.0.6045.159"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 8130f9f775849..164851bc2756f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { pciutils ]; appendRunpaths = [ - "${pipewire.lib}/lib" + "${pipewire}/lib" ]; installPhase = diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8408732d23d6c..ef638e30a1655 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 = "119.0.1"; + version = "120.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ach/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ach/firefox-120.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "cf90a2af34183711ef83f591436a2428bb48bcd5a3d0d0cb4efb0d37434f3baf"; + sha256 = "7261b9784146704182f2d9b180c868d61aa7cbebb7ca917cd42fa6980d1585a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/af/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/af/firefox-120.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "35b7475c9bb0cd12638851d73192c0381139b47bd65668c6451d228f767c5d81"; + sha256 = "420b971bacf5453f2c38d31e8f7d65c951401e3fccbb92173b2c82bfb22699a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/an/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/an/firefox-120.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c6cf760fdacc1902efe5ca3c06c22da43436cc0371b4f699be1de354fb7ebeec"; + sha256 = "37b49f961dd97d96bf4fd3920acd6d85f9afbd2c76a621753ebab8e3e03797bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ar/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ar/firefox-120.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0e0813d7d21455f62eef15130849e4fdaa52da9e1f487e3b200f3664f29e9076"; + sha256 = "9bb02a6112a0a10316996d0b008f45ce4c27210705b54495c6ca63436742dc4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ast/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ast/firefox-120.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "edb9adab523ced71fe3b85d6d2527a2fb587682601a7aec1a1ca9ab712dd2a29"; + sha256 = "dceb8bf7b0224e4bcba9b027d453fd60f83c6a24ce2e8e694a63bbae564d0007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/az/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/az/firefox-120.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "af34649c9fcf0a397cc5715a4e7fa2cd21f165d8b7c1452542bb1e8ecbe7843b"; + sha256 = "8889b60439e52610ba0de48489163d6a8068ade2d4dfb992c8e010493abf76a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/be/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/be/firefox-120.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8e88629368f81b58651ddd213048b25f62c8b4ddb4d5a9eb92ec5e2b7b4d83e9"; + sha256 = "0bfa1ece62b38df07cd8eee7690ab1fc897a964afaf1d235dd3f5c7cdf478a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bg/firefox-120.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "926605f038c8d4d44210007471a2d617c41da37585f71e4726b64305b90b77b2"; + sha256 = "e4c3abdcaea8f27f0e161e4efd0400d98d7b6752e485bd3f0614c058a42a2c1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bn/firefox-120.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "50780e68b79f19e32a2b53b7d6d6c75948ffd2177e8abd7b97f14472dfed16f8"; + sha256 = "c23ea3a77292bb6394a44f9caaa11dbfa6b42082d0357b33b4b4322c73c8f505"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/br/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/br/firefox-120.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f39aa05fee3009f13af80a3c2cfbeaf3eceb3b02628cc6a312c23cb60baab689"; + sha256 = "02768d93d88e5af6513a19882c21d6d038814e371de50083dea0501d3834c8ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/bs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/bs/firefox-120.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "bb58d680f4d6e63e2bb12f18da287f47a6ae5791b2bbbb924ab5bc8750ea382f"; + sha256 = "50f12f026b663e245abd4c94de3a2c9c7e4e12e8a4f7f1b2c841907d9b62b92a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca-valencia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca-valencia/firefox-120.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c677065bd25fd39047b9fe1f10b9f654e29e8af131e1420e04d063b2e7a236c0"; + sha256 = "2df72d66cabf029691fa6a42fc72e29543201bc21fb67879d043b27e7beaff65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ca/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ca/firefox-120.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5436dade80ee8d46ec5cb3ad32b156a0153ad01a08d4e7a71f21f685e9db7df5"; + sha256 = "dce9f552cea74c4a71416af8d279fae86327c44c645431b54fb281bd465181de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cak/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cak/firefox-120.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b7fd3c229d0335ef2f5c5fa6f30847fea9596961863d3600fc5b333fecce2eb8"; + sha256 = "69193eb592264a0bdb10e851a4a09b81388a40c5754693aec6eb1ceef572b3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cs/firefox-120.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "08e74645081c93cebc5ee40f6ddd074d1dd09e8ab822c2be496b20c1133db262"; + sha256 = "56ca1034d81ec2c7a6915f9b42da639f13b7c386b536df3c616c9bde4792756e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/cy/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/cy/firefox-120.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "28b6bd6f71805310b18cd8c4363da666051711433db849909787b4228ac09895"; + sha256 = "3ca612e2eaf1c53cdda54006b3161203198ddd2d9957675535ff157bf7704590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/da/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/da/firefox-120.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "252918ac59d208c2f457171085974d4a8525a2fbaea406af0079823a6bddf784"; + sha256 = "bc7b4d42e874233c557e2cd533b6008cfcb58c17aa2d74a03840fff9a5cb3069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/de/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/de/firefox-120.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc784325d72c64e1f7b9b6014538c0f6c728deb5398e5d43eae17dca5899c800"; + sha256 = "b1c14c7f90bec2ab5a9d7dbbc90c66914a3dfe4b7404d23d6d2e133a375d9ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/dsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/dsb/firefox-120.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "64b769c4f0e1b5c77a57302b5502a65138ca5f24438c34913abb27f08d56e3bc"; + sha256 = "7867c83ff736a2ce677777691343f901500b2471b01ff53062b7c5b73a886c0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/el/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/el/firefox-120.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f0db76422f958cc3f7b4cf29165b41cb50a3aa04ca74265397f71cbee925cd9b"; + sha256 = "437adb01c9193b965c4612f71625c3b486f9b82716c31cc3a4e215c10178084b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-CA/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-CA/firefox-120.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d9e86adbfe21f7f503f12a5e084a082e6d6b461cbefbe94881c4b752629992c4"; + sha256 = "058dd94236a1b9fb6e7692b9875416ecf7fadf98fbe1c29004f7ffa06955782e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-GB/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-GB/firefox-120.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ba27957e33e3f4a8a57735e058b84c004da9a6357731f58ef4daf2237f8d4268"; + sha256 = "88eba42df3c4c240e35792cfc571ec2b3a2b53cdf015c1b12797c80b76c17fdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/en-US/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/en-US/firefox-120.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7d7e65a8e8f11a821545cdb9a3348c68d4fd60d2b6f5454fb17dc4d42fabde56"; + sha256 = "340a7ea9a7b230ef3a8e81c8053d5a2f944760ca9b32987a4a2ce52e8f62294b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eo/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eo/firefox-120.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "892a91efe311e99286e44799b7f50445a27a29f0ea9040e556d29aed5a343421"; + sha256 = "bc1621f82df6a090bd485b5bb2a1d97210686740729a5076e45bdb6b41e330cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-AR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-AR/firefox-120.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "65a1324bccfad9edc6adda59362753f5272fda40d8b909606bd120fbf36c1ca8"; + sha256 = "d87be470cdd767428209e138396a929851da35f2733bca93709184392751c0af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-CL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-CL/firefox-120.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "6571688a29d48d284309bf6c7f6648ad5bc973b6399a15d1f6f1d06304bf116f"; + sha256 = "a389f0c702eb1182086070bf6b0e28be107f0cdbec5a24f9a3e15e4cd46f0bd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-ES/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-ES/firefox-120.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2e2e09a0e93857a4405ea4f30db542f445f8f3faea324131d147a95ba1e8f58d"; + sha256 = "dc680f687574379ddc8e08235a24742c641fb3f0c8a2dab16a3a998ece9e2994"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/es-MX/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/es-MX/firefox-120.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "eabebd5780be18881bfb054e6bb7f9c98a823a3de443e8fd044ee59c7e60d55f"; + sha256 = "6960e3ce9ad995181a4471e8030d3b0333b7d1573a2bb323609ffecd1febce72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/et/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/et/firefox-120.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7c5bfab9fd30c5b671a1901071f7de0d555c7637f87105b5af949fdcc4eae0c6"; + sha256 = "a6b39af56d45adaec536e6604fe03ef09efea984c87039b968102b2e07c45d53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/eu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/eu/firefox-120.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "617f6f49e8d8eee2549a33716e9911209a1cc049327cd4f6bf00825b15ef21c8"; + sha256 = "4ed6e0a02af8ef08f2c24c7dfdaec91f9b7081ec405a99af35c4c527914b95b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fa/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fa/firefox-120.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "17cea2b9830e500f9ed8503e153fe03c4f4ac924fa3e9f6e757c37ced72ee0db"; + sha256 = "6961f23a46e30f2d1c210a039f88c7e0435a712fdae0b0dc232c9efde9ddcd6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ff/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ff/firefox-120.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "704e1b267c71f76c16ae62a39c52a8f3cabd51ab7ab9b5a5734afd3c978a59bc"; + sha256 = "c43ee72ede3ee0ab6b07566422e2a774135ef8d183294965a05406ee8ab2ad95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fi/firefox-120.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ce61c29255cdfce6cd4da9c7ce7e3432629b7fb08f35314ff12282d0e4f8af45"; + sha256 = "3e95a9abf7b409e81d63849789f65a28331f639afed9e4c681d0321084bff04f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fr/firefox-120.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0c5f6b764a9a6334d9759ff0a58a0129cd9d4054ccdafc829f2bc902a19d4630"; + sha256 = "c286d422edd48d15481e6a188590a39e9424d996558eaf3f039da7e78403085e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fur/firefox-120.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "f9df9b54a4bb771ac4faae64de3ede13fda4026424ad0823db8f437f3520a966"; + sha256 = "8de3ffb4861c4729d7b90d91c906d09f9ababa5e6ae9f714585b35cfb44547e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/fy-NL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/fy-NL/firefox-120.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f71d895584edb495d80773e9f8687a1d56ff548cfb332ebd2e226bd500d62b7a"; + sha256 = "6e2745f3ce0df7bb880a31e9bb9b0824abbfeae0171e07fbfa5e30b10912d370"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ga-IE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ga-IE/firefox-120.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b7b6b99174277532bd2486dfd86ab94c036c5a1937336467376dfd7e885336a7"; + sha256 = "95a5a80bc9ebfd4395e10c34ff3d5d6f2a30106c2e6941b7b07addf14edb9e7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gd/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gd/firefox-120.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "43f6432c2b1e21b5178d83ab7cfb5381ead41029b24e3135ebe6daefab5aaf65"; + sha256 = "db8dfb7783b12a3e9729cc9352da8c8299d8cd0b009778805749b090f86c12bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gl/firefox-120.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "69bcee258ce0d6b39e7654484950b6e45f4306f2067d36fd5c67acf248468c1b"; + sha256 = "f8101f9b9512dac67c468ca865e1bbbb5769395b1120684ee993556d43144027"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gn/firefox-120.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "24a154468da6beff23afe0496d5c0b7c526f849eda9a0ca30e535de459d4ee3b"; + sha256 = "a84726437ce8d980565943b6998c1635a7b7bf766feab9317b1a369d2b878592"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/gu-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/gu-IN/firefox-120.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "442ba0d079f8076e5de265b91dd27cd747ec27f88aaaf68b5dc730b98b5a93b4"; + sha256 = "5b8b2e6e444a2a5ce15f92447345f18421739449db835fcc06f9e0e26e02b14f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/he/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/he/firefox-120.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c9de9ba5a4570e3de878d88404ee821ddddfd817fa62522b16e3b501ee0221ab"; + sha256 = "894727d171dea3784a671f473c0a4b67496ac7f54f0130360401c1fc6637ee78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hi-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hi-IN/firefox-120.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b9a5a03540c19518629e180abc5680328e605e6c3c5c1128df12bdcba1a0567c"; + sha256 = "1d9e40b7eff8a2b1a377ebe2a03d310bbaed58d8b5d32b780a3c44f29676dfc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hr/firefox-120.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "20bd65fb8a50d007f5f8ea1ec1c90ee118d598b931c30078f89ddae86f4dbf83"; + sha256 = "4714572bbeba00141d3a9b683a69a9cf5b44c51e9b7f262cba8765ed4ecb9998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hsb/firefox-120.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "11d2da7ef251c5c065e5410d912664e641c9ce9b99f140dfa33ab549e52590b6"; + sha256 = "eadd9c74297985a8a33f30d9597fe5f808cf224f7e66f7045f12ed1ded3261fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hu/firefox-120.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5afb7d769b1377884f155d952243dde4bfda4231e21e37c21c6fed9aada72f82"; + sha256 = "a1a0609ca55bc551fdd045faf65aedb130a0fbbfbe82b4c86f0b02044d1f2e2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/hy-AM/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/hy-AM/firefox-120.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "446e429b5f51ef686b8437583cebbe05bea9899bcf15b18bf2a409a5488fd2cf"; + sha256 = "10fbe2959447353e302c5a1e2e676f88fda07a213b0f48c9f64a710a9b6b1e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ia/firefox-120.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "dc24337bb7919c9d1e6943688a6c23fd35cfdd259ce3380a11865e42f80d9c85"; + sha256 = "64129e1ebc5797f0f88e90880452bfa8cb823cc28a5fa833073324b769bc74f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/id/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/id/firefox-120.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1055e7944bf3718cb39a9bb974492348f5d4133fbb36caa25dc70a422a1ae65e"; + sha256 = "468af01d74eaf91ec9ca862886db3eb5d5260bb4a02db324d28f87c314080d47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/is/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/is/firefox-120.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "92d02b4eba5ba6932157a89cc54345842db05ded27303d1a6a3f41fecbdc3d99"; + sha256 = "467f19393aa187d57f526b066f24404368b8a3aa3d46843edc1e0d8f9034f753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/it/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/it/firefox-120.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "42e8fd5a2b9ebd70a7a4c06e540235705e83f0ddb04ad6e4a896bea3cba28e62"; + sha256 = "e4dc3d17bd70c2cd08d5ee0bd1f933de50f1e702a9bdc2da90f4f94f430db2e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ja/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ja/firefox-120.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d3428500cc6c12ed769f4dbe8b0ef3a3f8dbded9c03e7a0ba602b4694a4a1ac6"; + sha256 = "abbaf1073e3ec9f29774aa6df2abb972cf18029851b066ab735cf7ba999946e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ka/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ka/firefox-120.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e233bce15359f237b59ef3a86df23800cf6ef0566a1503c343b4d392b4100adb"; + sha256 = "b0da46ff1e053d42f7ca16963ea8d44b4cd8d3a89f8201c2b4ed3918a84a0490"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kab/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kab/firefox-120.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "18bdd5a8c63b5670545076848d25be9002742eaa18139f35df35b5d802065e33"; + sha256 = "8fc834b0e09827a727b6aabd557bc12b4c7e95f6a17e231a341b6ac5b031a049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kk/firefox-120.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "852365e6037bda685eaceebd965d90eb76f6b8519a06ca9a6fdbae9a945b5f70"; + sha256 = "613268846c3cf6574d50e55d5c474634fd7573ea3cd68fc16b1fd6c5ff08e23d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/km/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/km/firefox-120.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31e9a5977bd9280d8ebc392f1133a2cfb0837a4ab18df8188bc4c1202de3af58"; + sha256 = "9365ae8f344a3532ac1ac4eff63811791e32af12d498563c995c0e160f96c8b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/kn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/kn/firefox-120.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "25fed3cac9a152d696b7016f1ab1b954a763e6476797bb7e8e1c69683e5683d2"; + sha256 = "c5e074479079042fdb955e11f4c4a193cd4e894bb5afb1cb2c92f5308198f006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ko/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ko/firefox-120.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3e26b5dfb9625b5a422caf9da7f4bad28ada9853b169ba2505c7111a55d20c30"; + sha256 = "4319d5bd2d5a41c87e212ca2ea7666292e2f2f08f22768699bd86904bfe65bc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lij/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lij/firefox-120.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "669b90a4d97e6baa310c096c82a14536ebc95287c3df21de97ae67c7808c270b"; + sha256 = "b26f2a7079cf633da7808f0a6c40d556ee3a52c72d77433cf289ae9fac2e8c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lt/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lt/firefox-120.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "20aef23a5e3e8573c22c600eb63f920908737dcff33a049a67790832eb8f02af"; + sha256 = "86a35c164d7998b6be554ef2b7807adb5b108491e558a414b09b37ee2c619245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/lv/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/lv/firefox-120.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "42c48753d41d85066a2d1152af29d59e86945eaf8928726670fcc77f880baf25"; + sha256 = "199831283f7e6a3573993a03f9ea40ee05b238dd1d6201915c36a9d0669e0f16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mk/firefox-120.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "563c1c0e5c23b3249095cb068d70333b3ebb6598f5099f32418b040c680475ed"; + sha256 = "cd8bf243dd94eed0a5904c80a6f331c7af0fa13731822d1ca44471450dade265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/mr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/mr/firefox-120.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "69702f953054e70572b2e7c4474641ccc4df119d962a1d2341cd898d943c88b1"; + sha256 = "6b8b7f5df3182d63a5174ea79002bd698075341ba9335a770b49c506f8f14e23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ms/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ms/firefox-120.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c61b592b5aa9a8863fe7fc7950d72701698efb3e74addf19fffebe6750866fc3"; + sha256 = "205f17e0bfc655d3842444a44b27163b2a9e92f430132946d51de7cad5f46520"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/my/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/my/firefox-120.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "18428c4c73468594cd9c2c22ce654c028d3c1f9894f37d263f79ffc222f092c5"; + sha256 = "9142c797c3d0318b71f23310c716ce703e9dfbf4682f2f9bc4f0994b0054b7af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nb-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nb-NO/firefox-120.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f2989993ea8ed110ff2cff4eed467a03156ede2db4e87864f7750006bc4cd2b2"; + sha256 = "e8f0458d543dc0df5be81a53ee7b66ede0b988899d914a9fd0b9f51debb1ab3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ne-NP/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ne-NP/firefox-120.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e78b3a70f1c71d8cfcd3f72f5c07cb6ca3f2b31b9c25c616db518aa9d1d9262e"; + sha256 = "2718dfa28173373563d120684ae9ffe85634cbf0cad332018f7acf08a958d0b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nl/firefox-120.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "87027a0b36cdd388c0e16048074655fdb55a96f03561abb1760adb015a10df80"; + sha256 = "191012d84fc1349b46c8c9a60739aa16e10925595334ba5ebe71b8183af27aab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/nn-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/nn-NO/firefox-120.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "20768f6e2fa0abf0d0e438c7899ded5811824ae5bd1474f978526a8424e423c3"; + sha256 = "ec5d00408f471bf873a574f6611cee60e6ce09119f5ead39e28b9f8e782ab95d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/oc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/oc/firefox-120.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "63ac23dbe4886a07e0443e1772e5b3578ea1d4f5043064e02d179e2255c68fdd"; + sha256 = "06710541a83e0ad27aab4d976eb6b2e44512276b4a0e0f32dca1a418b82a7b52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pa-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pa-IN/firefox-120.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "22d3209d47e2bb368f082b59c9bf674ac0ca3bf7f458361a0d2ed62a05d0b39d"; + sha256 = "86f23f3a40fb434197d0349dfcc30c1aa7acbcedaf8562b1f9cb107f11da675f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pl/firefox-120.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "660839198b7cf81d943e0af33ae5e2d257c68b2c4f9d5f4847029c303bcd1a35"; + sha256 = "bedb7b5dffde7903a2f392a0b591091e3b6df02bbd65ae6509c100602f686b42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-BR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-BR/firefox-120.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f9dfcc38f180ba7f0a68e276ae32ce4f30da1dea5e41fa1c651994e39a2323ca"; + sha256 = "032ce640b47c9fe6ea34f8b4446db9b8c7d5983902027fa4c31337db90c5c170"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/pt-PT/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/pt-PT/firefox-120.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "41fea86dfc01560fa02f112ab1458fb2513e214f5d311ce3f73d3dacb23f0f98"; + sha256 = "a7cacc08ce0ae3d9c62271294d4e8b5ebd4e9128d5898cf6c2d891f1912e3763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/rm/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/rm/firefox-120.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "4e59cfe5e937c5d4c791f2a3085353699274300641878c0eb6ef9e1c008abe7c"; + sha256 = "9a9d34ad86d7b9a06bec9346feccfbdd7eae7b9fed6700c753cd40870f63ff19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ro/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ro/firefox-120.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "54b01409fcb03542b45eb5913494765685c732c25e070d107e8df4ba9084e87b"; + sha256 = "134b4c16ca280a565a5a21bd278856e0353b4ce505513c3df5d26984c23a4009"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ru/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ru/firefox-120.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8df2fba5aef8f65bee4fcc0db8a8f809c65d5da7e631e378841a5f7f6a1365fa"; + sha256 = "648e085e3937565065ce8da32dafdf6119957c8994b47dcc153adff668e87ac4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sat/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sat/firefox-120.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "0c7e22d71463681b6033f8e783edf05199c1bef26e80143d03b85c5a013eb09a"; + sha256 = "eecd8a88202986c44a17b8f2035ad2bb1c335b4d852a330d6b5de4043206a19e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sc/firefox-120.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "d59f5f0012920790bd575de2fa03175f350179e728e3f2b39429db5918cc4c87"; + sha256 = "937231d9548496bdbd097a4e249b3b433b76dba5c30edb040b61d6c9e1fc1135"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sco/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sco/firefox-120.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "fa3313e39e27e83d7c7052b561ee8b16e5647405c712d6f9fc180f5b79354687"; + sha256 = "dc0e840fb5e660e83851649d0b86fd9aadac51525b5c96a0bc05e36a1f833824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/si/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/si/firefox-120.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f0f6b7610bee29b293dd284dc2c8bfc2a8e823569603464772413cdd0215ef0b"; + sha256 = "52344c7e38ad40306b4e064205a06e6a36d92ae3826422744a2bf66aa369df5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sk/firefox-120.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "34a45a30785950c7dafc86a704f12e0ad452fdd8b685d98501eb472c87a35c18"; + sha256 = "62ba51e311f5dc9bd53223c2ceae72751a645982d145aa4c4583322a5ab96ea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sl/firefox-120.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4f554a7428d4ee3adf7c781c416ee56725fb17a976fff2530823b9352a6341b4"; + sha256 = "0eccf03cee663928dc92bef83cadb2728596fe00d32ad5d8056e48ab19e0535c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/son/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/son/firefox-120.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "031c62d2d5451ac522b2d7760bb9f8f74cdf7afd9336b1f1c3a43dfeac1260da"; + sha256 = "07f5bc3b8788b13e67095b47ba544de4dee364cb39e0c435e51de0234cd78af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sq/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sq/firefox-120.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "00c0ba4f17fb761b3646eb4e9c224cc43af4e763ec660fa9cc4fb273e9802dca"; + sha256 = "2ea37bb1012aed2c32f94b43fc6b0e6c21e6c01d37e6821508abb5b9537ab53d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sr/firefox-120.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0f413e14ab17a324e35e582a108c68fdf7c19f5dedbb94dcb30ea724c1dbc7a9"; + sha256 = "f90e1272fc47144d586c41cfe45091d3263a76c74b45763a4acd428efb4a0f2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/sv-SE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/sv-SE/firefox-120.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "39bab6f47250385f85c1555f916689c40cfccdd64ae0f433a6cc74eb6a0b7b3e"; + sha256 = "f4b7158fd318fa72a0b1a13e75bf6781580df051ef636b7a6128d78cb4cdacb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/szl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/szl/firefox-120.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ae2e7059c8612023a4a1f0d8b5ef816243e7472a98487bc415e50a5d974e9d71"; + sha256 = "dbd9f407fc4d5e6c33efca730f1524c682424c46dd4d82f039c72526b8117f1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ta/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ta/firefox-120.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a3e60bd086c3899f45b6b8c39081dc3dc2933862d2d789162a876e65e5c69e2a"; + sha256 = "e843b0ceff3c7b706dea4029bfc32ed1e05354d90277c7bf595c7ba024c3501d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/te/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/te/firefox-120.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "37ec9536f4546d723d7aee5e61dac25ba0717669b7cc883a52e4fe6ced99335e"; + sha256 = "03de55ee242a343a5ce3b3346dfceb97a13120c8aa7ae44b01001cc7eda2b3ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tg/firefox-120.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "0703039b5362d9023c4c4ca70c5af46086fdd427353dbb8458aa3c646ed8043e"; + sha256 = "d9dc9158a5c064cdee76ae605e1096c516a5079e875cbfe215c765ec9018e926"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/th/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/th/firefox-120.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "08cada5788a4436d03dd9fc1f19303886d76825e000f7242717e0fed9800198b"; + sha256 = "9b7f996dfdfeaeea549e5dfceb8c6b7ee4261cc3879b40d9149c5faba5b73e5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tl/firefox-120.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "09b9d91554cdab127a9be2d08d65e801c04be9645053fbd7155ef0c08701124a"; + sha256 = "3f7cf5e67f1f591c57b61624272bb23d3f89e62fca555bbfdd71e6d5fb3ab1f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/tr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/tr/firefox-120.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "64e057a8874bf3f4ee83cb2c82e8f355880b7e05999055ac9e3370371988b5b8"; + sha256 = "6fd28a1992d2de1ce631281b1721185a878f1a3ac16cb149e98c1690ad60b06a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/trs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/trs/firefox-120.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2fc9c15c5147e7971bf1bd9e521e20a34a449c6063e426a4b102dc067a690ee3"; + sha256 = "de8efb4e8d9edb8f19824b6456fcbeb1688001f41e3e9c4c9ead6825ac4aaa72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uk/firefox-120.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "02b726c51b634ed7181b772b77bf0b5543dc77727563e911ea10d381f2ef1efa"; + sha256 = "543a7a0f919e8497a69e97605333a9cf51c5c88f95140f4ace579366055906d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/ur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/ur/firefox-120.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "52749b68b455d4a1054c00b75185c18bf05807716b752164559a995b4740e00f"; + sha256 = "a913fb999041219345483c6c32f4d3b68b8cc97d46e33ba20814195d0945555c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/uz/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/uz/firefox-120.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3f789d1fef8d5729af3c3f53a7701e543fb3da9eb8dee6c48c9bb815e894a7de"; + sha256 = "c7908e88c71332a71e70caa390f08efd3444cdc1f8f0e55ac997524ded8e7f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/vi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/vi/firefox-120.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4b9a103512983340a3c3d51da4b0044826cf8e22eae1479d06a64e0b3827df3b"; + sha256 = "4abaaf12f0ece14115da876e79e0dfebdee9ad8f9f4c540b391502cc71d8e092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/xh/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/xh/firefox-120.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "13073d443f3491ff828c913689f0b32e1ecabe707ee2f76f6a0fc66f28b3cf64"; + sha256 = "16409657ed62fa92f0f0b3ae2981fdc9a9ad45659592622c9ffe81a01e5b818a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-CN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-CN/firefox-120.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "40a6787e1ed8d39b12e494d33496b718e19eb354c7d9b0bbdffdc438978305c0"; + sha256 = "a14938714c864310ad4c0d7f2d7aaeb8a7d658ae674d7dd277570280cdba5364"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-x86_64/zh-TW/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-x86_64/zh-TW/firefox-120.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "800d19524b1c62c02da3a5116b2f5207ba0e238a30735bc10bebdc3b0e55fd97"; + sha256 = "35db6f291f8efcf493fd1fe3313a500fc11891f29dec2f24c53a8fa5b59bf4b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ach/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ach/firefox-120.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "995e3b86a9f1365014bbc3c9e34c3bbf7c8836e36ed16a0cb6e872416de98b9c"; + sha256 = "6d6b3c203ecd57b8325b44df60f1c73b96e209f2fe97b41fa345057554b79f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/af/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/af/firefox-120.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e519b620bd95162697511d1e1e6f8c1fb623dc661feb4b9d94db6cb17c318d28"; + sha256 = "3d64f3a8ba54e46c0db30bd2a581ad0047fbddbed038cfedeca7829039957e26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/an/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/an/firefox-120.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2b44a7eadc3828627d572d5354d062cdd1a5d8ba545f2e69529d6d4375c4d367"; + sha256 = "7e82cea049c85b4604c1ee549499d78f9bbafb27160f1a406d2422d071353098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ar/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ar/firefox-120.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e1bbfdeef1957926e0a2d849a483f5d1d75d9d29dc3373845ed19433104525ff"; + sha256 = "c00d163008419f17f429e77577d94017cba391e29a15cb8c8539b1d191c4e069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ast/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ast/firefox-120.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "43a0f6f95ed2dcb0add16ba4b765a164614a81a217b8eaf1f998aa0d89ae7417"; + sha256 = "fc2e1f5d2f80beff9171c5ecd3fe63c23bbadae8b18627617720d2f018177d72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/az/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/az/firefox-120.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d8dddd74ffdef6fbfe9924e6fca9c8b436130e7cb17a184d682fa93d4fdced41"; + sha256 = "997f1a81ec8d1306dc14764c098ae13f1f041862247f672d891d17cd1369dfcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/be/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/be/firefox-120.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f2a07b563a6d0085ab68b58bea9203a3573f6f0b4e673e7f0af34f0bd709f607"; + sha256 = "7e6f9ee14b6c5d08c22a7ff5bf9ecd6622992fd5f1d644da9c0b2accd4b415a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bg/firefox-120.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6257b89abf9a07176b48f6b8089bbd1a9adf67c2c15f778a11d95e137d3eb987"; + sha256 = "d8dc55be45f40430d126f7d365859aeb1f6c1be8d615eaa368e93f740c6a8e70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bn/firefox-120.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c110e7b0d3b1e8f21a3c6e8ff3c25341c66def3c28aae3010a73f52f02dcfd8c"; + sha256 = "a8b955eb49bdc369e69007b53bfd6ccdce62856b695979a957ed97ffed1412b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/br/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/br/firefox-120.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "fcf3dd819894dc19c6dc6ddf836c6a0a73b1110487489f3247f816a7d8e9780d"; + sha256 = "11ad446f9d3893bba9ff2aca01ae9a5779e56b3f0c48fd3c7cc588f8d4649a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/bs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/bs/firefox-120.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "c8903eab5082b5fa8eb5fcf24dfbd0d8f244e1cbf3e79d4c826622a2c6e2e385"; + sha256 = "4e49e589fa66e2f19dbdaf71be3763660be024d0824041852f239c484eaae843"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca-valencia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca-valencia/firefox-120.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "02ca7f29bee2e06af0dfd4757beabbf82e45b77e8d3fc7cc544f93d5776843ae"; + sha256 = "ecfd1243d5b8b1b7be8e9c1d50894e5ce6341eb15cbb1fee4e68b92514e2cfd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ca/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ca/firefox-120.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "47d743c84c6e3e507957ded5092c6c7d67b7f52d9eec4dfde65dc2640ec3af1a"; + sha256 = "ce2277c0592a4ae3b60630dac7084048b3c9f79a03ff9c1d6c60f5346f57b163"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cak/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cak/firefox-120.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "368237495ce87e0e5a249421a0643d05d02bd44d1138b4c4c614eeb34ec44d7e"; + sha256 = "459c72e9a0ae2b4c278bbada6b4545083101d0cf324cdda6c68a50006818b3e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cs/firefox-120.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d4170a9b18003c32a17144c5819e7481d610b3133363008c21c905d11f9fc752"; + sha256 = "340bb19b1593684055f2660b2acc5e34f773673e8035b897d41363c69772371b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/cy/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/cy/firefox-120.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "75d2be292dbd8fffe3b6b92002035f7e42bd2dec6956e449973be88bb0debfc9"; + sha256 = "f403fd18b0a94b303eb9aa68492173bc5b69e3fbde4173314cc4eaad7c1060b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/da/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/da/firefox-120.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "22d42d3ac8be47c35f97bbb3cdd41836b7e0a0409617e192955c5f5cd96266ff"; + sha256 = "c0f4dc9cd1b6935a4fb66502bdd13f8c8186a84211f49e5e61d9bb827b9f4f07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/de/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/de/firefox-120.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6cc88df9de046096bec39504e5ecd2d3051ef4331e369867c5e6567acbf65cc3"; + sha256 = "0ae96c328e4d632124dbdb1b31978874bde3e88c7030cf1ab6af54f73a94368d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/dsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/dsb/firefox-120.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a81f9efae2e4a769be060e286b8bee0d00569c0a53cb839928d46c96fe65bfe5"; + sha256 = "65845b1dd223a05fd23be7b81cbc18e02020b8e30c955f09d40eb6320f9d2615"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/el/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/el/firefox-120.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "bd4ebea36042e849301bdd843e482d50930d8810fb5d32947fe4511de48008b8"; + sha256 = "f0a6ebe0307fdc5cffd63953d5b5ba23f792eee74e7a79e65be155a62d149caf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-CA/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-CA/firefox-120.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "2e6a07daf47d70295bf39aee8bad62ea334ecffb29f219b87ccb73521f3ee3f6"; + sha256 = "c3de315a373ed9a9f15729036394ee0a394785a787d3ee9946077b0a93085809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-GB/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-GB/firefox-120.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0585fdbf94e401c00e291bdd22b3c137ee0effbc287ff44f2d5a6b6bb9df6fc7"; + sha256 = "cba09755f156e3e117d00dcd77f4bc3c080b7deee31fcac72410bc76bc4b0efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/en-US/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/en-US/firefox-120.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c3faa5a469d1397090d3159e5a336a065c9722f94bbb107887805b0d62b02e4f"; + sha256 = "924f0032446b4c2fa6cbe7fc98ad8bc6d89808c4fc35f948fbb1dfead2ef7b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eo/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eo/firefox-120.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0bf1cda5b3bcc8bf0c0964e5826db28a13705a969a0e6dc14a6498d62e167422"; + sha256 = "3932293c3c010f0ee71998941936822ff5985d3d8c19f8ece40a695314d54193"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-AR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-AR/firefox-120.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a8db855598b21922a3f8f0e0aa70e96b27c9f4164906975195094b024404053c"; + sha256 = "b1de43001cc06d90bcdcf9229664000d315bdb3af66a5fc667891c5b1e09adac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-CL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-CL/firefox-120.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8aaba2eab96010c531fc3c13e0e11b3ba31aea1ea275d22d2d55ed91d204d8ea"; + sha256 = "b13b50b85bd569a3cca6abaa3488a96422f44c631314982ec68343efd585f427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-ES/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-ES/firefox-120.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fabce87a93462cf25e25435aac5b704d2921d9fdefc44f9d9ae1a5fc13e6d895"; + sha256 = "22347e7e26642a67c9354d90863c0659803ad0d3ee04cd6177ac59d770ef2e79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/es-MX/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/es-MX/firefox-120.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8ad782b622ed063fb0cbc6f509fb2edd34537a0096c93ef3f861259b5166ad41"; + sha256 = "14b17c0bde5b7f110b1c270e6dce7e603247c20feb60f034b4c38cb58eb28fca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/et/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/et/firefox-120.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "48d3c7ac37d505e1734190267cb107bbf72d8286a238532da1b86cc97494e533"; + sha256 = "ee94bb80d52b854375676fc37d2224bd1760b04c41952fcea76c3ae9c1c2eff0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/eu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/eu/firefox-120.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f9ebe4ff904ffcc0545d375ef1595d99d4253fb171780a569b4610958b264946"; + sha256 = "e6cf36e85d4562e733bf3a7bb09230156892fb11f112b838286da5f2f142a9c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fa/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fa/firefox-120.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a65eb2459e5b2ac07c485ae142ee67a56737c309efc055d064c5b1314d01277e"; + sha256 = "7a9fa8d7c9e340c0e7e668fce6085480eb0b02e67472a20f2732e0369ed15141"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ff/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ff/firefox-120.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "01560cdc2d01b1b8423a68698a4273870103c2c4e6d34990813db6bbb2d417d7"; + sha256 = "35ea0636918e7d263b4f1bba48f78a3328fe1d16dd5536a8a4fb24fde7f92ccf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fi/firefox-120.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6a9ee52625a8add941f2018c53abe1596ff8eee2d532b53092ff640af478d081"; + sha256 = "cb9e897b4466601c1bdaf6f99eb778f7970e16de87d67a3dcd30d26ec78be11e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fr/firefox-120.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f8ff14ecb998b4945041796e189fb87cf309079b922cf397c05eeec2dd2c9a46"; + sha256 = "e753c4f9b9403e1c2028dddfb41c4c11265e0533058f5e30731f7e4eb165c962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fur/firefox-120.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "349a4b860435c0d65a84a12e074d11209b3f0ab8856c005e5131f09cbfed1900"; + sha256 = "02a0ffd7a52e49914826eebf599c0ebbfc2600b515c54e0c76fa724ff2eddedd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/fy-NL/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/fy-NL/firefox-120.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8779f243e0918de79039734a6372a25b01b9a5c9ef2e01c757309237d588a694"; + sha256 = "450fd214944fbce6895694384549f0d0c748af365f2e469a0d212b895e4d8dc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ga-IE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ga-IE/firefox-120.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "21b483531d4a91e920fa5ff6a9f267ce835c9c5941c1af913021f5cbcbdfa84b"; + sha256 = "6b7f8d6204409cfea9ac8eefb9e0653195e9f7d8e59cbc3632b52818733363ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gd/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gd/firefox-120.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "fbf5fb03e13a8b9eddca4f521299ca620570b48ef11bd34ef6e37643f3280cc1"; + sha256 = "f7023ea44357a24878cab6cf644c4f5a64035e731b511d7029dec48cbb13b0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gl/firefox-120.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0fbe3e59568261b7f96805a257df8320690d3a9952fa421228ade5042b42f36e"; + sha256 = "2ea045e690e216289990f3b3bc2bb0fc7080ca885184ff637ae9732768ad842a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gn/firefox-120.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1b35a1efe2321821f26fdd97c414145dfbefa7b5fda8ca94f8d9c7911ced9bd8"; + sha256 = "5ad75c39f17e4c341d51f50ff128d80efbf1bc4f9b3eff58e3063e5d8378e783"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/gu-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/gu-IN/firefox-120.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5aa7c4f18a983756d45b6f8273bf6f73449e28426616aa32f5092e9b67ba0d79"; + sha256 = "293dc4e2a01dd93e5d84632257481adf278ef3f2c2860410ed4ffc0e8b19f513"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/he/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/he/firefox-120.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f777ee429354b7e2facf45057cd4552493fcbcea52a4afd298555ac87306f692"; + sha256 = "846d946394df370fefb5cfa08644789254290795e26c1ca5d851efe8ec61c314"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hi-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hi-IN/firefox-120.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "74ed18e2f5f8b8d443df42810f849dce6339343566c32bc2cc6a82446680217c"; + sha256 = "f86b0a54cde49cec714775b21ca733c3c550b9b18f64d37562a4cb64cedeabc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hr/firefox-120.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3e5a37911a3013b46e1f801e4f4c21c304594e4aba318a87ef29a9be5a4da687"; + sha256 = "b971171c618d7a7793fb7afffb4f6fd0b6f764c0ed839a214911186376460eec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hsb/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hsb/firefox-120.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "12c8a1d884b6bd2d056a1c44debede068e6e09dac0e871894b89150e321f94c5"; + sha256 = "2afd51995e4a49e5731ed5bbbbee08aec5f23e11d72ab973eaebfb42704c34d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hu/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hu/firefox-120.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "47529ca31f8c81eb6b19ba99552aed60c712af2337ae0af473e212bdbfaef29a"; + sha256 = "255487be8c811cd539ff74fe3ed42722f2f55531b581888a98e41785bf9d6481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/hy-AM/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/hy-AM/firefox-120.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6cf788b21ca4608605b1ce539fdcc0c7b8610f4dbf98109b8ef0c3b9d80d8fb6"; + sha256 = "38cc75876757aee876f4b7a459793f349f5c8aadeda626cb7a64bd596d50f9c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ia/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ia/firefox-120.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "6fda520cb8df890a9404c6a71fe0ab813e7b563d2d084bd4cd77817d89e56271"; + sha256 = "7c99f7cc607bff519fc251f792f46c8c171f04febcf5b72a4a2c36df6c212e0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/id/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/id/firefox-120.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "38f2a22dc6d96e52130141982c7862136d001e8bbbe9f337391019c34690b126"; + sha256 = "fd0120401c964cbe4505c6f56433da264c885319545f3ba12a18c79393c5eb0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/is/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/is/firefox-120.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1405bdfbd59b3c4c8800f4191f1bde2f47096a37adf8f66d6d3fc881c93ca161"; + sha256 = "51c7c492ba3b38692e087c069d06f611e7e4286986c81dd759f6dd6ef98d2033"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/it/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/it/firefox-120.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d8edde64459325e81b51eb197de89018d107e427963381dec0a5ad54803ef258"; + sha256 = "eb5a21f3b6100fed5324bb39b2e4a2f4733744c19c17d050f805f9626b7a8535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ja/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ja/firefox-120.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9c2bc20554ec009fad6bc7e0904f732fffb2f6efc2de1314ea7660547ed2b085"; + sha256 = "44c9d827f5389a4953838ce988d0ac2ac94e28c7b856bcdbb061727741626679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ka/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ka/firefox-120.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "86a9e9100b0a482b4829bce83160a4a4adb06b7b91fd91a55004f7418e8949db"; + sha256 = "8684241c4b9bebb733c6ff0f0753ab39946a077e53eb266b00c52469f63a6e69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kab/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kab/firefox-120.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "30a17adf1a960c5470d44a2cce09dcf804831d9cfba332c75d1b77655af95b70"; + sha256 = "00e607abd9c18db021cf6579ebfde99e69c2074e6c3c37fd8e1babb11cd8da72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kk/firefox-120.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3bde81c8d3e371eeca249b48a994fd2fc9f478ac6309f0ee5283a8425b30db05"; + sha256 = "a95590b17f81572d61d9f4953c912cf6d01d2bc269ab69ca76c2718361679810"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/km/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/km/firefox-120.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e05a943bb6b2c09982540cae733e81f1a9d363958a68040ebd657da5ac04845a"; + sha256 = "8cb890b9f00dcc3b5941a637bfd7e9870bc8315880559e305c28a890b180ab09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/kn/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/kn/firefox-120.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "17e9357334834134002f710f61db6c609240b35ff9f5116bffbb01488997aab9"; + sha256 = "2c2f1b23b96d92af24167bb1b15208c83830d6bc8e1445834cea18909885ce85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ko/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ko/firefox-120.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2065b72bf7e8dad9852d8f5471bbb37241cdf6d43594cca3eb41c4c4d58aeee6"; + sha256 = "f0c91c806c72764d8c3a0a8d4a53c2f2d8887159c67915c705a67c55d5051d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lij/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lij/firefox-120.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "4dc2aef6ad9477c9708db994956485fb006264efb300f489fd4fb4ee25f8847d"; + sha256 = "9ade5925615bbbbf67a5a7c4c9981237b3326379aa796e4f624775482bbd0b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lt/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lt/firefox-120.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be49d7c71c76dfd36f8589388ce977c915780dca80b239b0731df86afdf0b669"; + sha256 = "6d3e072044a71a8c468728d01a6124cadc31b3b751b21a56d09781dfabc7d464"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/lv/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/lv/firefox-120.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7939ebb3c3965d4db86be9516833d36968448ab188734ef7991f47c7dc307ed9"; + sha256 = "088066e9f092405346b21c5b29bf250a667c9118a69d4715dd31eacbe8289c1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mk/firefox-120.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "e37c008b774c8e4774bba59a25a29d8df2e63132db6e0762a00da60f7d374f57"; + sha256 = "073dbc445a4bd79c750d8088524aaabc428ea3f87cf4237d6c26459d558b9a2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/mr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/mr/firefox-120.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "fe38e4ee96783f3df61d92b0405e447286ba9a85ca84e048621e3c24cfa04166"; + sha256 = "84f9a9f15c9d4baea7ac5e7978a9515ae695aca736af063840ac17c840e8419a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ms/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ms/firefox-120.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a0429e6ca5bfbcc297212defbca30218fe8e91a33feedef01ee99a339d7bd63b"; + sha256 = "657baafe8d91ef103977a7aeafe62e072b2c385025689195fc4f11d2318375ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/my/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/my/firefox-120.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "fb138fd185638cac7be3de34f402b2810e2a133b322a9d254ef8ee9d9294d208"; + sha256 = "a1e74c3e264e00cf9fc65527766be4e59bfb9c647d3148e538395f3f44f13cea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nb-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nb-NO/firefox-120.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fc3e5f37199302836c7fbbb4747fc3a016486d3aaf632f0e79272a4c96a59143"; + sha256 = "676ca8c99a8d8c81579a914773b4b4370a09e713056bcf67107743f040bbecad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ne-NP/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ne-NP/firefox-120.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "978478460a0498d9a10dc118545823bccd3a52d7dce88f36badbb0df08550696"; + sha256 = "e3cfbb9b969e0483525bca8f5d92e9cfb4cf7468e92e97a89d6ccbab14659475"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nl/firefox-120.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "67930465d612df84ab140ac66d185077f8ee314290daaca9c6fcdcba5f21c817"; + sha256 = "b8cba7e4eea5b521f01d3eeea05ffc73b8cd5fb5000a8d82882c85998ca28a0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/nn-NO/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/nn-NO/firefox-120.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "81e478f2307b10cb71854614f089518213d061d1e122e6ae6cf3beb6b5c84c50"; + sha256 = "d25dddf1966ba1e109647d52aa6ffd4ae34bed4fc8d95ed1e1f2ceb8ca115faa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/oc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/oc/firefox-120.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6cfec951a0b99743ab2dc521d27bffb50ce2bebff2de6196c30f33eab5187c1a"; + sha256 = "413813ac356cbac6defed52fc2eaa6549bf6a374d3c5bdf7c23705ebf67db594"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pa-IN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pa-IN/firefox-120.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6c7b6f3c5a0f871395d13285ca5a4bb0c0415726cf9909fd86151c014f770c2d"; + sha256 = "af1e7bc5fa2c0ee798d1897c9de9102ec80f825df942152d8f3ecaf96b30e915"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pl/firefox-120.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "44b28cdb9f11948ea6f00801f988a21a2df943b17b88292703de5641abe6b471"; + sha256 = "a6a88455cc8044c204e7797bfbce7c6287a8b95aff3e0476a40a887530d657d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-BR/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-BR/firefox-120.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ba8db08a40fb15570b954da9b5b6e7cddf3138cbd540ba6fd221a2d3d2d9b544"; + sha256 = "28b71c9d3a8b71addbb5e25a24339277cea7a377b2fb0c84dec7fcfc099f80bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/pt-PT/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/pt-PT/firefox-120.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8518cc89f5d0a8f0a714c3d15b1ae0dbbaa6c1dbb47b766f98e706ee5c9fea8b"; + sha256 = "e9f222a3e0f060c9f0fc2f3f4b7ea41f72f281f9021dfce5256dd74a0844f408"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/rm/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/rm/firefox-120.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "56fe885cbdf01c1c53e0bcdaa74fe8a9b2fd075d4050a197fbe872dfe1f3fd1c"; + sha256 = "eb689283673b655a6960d0b38c86d0bcaba991031e7bd3cc81e1ffaf62321082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ro/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ro/firefox-120.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "94474a1992ef8d0cddb85e698375d7df43736325e28ae2e60f94299a9cff5079"; + sha256 = "b7be6d7ff81f3d4f9bc63aadc5f6724e900811a2fb83c1649c73b4b11f06cdb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ru/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ru/firefox-120.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f9e70b1b61c47850804f9dd4c8a907ff81599b95477893c42e4f6a0e6588092c"; + sha256 = "42c5a27358521a2ad1f90d76291c177e059c0bc78a7cf584f0001c171e3af773"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sat/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sat/firefox-120.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "e2bd85382eb4bb006518e7a37692e4b11d33bcbddef43fe1636465a94f13d07f"; + sha256 = "3d8f23c32bf09d082bff8a8e07154efa0f0210463718a1bf17d498a7f2b4f879"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sc/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sc/firefox-120.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "e3b7d6a2d10f9da0b11fc01128ad1cc3c878e90260bb906b1ec451f8c0160b36"; + sha256 = "4cc1ec00e153f85182eac844bf6c502172fd649e5cd19e8d618839bba9e7246d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sco/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sco/firefox-120.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5c20827498ba6ab0ea1b6299796479ab3af2685d64248166c4aeaa34283837d5"; + sha256 = "b71fc4af5b153ec3e4da3db6ebcd385abe8b6a955f96f2793c480cc43078b417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/si/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/si/firefox-120.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1d6ac6db81135b96f5940eae2b14a375ff636b0ccf5163e7ba198739a35c977e"; + sha256 = "1b7d26cb1ee71c05a8a113df8c6ef9918aae9955a05ae0d906f3ab9076de6eff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sk/firefox-120.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5f1cc60c2fe7ba2e184de94ea3552a84acde3bc438dae2afbca245af27ea1060"; + sha256 = "2bdf7ec91a936b81537930c3bc930bf8834460d0cff36db0f18449ce68786e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sl/firefox-120.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3942f5597ee26764f55eb1b5fd8a3ef656b94ed4630067042ae3d6cdc35a4a8f"; + sha256 = "a90210e59f2afda7b59518d774de6c2fb9f138a01091cad03492ed02db2c0a22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/son/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/son/firefox-120.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9a0aad56e659f09f65804682d902767beda5955215f794c3b07b0a94a0ec628d"; + sha256 = "fc8c11313be82e4de14de176e2610c10b7aa7ec2f193f5a879a731ba54839957"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sq/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sq/firefox-120.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a3739cdfd849de74b021dde0aeea27eb0dbbf1a04f0481ff4adaf7eee4fdb615"; + sha256 = "344f7ebd334d4abdfdcf259f770309f5d8dd748cdf865efdc4d871a328c4dd39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sr/firefox-120.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "68a0ace6dfc11e82c7e5ebe918a4d5c975897beb0f0727a2114089e2eafc077b"; + sha256 = "84e7a59e98afcfe6e14948c937c446f060cebe87b70a852baa0cb40bba55e5fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/sv-SE/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/sv-SE/firefox-120.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9a67bd82f39e4af0801b24f88f6f6bf92ba5d85031de2098fef6b2b9d3593863"; + sha256 = "f0678a5c33b960912457fa6619228659cdbb8a35a98a7b783c03b8c52fcf6e6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/szl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/szl/firefox-120.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "7a4da1bbd23268b52d82fefaeaf67f03d11e3b295d5811107de8731269ce98bf"; + sha256 = "794046dd28fa390ff8ec62576d37dbbd53ef561f24084ccd385b6ff2f1324fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ta/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ta/firefox-120.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e29cdd9028f07d00853d5c29a574d281218be9c13e2fe0cd8b53b17cb6c1b006"; + sha256 = "f78369a5bed86718908c927d3ac91b94096e0932b89903fca3ca353089ce6102"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/te/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/te/firefox-120.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a34da2975dca94013bf7152ca9d3029f63fd48be602088cae64d3eba844029a7"; + sha256 = "664ed5133a28e8715019a0f890086f6627ce6887f23b0e1997b7fd3e5b3a1665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tg/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tg/firefox-120.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "4602903e4dcfb4ee14fed515188ef7856f30bba9b7d7a0ee3e3674e9242e9e03"; + sha256 = "81e960ef12b82ae057f21bac6695fcb8609afba040542e0792de9692fe543524"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/th/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/th/firefox-120.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "805072c3cfd004060f20334a468467bd7c372df415f24df35e97a1309f2aec13"; + sha256 = "b07d2c4d795a7d5829b375573a562ed23a503d31ff914d2a05edfff381de3674"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tl/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tl/firefox-120.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "8a0da3f8c4aa05db9e08c4bb95587a1347a38fc15a5d500569cdaba77a8f0899"; + sha256 = "14cc86f160b201ff66dab3f54fe0604b099fe4ed4cacfb3c8c5420fb75aea05c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/tr/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/tr/firefox-120.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9fe74282a7bf0612e6172dcc54a5a65915b1d30fd5a1d18f193a617a5be6ea1e"; + sha256 = "a3c6e8ca647ff56f8447f148f28c9afacba8446cb17165be7a1d8ad38381c1c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/trs/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/trs/firefox-120.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "99056931998947015e7fef2cbc432dd0ee565d2c612e0a35b2848f06987cc322"; + sha256 = "2d517436bb9b417882a362037ab0a096a1e25e7c3f7a40e68e564c19e9eca947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uk/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uk/firefox-120.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4ed96af94b077ae2a660f10c2786344da83ec513706177793a427b2bd943332f"; + sha256 = "144da484cd8cde4f50dee471b8299de445932fd1f0cc4585a00533ac0fe3114e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/ur/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/ur/firefox-120.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "bb45d5109de54888df1c051d6692f337b87cbccf897f0b3a6ee475ef9bef9e8b"; + sha256 = "3417edecd2eb4735a48a0e71429cc866a9b15e37d7fec99ecea793e83072028f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/uz/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/uz/firefox-120.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9e053e07a72afb8fa4975f06e3fdcfe52c85777a91f0262e8008fbd906c4a46f"; + sha256 = "cf1a58caf9c3e03435923e4bc368d4d95496793187db7cd2f1d0da81be962a57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/vi/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/vi/firefox-120.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5369cebbc2a94c29971f53a50b77666845233982d9fee050ae5111440a12d276"; + sha256 = "d8a1eee3e1fc31d70c86a4879e1977c88ea92abf58e7117936e6f9b9ca73e34d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/xh/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/xh/firefox-120.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "868c5ae9ec6c5f2efba92e84f5112e560bb3a1bf44d76dd90abcbf00fe19f1e6"; + sha256 = "626cdc3529f9304d6e37c9885f57d77d11db4c633462e746975158d465933a33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-CN/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-CN/firefox-120.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4ce3f1ff7ea8b8a6d0af2fefd05c7647adbfa6feafcd788a38a1f149b2dcfb26"; + sha256 = "4a8c35174fc46de73257d4c75dc3f43f85cf56961b9e80464cbbe5da2b13f8a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0.1/linux-i686/zh-TW/firefox-119.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/120.0/linux-i686/zh-TW/firefox-120.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a91f8b78ed240ca818661baedabac14cb646a8396a9983d46fb3a3df556a102a"; + sha256 = "2fabc12704373d685862155e8869e078dd819c99f286eeef6f8de20de740fd59"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c77411b6c2647..5542ca62b93a8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,6 +7,8 @@ , application ? "browser" , applicationName ? "Mozilla Firefox" , branding ? null +, requireSigning ? true +, allowAddonSideload ? false , src , unpackPhase ? null , extraPatches ? [] @@ -367,6 +369,8 @@ buildStdenv.mkDerivation { configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 + '' + lib.optionalString (!requireSigning) '' + export MOZ_REQUIRE_SIGNING= '' + lib.optionalString stdenv.hostPlatform.isMusl '' # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator # TODO: Default vm.max_map_count has been increased, retest without this @@ -408,6 +412,7 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" + ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ (enableFeature alsaSupport "alsa") (enableFeature crashreporterSupport "crashreporter") diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c4d59bc2c1495..58a6586c4d5b1 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 = "119.0.1"; + version = "120.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a"; + sha512 = "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c"; }; meta = { @@ -56,10 +56,11 @@ }; }; - firefox-devedition = (buildMozillaMach rec { + firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; version = "120.0b9"; 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"; @@ -84,17 +85,15 @@ versionSuffix = "b[0-9]*"; baseUrl = "https://archive.mozilla.org/pub/devedition/releases/"; }; - }).overrideAttrs (prev: { - env.MOZ_REQUIRE_SIGNING = ""; - }); + }; firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.4.0esr"; + version = "115.5.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3ee680c5c503df7e4913794b7029ccffc10889f8f259f16030b24c1c18c1528439123532374ccb3a7e7a0d5d64068949cb85638a29694a7d99b74dd403ddefdc"; + sha512 = "5ee722884cd545cf5146f414526b4547286625f4f5996a409d7f64f115633fb7eb74d202e82f175fd5b2d24cce88deee70020fcb284055fcdea3d39da182074e"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 68f547d1f95a3..25c7ac5bb6598 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -115,18 +115,15 @@ let nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); - requiresSigning = browser ? MOZ_REQUIRE_SIGNING - -> toString browser.MOZ_REQUIRE_SIGNING != ""; - # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if requiresSigning && !lib.hasSuffix "esr" browser.name then - throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" + else if browser.requireSigning || !browser.allowAddonSideload then + throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then - throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" + throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon" else a ) (lib.optionals usesNixExtensions nixExtensions); diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index a4796d93954aa..9b90f94dbcacf 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,17 +7,19 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.5.1"; + packageVersion = "11.6.0"; applicationName = "Floorp"; binaryName = "floorp"; - version = "155.4.0"; + + # Must match the contents of `browser/config/version.txt` in the source tree + version = "155.5.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-988jKyfIGZ2UPHTNO1cK2lxR/5j3U/QYR3ZI9WsvHUI="; + hash = "sha256-5OQZckST6l9OZ7jnj52nuALCWiH1hVdDoDHSpqwUUfA="; }; extraConfigureFlags = [ @@ -43,6 +45,7 @@ tests = [ nixosTests.floorp ]; }).override { privacySupport = true; + webrtcSupport = true; enableOfficialBranding = false; }).overrideAttrs (prev: { MOZ_REQUIRE_SIGNING = ""; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index e1d79afac0441..6375e074a34aa 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , nix-update-script , cmake , pkg-config @@ -18,23 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-x80le9/mkL57NQGgmqAdbixYGxcoKKO3Rl+BlpOzTwc="; + hash = "sha256-vzdlcyA+RCr8RH0KbTiUah8lS++Xq6gLCHbgHHBFEig="; }; - patches = [ - # Remove on next release - (fetchpatch { - url = "https://github.com/skyjake/lagrange/commit/e8295f0065e8ecddab2e291e420098ac7981e0a9.patch"; - hash = "sha256-s8Ryace6DOjw4C4h1Kb2ti5oygvsAAs/MF9pC3eQbAM="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ the-foundation ] diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 4dde2d57d7e03..004746c2166fa 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -3,12 +3,14 @@ let librewolf-src = callPackage ./librewolf.nix { }; in -((buildMozillaMach rec { +(buildMozillaMach rec { pname = "librewolf"; applicationName = "LibreWolf"; binaryName = "librewolf"; version = librewolf-src.packageVersion; src = librewolf-src.firefox; + requireSigning = false; + allowAddonSideload = true; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { @@ -21,6 +23,7 @@ in # 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 = "librewolf"; }; tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { @@ -29,6 +32,4 @@ in }).override { crashreporterSupport = false; enableOfficialBranding = false; -}).overrideAttrs (prev: { - MOZ_REQUIRE_SIGNING = ""; -}) +} diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 28f8358feb5c7..20d01a4bba156 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -6,12 +6,9 @@ , makeWrapper , writeText , wrapGAppsHook +, autoPatchelfHook , callPackage -# Common run-time dependencies -, zlib - -# libxul run-time dependencies , atk , cairo , dbus @@ -30,19 +27,30 @@ , mesa , pango , pciutils +, zlib , libnotifySupport ? stdenv.isLinux , libnotify +, waylandSupport ? stdenv.isLinux +, libxkbcommon +, libdrm + +, mediaSupport ? true +, ffmpeg + , audioSupport ? mediaSupport -, pulseaudioSupport ? mediaSupport + +, pipewireSupport ? audioSupport +, pipewire + +, pulseaudioSupport ? audioSupport , libpulseaudio , apulse , alsa-lib -# Media support (implies audio support) -, mediaSupport ? true -, ffmpeg +, libvaSupport ? mediaSupport +, libva # Extra preferences , extraPrefs ? "" @@ -74,7 +82,10 @@ let stdenv.cc.libc zlib ] ++ lib.optionals libnotifySupport [ libnotify ] + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] + ++ lib.optionals pipewireSupport [ pipewire ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals libvaSupport [ libva ] ++ lib.optionals mediaSupport [ ffmpeg ] ); @@ -113,7 +124,13 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook autoPatchelfHook ]; + buildInputs = [ + gtk3 + alsa-lib + dbus-glib + libXtst + ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index caa4b6e39a591..6b155977a3b87 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -2,12 +2,9 @@ , fetchurl , makeDesktopItem , writeText +, autoPatchelfHook , callPackage -# Common run-time dependencies -, zlib - -# libxul run-time dependencies , atk , cairo , dbus @@ -22,14 +19,32 @@ , libXext , libXrender , libXt +, libXtst +, mesa , pango +, pciutils +, zlib + +, libnotifySupport ? stdenv.isLinux +, libnotify + +, waylandSupport ? stdenv.isLinux +, libxkbcommon +, libdrm , audioSupport ? mediaSupport -, pulseaudioSupport ? mediaSupport + +, pipewireSupport ? audioSupport +, pipewire + +, pulseaudioSupport ? audioSupport , libpulseaudio , apulse , alsa-lib +, libvaSupport ? mediaSupport +, libva + # Media support (implies audio support) , mediaSupport ? true , ffmpeg @@ -58,33 +73,37 @@ lib.warnIf (useHardenedMalloc != null) "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" (let - libPath = lib.makeLibraryPath libPkgs; - - libPkgs = [ - alsa-lib - atk - cairo - dbus - dbus-glib - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libxcb - libX11 - libXext - libXrender - libXt - pango - stdenv.cc.cc - stdenv.cc.libc - zlib - ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals mediaSupport [ - ffmpeg - ]; + libPath = lib.makeLibraryPath ( + [ + alsa-lib + atk + cairo + dbus + dbus-glib + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libxcb + libX11 + libXext + libXrender + libXt + libXtst + mesa # for libgbm + pango + pciutils + stdenv.cc.cc + stdenv.cc.libc + zlib + ] ++ lib.optionals libnotifySupport [ libnotify ] + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] + ++ lib.optionals pipewireSupport [ pipewire ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals libvaSupport [ libva ] + ++ lib.optionals mediaSupport [ ffmpeg ] + ); version = "13.0.1"; @@ -129,6 +148,14 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ + gtk3 + alsa-lib + dbus-glib + libXtst + ]; + preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 7c1beb43dca23..fa5fad4934c10 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -58,7 +58,7 @@ buildNpmPackage rec { homepage = "https://vieb.dev/"; changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner fortuneteller2k tejing ]; + maintainers = with maintainers; [ gebner tejing ]; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index de3c1cfdcdba8..2f63670128bb1 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivationWith , fetchFromGitHub , python3Packages @@ -6,6 +7,8 @@ }: mkDerivationWith python3Packages.buildPythonApplication rec { + inherit stdenv; + pname = "webmacs"; version = "0.8"; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index e20ad8c68e51d..1764bf610eb53 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.8.5"; + version = "2.9.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; + hash = "sha256-5oSuExdkP+69AJD5U74yLD4e+5pvbFOY6T9mcKnJ5Jw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; + vendorHash = "sha256-/MmcWusqgEe8KEJcEBOqOkv1lJb06R3TKYFk4wvdWHk="; # 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 2e2ca3341d83c..9c5225eb1b4bf 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.13"; + version = "0.10.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-DhMoNI1eRzP9FK752Z8sAcuj5dpu2vRqXRv4tbSYmLE="; + hash = "sha256-1r/f3CoTaOA2ZfM9UBGftZDZdCL9JIrs6SvaSO8BI6w="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 29428d8360eaf..b1ca2a74542bb 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.26.3"; + version = "3.26.4"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-KbtQ5oMZ1ygYwbaKpyAKTprPZ6+ikDbGLafwOShVd6w="; + hash = "sha256-idpvGgtvjtLuW+eQIldWihqgzWIFEM0bK0Ux61dD//w="; }; - vendorHash = "sha256-1PBdDpc/cvI5uN6/msxXoMXbx7Osgq12W1VqtZ7XtGE="; + vendorHash = "sha256-Dl0YLXrw/roKLmp8cZUa1v2n/UwzOGoL0AN8fNVMknU="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 8e1c1c14fd168..0a7f5178ef19e 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.15.11"; + version = "0.15.12"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-czU5o6QS4MsXyyedQ0nzwDiCQacHcDsbm2iDk7nU+Y8="; + hash = "sha256-Js//4dB8b3w9AOvMhXt91G87FzQ8jHq3W3pJHzLbluA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 8396889f532b7..5d2804251146c 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.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-l0D7uVoYTwiVI+b8yYpsJk/eAG5XYidR9CaQ595aTjw="; + hash = "sha256-TfFdHKXbbi0yqvyQjZArY9GbkwjUq1Z00UuNAldyDuc="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-3Ws2ObyBVYog7oVqHeEgIeWeRQpV1Z+Clilp8wI/PUA="; + vendorHash = "sha256-63XxGvVsIRDpQ0ri6VkjciyD+k7eEMBcg0w8NU8ypYs="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 407b0c0dd9c11..ce52fdb6a3557 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.15.14"; + version = "1.15.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; + hash = "sha256-GsT9ffQdLDxckKyf9U0sWZBf388o6ee9clrUuLJT/bA="; }; - vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; + vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 9e0470c70e824..66463152800bf 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.158.0"; + version = "0.158.1"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-768rlhkh8scQbzLvWyjyQSba4zCY/ydYreve+HmcFgw="; + sha256 = "sha256-ohf8MUUTZ3YNon12QpSRE80RaHvWsbrZk/slgEVbgoo="; }; - vendorHash = "sha256-ip01Uj720Sa11ni+8//U1PkHgiY6ttftvMHdxZgfKLk="; + vendorHash = "sha256-rA8egwzvvhArQboWpH2ZZTSJGTyzHUIl6aLusPfr8tw="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 308c5cd4db6b6..b58ef4fa08b52 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, k9s }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, nix-update-script, k9s }: buildGoModule rec { pname = "k9s"; - version = "0.28.0"; + version = "0.28.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-qFZLl37Y9g9LMRnWacwz46cgjVreLg2WyWZrSj3T4ok="; + sha256 = "sha256-3ij77aBNufSEP3wf8wtQ/aBehE45fwrgofCmyXxuyPM="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorHash = "sha256-TfU1IzTdrWQpK/YjQQImRGeo7byaXUI182xSed+21PU="; + vendorHash = "sha256-kgi5ZfbjkSiJ/uZkfpeMhonSt/4sO3RKARpoww1FsTo="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); @@ -28,10 +28,13 @@ buildGoModule rec { preCheck = "export HOME=$(mktemp -d)"; # For arch != x86 # {"level":"fatal","error":"could not create any of the following paths: /homeless-shelter/.config, /etc/xdg","time":"2022-06-28T15:52:36Z","message":"Unable to create configuration directory for k9s"} - passthru.tests.version = testers.testVersion { - package = k9s; - command = "HOME=$(mktemp -d) k9s version -s"; - inherit version; + passthru = { + tests.version = testers.testVersion { + package = k9s; + command = "HOME=$(mktemp -d) k9s version -s"; + inherit version; + }; + updateScript = nix-update-script { }; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 13ccf5599ce7d..02799677d9ec0 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.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-O4FPz62QnvG+Q2l4Gr/O0XFpkXE2G4RO/G6KNDdanzk="; + hash = "sha256-EMBCJc9x4oduFSHMYajc/Pf8nHwRP7qMsvJUbnDkjdk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 2f6939347729b..99e311ff3e20b 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -33,6 +33,6 @@ buildGoModule rec { description = "The missing glue to put together large Kubernetes deployments"; homepage = "https://kluctl.io/"; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; [ sikmir netthier ]; }; } diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 8d8c41cde774c..664c1b693ffc8 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-tVUe/EHraPVxikzGilmX2fDCX81lPGPy+Sa9OoVmpYM="; + sha256 = "sha256-Xp5PpHIcjh02qesnyrz53yydIAClx0OrBE75Sz5pifg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index c3ae7d5081b77..f753c739eb7e4 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -61,8 +61,8 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.0"; - sha256 = "sha256-a/3amvgGG7Gro6K7uIi20jwCo+JAlSuPB3/EUf75hxc="; + version = "1.28.1"; + sha256 = "sha256-jVaSqBdxg70XODwmFIpufJGXqB4r0UfNc/J+ZnjkhDU="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 2dd52220cb7b7..2701db12e61d5 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-7laXw0tC25zPTeLJlB/rX6WVcRFCd6DCB+3EUPnE4cM="; + hash = "sha256-Iwo+I1EfclkF4FL8QM3xGkIFxakmelI+hSUepLwfFSw="; }; - vendorHash = "sha256-qJA6gnb+VIkJD24iq6yyn8r4zYY19ZywcyalwfaTtbo="; + vendorHash = "sha256-VjPesQ27GcwnFQrNI+VYzJ4/aahcjASbfMi//Zs/KLM="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 76f81be00ea5c..611a33ca8f738 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tu1hAWAqnTGq9NL0kjG2VGzSKDh55HyAoa0nhsJdNLw="; + sha256 = "sha256-PUZ3zwgOQ362ikoX1D7SLThiaFpXJh9TKOdjZqZDtSg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 3af7a5990826f..0d8512788d7c0 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.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w="; + sha256 = "sha256-Lm7TrdUAYPYBKC+9lPmWTDp0BQqiAc/A107wtiGDwZ4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 8c15855576b88..ab2eb86164aa4 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.0"; + version = "2.3.5"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-5znZMr0Dj6kpKJbypICN5+Fv/+3FgTLBok3YMrWaHdo="; + hash = "sha256-RqysUaHLgTNuTeLt5xsD06Qxv5qsGTPE0H7r4RqPf30="; }; - vendorHash = "sha256-/iAGUnIMH2+IrvvXig56SpZ0eTfVwaCgGMUDp5/MtEo="; + vendorHash = "sha256-IH43F809dr6LGb87pqW2G9xrJLsQcHfjOm5PUj8r4Qo="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index ac142ca3597e4..f67d650e77a54 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.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-lb9FAk3b6J92viyHzLCzbYRxhQS94/FQvDr1m1kdTq8="; + hash = "sha256-aaGcAIyy0hFJGFfOq5FaF0qAlygXcs2WcwgvMe5dkbo="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ae514e2b9226a..f2a16ad9b8b94 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.24.2"; + version = "0.24.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-vKAKDQrQ7FmCnJwo8ItwpiayrHa9bhMognYZMlpZAlM="; + sha256 = "sha256-0KXAN8unaReYFyuGI6XCHhxKiKow0suP9yDl5pI+bGQ="; }; - vendorHash = "sha256-LPxU6qvpUb0ZjzjqGeTywOluwWbsi1YmiYYWJfaMWvg="; + vendorHash = "sha256-gbizFiZ+LFdY0SISK3K0D0vwj4Dq/UMcoCuvUYMB/F4="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index ccbde5deac974..5bae083a06f73 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 = "51.0.14"; + version = "51.0.27"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-aFeegAFGRofGa54roJ3EACvk9179YAwsgO97eeoOd6s="; + hash = "sha256-DGyvP2Z3fZNXqKuE42OPdaWfYpIGu9TIBBxbYzRPZ6M="; }; vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 228b52e800cbf..bc31e05a6af27 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,15 +14,15 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-alpha4"; + version = "1.6.0-alpha5"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-JkYMGD6hNMcMYPXnFUm/6T0EfzeAfG4oQuyqcNv3hVE="; + hash = "sha256-nkDDq9/ruiSvACw997DgnswwTVzCaZ5K9oT2bKrBYWA="; }; - vendorHash = "sha256-kE61inSQ8aCFnPf8plVRUJgruSFVOsogJAbI1zvJdb4="; + vendorHash = "sha256-mUakrS3d4UXA5XKyuiIUbGsCAiUMwVbYr8UWOyAtA8Y="; ldflags = [ "-s" "-w" ]; postConfigure = '' diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 8021d55156a6d..f5b60daeac2df 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-rr6CN5ik4vuLNqzNPvISfRfOjTcD48pSre2K6xr6xSk="; + hash = "sha256-bsvAyyf/ITIm8pxVF61idM91Ztd/2ufH2lBHR6a7lCQ="; }; vendorHash = "sha256-3bivFrn2xDyILD1ugSr7IehhNq4vkqShFQI3sbeY0iY="; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 8f456f3fb4de9..d21cc921976f5 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.16"; + version = "0.15.17"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4gChQQMVdtEKW2WqQAEVtlU2fFxLxBem2yAJzDjx2Q="; + sha256 = "sha256-RzwLc29f+u/m1x5R199M8XQQ5nn33ofYi3AyMCimMtA="; # 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; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index b144df23bd24d..02ceac61989a1 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stern"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-86XoYzw1bnIWwGiFgRl9RcZSYrF4byYKnDlJ4QSqXV0="; + sha256 = "sha256-W8jGUs63R6QpwuTgzK5yVLhKGXypvKOyCWHT2xdb6eM="; }; vendorHash = "sha256-LLVd9WB8ixH78CHYe0sS4sCDCD+6SQ7PxWr2MHiAOxI="; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 73984e863600f..f0414dba54d38 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.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-l0cR5BDUREBOOac/b87re5lzq3maz8Tg3msalXV6zAs="; + hash = "sha256-15sNXiJ/s3MlrXFXPxA7mQ+/36HRSZF6XKos6XEHi1Y="; }; - vendorHash = "sha256-/l0crKz1Pks2yiQ+t/rY2ZxB+jYCymSfoILtHYtQ7K8="; + vendorHash = "sha256-fGl16Wsb1tW9+wZBg5yY73t7n+EJ1dVx5IlzY2B8PJA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a729e62783b14..9bda0fedf0b1d 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.32.1"; + version = "0.32.2"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-qxKWyNQRWc0krdIfG6Mkn8ZZSkCkb0V41nIUsN5azGo="; + sha256 = "sha256-CNjZpiIKkky4BVmz6pN5tdADIt6hlnWY8ig9Rdt6qmI="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b89cc624bd43a..6769c46868d60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -46,6 +46,8 @@ let name = "source-${rev}"; inherit owner repo rev hash; }; + # nixpkgs-update: no auto update + # easier to update all providers together meta = { inherit homepage; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9caf5d07ff60b..3ba13e12bc570 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-rJ4xiBLrwhYkVPFDo6vZkk+w3v07EuK5a2gn1cbEA6Q=", + "hash": "sha256-RcMT8KD2V9JsAoQCznHpWIe+DHcTfKuW6gJlnxw9Kxo=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.10.1", + "rev": "v2.11.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -28,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-3agD22viTP+yntNg2nyYi5OpknXnfI2Jk/xEcvXgia8=", + "hash": "sha256-RxqrgekgPkLUTJsrEVfQPTOodv/hNWXFV7c/1Mg6mt0=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.8.2", + "rev": "v4.9.3", "spdx": "MIT", - "vendorHash": "sha256-sVPby/MLAgU7DfBDACqxvkLWblBhisHcUaoOgR3fMaM=" + "vendorHash": "sha256-gRcWzrI8qNpP/xxGV6MOYm79h4mH4hH+NW8W2BbGdYw=" }, "akamai": { - "hash": "sha256-4AosPUVnwq8Ptw1O6jT1V8xahmTigGpBqm4JJjzMXus=", + "hash": "sha256-Du0ANsAHzV6zKobpiJzdy26JgIW1NRO6fbAHNMCDbaI=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.3.0", + "rev": "v5.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Iuz5yxuxRwzj8BvoEXp8ePzaSA/vb7WbffljO1dBtxU=" + "vendorHash": "sha256-4w3zYSO0GIL636FFuv1X4covAyFHVQ2Ah9N4RUQd7wM=" }, "alicloud": { - "hash": "sha256-ZcING8FOCZE+Wrpr2Gov0WmdjQUZU3K3Moj+0gMVKuQ=", + "hash": "sha256-GdoesVK4awNjMMBE6YuLIMh23WyMLKxABWLQ/y5H4kw=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.211.1", + "rev": "v1.212.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -82,66 +82,66 @@ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "artifactory": { - "hash": "sha256-knQZsPb41JJjtSLV51/c33jlXM5Jud0QIaB/78iFQKs=", + "hash": "sha256-F491M8AS+nh4fCPUA/6R9c6MQ6CB29QJsWjk1L5LOwI=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v9.7.2", + "rev": "v9.8.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-H91JHkL32B1arXlqwhhK8M24s3lW3O8gMXd+0waMIKQ=" + "vendorHash": "sha256-Ne0ed+H6lPEH5uTYS98pLIf+7B1w+HSM77tGGG9E5RQ=" }, "auth0": { - "hash": "sha256-QljqPcupvU7AgVSuarpd0FwLuAPJI9umgsgMXc2/v6w=", + "hash": "sha256-ShwoPwEQLNX1+LB84iWrS5VopKt8kao35/iVVGLDZck=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.50.0", + "rev": "v1.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+ZYbaQICwcABnJE9p6Lwk0gXqeHfO/TLkvwvLD9v8ng=" + "vendorHash": "sha256-fD3epndk6L+zjtUNalis9VJCxWKOBScYGHkUFRnLNLQ=" }, "avi": { - "hash": "sha256-xis3uVCK+dck6R5ru8suNQov9qTLwLIdeQCAR9Jwqcs=", + "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "proxyVendor": true, "repo": "terraform-provider-avi", - "rev": "v22.1.4", + "rev": "v22.1.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-vORXHX6VKP/JHP/InB2b9Rqej2JIIDOzS3r05wO2I+c=" + "vendorHash": "sha256-1+VDh9hR/2Knl5oV9ZQiPCt+F7VmaTU4MI1+o8Msu8M=" }, "aviatrix": { - "hash": "sha256-T/GPJBcKxWhBxB7fVACkkwRm6dqixQpkAzi6UYw6TRw=", + "hash": "sha256-PRYtkq4CLEbUJ7YOSlvDyz+z4icLi0DBkDCTs/tNoIQ=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.2", + "rev": "v3.1.3", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-tiSCEHOjhOXW4XcQ3FrkNg6AVtFrDLqVe0fB3o1KAmU=", + "hash": "sha256-4ecgttYOAQ/I+ma1eSPomiJ4rdT9F1gtQUu4OS4stlQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.22.0", + "rev": "v5.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pRnQUCuAk02dM5NozNirH7c+meewwf0DMjwZlazD30Q=" + "vendorHash": "sha256-twXEX5emBPQUMQcf11S9ZKfuaGv74LtXUE2LxqmN2xo=" }, "azuread": { - "hash": "sha256-aTIxJgKk0bRvJyONn7iGLbsEbfe0Vzmtk+bTj3tZFPI=", + "hash": "sha256-PwHnyw0sZurUMLWKUmC3ULB8bc9adIU5C9WzVqBsLBA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.43.0", + "rev": "v2.45.0", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-jgnWSOwcocdWS531sjOFYiNx43Orx78WfS0glHRznfw=", + "hash": "sha256-sGZvfjq2F1BjvqgYel0P/ofGmHXv8c7OhfXGGoXB2+Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.77.0", + "rev": "v3.80.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,11 +155,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-h4CWzwvxRhA0DYjkVC44/hbwQMZ6uWGQqOqaM0mkYt8=", + "hash": "sha256-N2WfSCro4jVZSXTe41hs4uQsmnhbsfl/J2o51YEOsB4=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.19", + "rev": "v1.19.20", "spdx": "MPL-2.0", "vendorHash": null }, @@ -173,13 +173,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-En53+Lj7cQxzkKgXDPWNptVbg0wMAc5WRmsilBOlgEM=", + "hash": "sha256-dO+2sg+4Xg+9fxKe/hGF0EBS4yGZAzhIBgcBhT/VDWk=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.35.0", + "rev": "v2.37.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-xaa/NAJfKlSM4P9o4xNsJhL5ZyUGNYMC9/WbCqMKiLM=" + "vendorHash": "sha256-2s8ATVlSVa6n/OSay0oTdJXGdfnCwX6da3Pcu/xYcPY=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -191,22 +191,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-WVDbC8zLKrKi3dvpYmu8n0W/+YJKrpyQhA2ubcu76J8=", + "hash": "sha256-+H2ivPSrNBybUSYX2sLL4V8uqLTsJZp7AN1AYQQ/f90=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.0.4", + "rev": "v1.0.6", "spdx": "MIT", - "vendorHash": "sha256-UleQAfbWR4Zv0U+LgDs9JFcqTN5yLwHGw5EUUi8SnUs=" + "vendorHash": "sha256-GzHqmSS0yWH+pNGA7ZbfpRkjUsc2F9vlJ9XEOjKxFS4=" }, "checkly": { - "hash": "sha256-AFufcitZh9UwkO1p52PjjZEpYxLLdtLWQlUJm4PJjWI=", + "hash": "sha256-HfmEh+7RmCIjBvacBW6sX3PL295oHOo8Z+5YsFyl0/4=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.1", + "rev": "v1.7.2", "spdx": null, - "vendorHash": "sha256-8zzuU5ddu/1zx72soBLIrvpWHy+Yl3bsuc+IksTBfM4=" + "vendorHash": "sha256-iAAsTiBX1/EOCFgLv7bmTVW5ga5ef4GIEJSHo4w76Tg=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -227,13 +227,13 @@ "vendorHash": "sha256-dR/7rtDNj9bIRh6JMwXhWvLiAhXfrGnqS9QvfDH9eGw=" }, "cloudflare": { - "hash": "sha256-xnAEEKKHbVeITO1RRCyt2/LEDlqUqCf6jDHShhKLDwU=", + "hash": "sha256-FdKz6EmpxhqM+wcCAuwTCOCxhV0LI4+7d12fNxOSd7Q=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.17.0", + "rev": "v4.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-i5pO4dY3dnNy4XlIPk5CMYMqXzKyfwQWjettF5vPXr0=" + "vendorHash": "sha256-PwIFz2T+iXR6+A/yrF4+kxWr2SxLDUY8XDO5aTeg89M=" }, "cloudfoundry": { "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", @@ -254,11 +254,11 @@ "vendorHash": "sha256-h4CO3sC41RPSmkTlWUCiRvQ1NRZkT2v1uHFOemvBN8s=" }, "cloudscale": { - "hash": "sha256-OK5djIzIqS4qrVtgMMCiVqslO/rftTc/ft/rNQCxpOM=", + "hash": "sha256-SDivLkP1y/qBVNSiyCjV6zPTbLUplxzD3gNxzkjC51M=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.2.1", + "rev": "v4.2.2", "spdx": "MIT", "vendorHash": null }, @@ -273,13 +273,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-2oujZd7tqvMnp48m3bs45p5dRC7U5a7hsiS5qBuPUHU=", + "hash": "sha256-mGLI/TAovyBvowI6AwRPcmYqwnPEe4ibDhFj1t7I+oM=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.18.0", + "rev": "v2.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0SRbKFKl1lfiiMDZW20ak9m09T3tSOH/fc+UwGeXmuk=" + "vendorHash": "sha256-sOnEgGTboK+vbNQYUOP0TxLe2JsqBUFo6/k55paIsmM=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -291,13 +291,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-Etp25ZcKy+13SbsEtpVnNgF8GpYhO27JwlV8wRkaSOo=", + "hash": "sha256-IU9eBWYqI/a9EsYhI6kPom1PK/H403Dxr7eSXYFL5Do=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.31.0", + "rev": "v3.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0sfHf+aBV2vVScbyCPFtI6wj5KE6kNoioh4tyHhNOKc=" + "vendorHash": "sha256-C+N+LQ6qjpRrUNzCaiauIor+noD+0igTfR7RnrZdNwU=" }, "dexidp": { "hash": "sha256-Sy/xkhuNTocCoD7Nlq+pbvYiat4du4vZtOOZD2Ig3OA=", @@ -318,11 +318,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-i8jB3eLrhzvTq6ibc2u8XLK3SX41NU3dY1aGTwJtEq0=", + "hash": "sha256-8T2xWKKoPU54ukMClva/fgZXGDMh92Oi0IacjnbgCCI=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.30.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -345,13 +345,13 @@ "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw=" }, "dnsimple": { - "hash": "sha256-07YEICB3brMzq2ft6gcovqFZ5OYmBR0IY6X67StAV/g=", + "hash": "sha256-6QubFsPp3sOmCSgIpRH+x+Q9YDDnOnfX5UzV+iy3uh4=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.3.0", + "rev": "v1.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Ne5qnxU/n8y71fIegLYsQQxCqmVMT8RwHc+TXGshAJA=" + "vendorHash": "sha256-TTRxLal+oao8UtZpeZ4/HdR99WHGXARZWKqy1baT/mE=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -381,20 +381,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-cUHVp4oVQ2e1d6kkByI1QsvODZCvkbw0goW3BjRk5Xw=", + "hash": "sha256-7RnThTuYTO1W0nBZAilUB5WOp8Rng14aNBiax6M9FwQ=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.18.0", + "rev": "v1.19.0", "spdx": "MIT", - "vendorHash": "sha256-woYNslCzOOg9m8/Dfk42ZAWJDi8HZeqyVQw1MuRhoOE=" + "vendorHash": "sha256-nq380VsSog+nsL+U1KXkVUJqq3t4dJkrfbBH8tHm48E=" }, "exoscale": { - "hash": "sha256-KtuGrHPSNSyuwAXYpOHiVX2svWj5+6EkXb/wZAnW/6E=", + "hash": "sha256-Fc2/IT8L1jn0Oh8zT0C/Am4eoumQe0VRYqBDc/enEuY=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.53.0", + "rev": "v0.53.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -417,13 +417,13 @@ "vendorHash": null }, "flexibleengine": { - "hash": "sha256-DKbUjKwaJtBU0zFBz+C4hAKIys//mMKYBy0QFLHDY8s=", + "hash": "sha256-+RAuFh88idG49nV4HVPgaGxADw/k/sUSTqrzWjf15tw=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.42.0", + "rev": "v1.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RqYzqKPzb5GcrzHnEDZC7GaBt1zP8g28Wo3WNAe07Ck=" + "vendorHash": "sha256-yin+UVMkqIxMSoVB4TD6Nv8F24FnEGZP5PFVpmuO2Fg=" }, "fortios": { "hash": "sha256-RpcKMndbO3wbkHmrINkbsQ+UeFsZrQ7x02dv8ZpFMec=", @@ -445,42 +445,42 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-Np7aecFKdYqRPgdSfca5t7ExBvjx9zDSZJTk/GcFCLM=", + "hash": "sha256-hlUVYgisdMa60XWb4z3erZS/8QBHEFGrjREsWh4azEE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.40.0", + "rev": "v5.42.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-9fY1TTKQ02OkCRsMVE+NqsUiWga8lF38/5sB1YxKAEg=", + "hash": "sha256-eONOqinRXs9lPz4d8WDb9lA0XcJuNqzgsZrmJAZ42t8=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.4.1", + "rev": "v16.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tMFNjdXIlyBELrLRKkJySXlQbuHDybVhSTw/J3dXZ7w=" + "vendorHash": "sha256-2t50Gsyf8gxG/byjgNyw5GEturU0MgBvZuJyc49s4t0=" }, "google": { - "hash": "sha256-9svwUHvA5fuYjfiFWQLQs1yOejYprsiSF+58nPWN/Vs=", + "hash": "sha256-o4tyG0Q4sqBktreYEKJ+1QlNXx/BEPmAGOTTzTcFnP8=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.2.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aVJuAYF5S/fkFHRk34HIN9p+P9MgHGh0RpeqC3/gchY=" + "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" }, "google-beta": { - "hash": "sha256-z8b77hlIcB1Uthkl+aWQH9bkkRb+A9Y/EEUxNTU4wR4=", + "hash": "sha256-+5Fm/aT90bD6RpQrUGjmpmahPTjOfsRJAaZuZsrPQn4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.2.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aVJuAYF5S/fkFHRk34HIN9p+P9MgHGh0RpeqC3/gchY=" + "vendorHash": "sha256-9nz3VLTi4RfGBDAE7JBUWXrJRajwAyxoeEH+VSP0wyQ=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -492,13 +492,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-3KVJ7mP6ehJnU0DxzR9rvMylw8VNFTTM+C/NBz2C1+E=", + "hash": "sha256-8GBhJvv0JYHh98l1IRMsodYlFAkW5Lt1dJ03mPzTcts=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.3.3", + "rev": "v2.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-kYNlClQoeU4s8j2dk1x33YtNkjs8a2KMPkzm4z/e0Z4=" + "vendorHash": "sha256-DOkDVQPTwB0l1VlfbvwJYiKRi/GE85cPzaY4JKnewaA=" }, "gridscale": { "hash": "sha256-gyUDWG7h3fRU0l0uyfmxd0Oi1TtQHnJutqahDoPZWgM=", @@ -510,13 +510,13 @@ "vendorHash": null }, "hcloud": { - "hash": "sha256-kuC4tm8ob9bg7iLcUaGEHMYh6XaZp4rQiVlnbo1Xzek=", + "hash": "sha256-9yW3VbxtD+oSxmc2R9yzZisMTAOwjzyCzvZBRdFdH/w=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.42.1", + "rev": "v1.44.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" + "vendorHash": "sha256-oGABaZRnwZdS5qPmksT4x7Tin2WpU2Jk9pejeHbghm8=" }, "helm": { "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", @@ -565,11 +565,11 @@ "vendorHash": "sha256-hxT9mpKifb63wlCUeUzgVo4UB2TnYZy9lXF4fmGYpc4=" }, "huaweicloud": { - "hash": "sha256-/dZ2WHzCF8vAFmpg0eUaCSzMy+5v7D24NPkJhCrjhLw=", + "hash": "sha256-V6Ar0MXK7i927eDq8uvHZc3ivVonK9KBKqSZCCESgq0=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.56.1", + "rev": "v1.57.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -592,13 +592,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-38AkbG68901Lc66B2nk+9FAWHQ9WZ0w0zAWseWbyOOw=", + "hash": "sha256-Od+aunGMjcQ4AF60dxWNAUVMQiAkFMSAquOhUp3icug=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.58.1", + "rev": "v1.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-8/5baDHKV5Plm1DnNtyrh7FgMjT9zr9ifxTosi7o5sg=" + "vendorHash": "sha256-qp1TZmDr7X+2MCdlGTBLubJ7hF5Y9jqoFaj5mxgNLHE=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -610,11 +610,11 @@ "vendorHash": null }, "infoblox": { - "hash": "sha256-655WGpwE1BmWRdikvHtxxX8u4kOZ9cSLCZDr6QGfn5Y=", + "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.4.1", + "rev": "v2.5.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -691,13 +691,13 @@ "vendorHash": "sha256-dHzyNvzxNltCAmwYWQHOEKkhgfylUUhOtBPiBqIS1Qg=" }, "linode": { - "hash": "sha256-yzEbkK2fOXNkuMYjtsXXRI3tV+OngzVeJoDiu+iTr5w=", + "hash": "sha256-ScuHyfnco5Xz6HrZ9YPQLdWKo1Hqu7LRteLHH2JxHXQ=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.9.2", + "rev": "v2.9.7", "spdx": "MPL-2.0", - "vendorHash": "sha256-G4A1nCM2R/6yWSUP+OSHrd6k6bz0Cp7wc40IU2AnS5s=" + "vendorHash": "sha256-5ALsYOuWLFGbIR3yVKmPeb0tQnx63p4WC98WdcxXeZ4=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -718,20 +718,20 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-0/nIdfCsmPaUkGkSkmWWioc6RZGTb0XWtvprjuDg2gU=", + "hash": "sha256-2th4/2uLFnmSFKI94bSSt4OSX9wiML/OkThR6SbUCPE=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.2", + "rev": "v1.10.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-DMOyP8BX1502a+Hd7rwhpV2/nT0ECFKmKDPtWE6o0IM=" + "vendorHash": "sha256-gcXX4XIyY2X7ZSDMVVzGL/ltaf8Z1/Zx8oJo/IDrIBA=" }, "mailgun": { - "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", + "hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.4", + "rev": "v0.7.5", "spdx": "MPL-2.0", "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, @@ -754,13 +754,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-1Qnjn/13h+r7VeFPwpKMzQiK5EzhSghxHCOyahWXbVs=", + "hash": "sha256-i3YYBffP7Jp3f0wN1ZwP+c7C8WN8EKUh7JOKzbH0R/I=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.18.0", - "spdx": "Apache-2.0", - "vendorHash": "sha256-cufN4QYXE+bqDKLUV+Rdslr5CgbI0DvoFVWVQiBVomw=" + "rev": "v2.0.1", + "spdx": "AGPL-3.0", + "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" }, "mongodbatlas": { "hash": "sha256-SMIc78haJiH0XdTr9OBGWOcvXfYQW9thcNkCOxmNxDw=", @@ -790,13 +790,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-b9wHTSxDT657qTfv73O8A2YnwJPSWYONrElcyYyeH60=", + "hash": "sha256-6SwAieZc7Qe8r+olZUUV46myax/M57t4VfWDrXMK8Hk=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.27.3", + "rev": "v3.27.7", "spdx": "MPL-2.0", - "vendorHash": "sha256-qZqmw55Fsn3XaDvyorouy391iM6KXQxX5gJGrKR3URU=" + "vendorHash": "sha256-9+AcCcAX/oEnljMCuJQ9B/aRkAB/074r4G/XWnLv/KU=" }, "nomad": { "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", @@ -827,31 +827,31 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-TV2jp7zmBdBpKGBrGfluUTFRUa2wq9MnTi+nfjqRG+4=", + "hash": "sha256-Okjb4MS28gY1UdYA8+qs45VV5QcGabvMn5bc+nhzbt4=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.9.3", + "rev": "v1.9.4", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-gMVGLURSXzT9TXXHJlL3F5WN+XI4o22bkPFh/jPtUrw=", + "hash": "sha256-gk5KegQozeDg6ZqYsy+DxMczBOKxH0v3mHFRau/alFY=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.17.0", + "rev": "v5.20.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-0UvJCEHoCsONskvihQidGo834qEZR1hZMczNF+C7fqw=", + "hash": "sha256-LCOuRsAX0ftacS0ecNQpYXKKumfCZ9a10bSuRJtD20E=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.5.0", + "rev": "v4.6.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LwExX17GlyzxMcn95c2T9FawoS03fHH58RmHoPTsjBA=" + "vendorHash": "sha256-ZhF1c4cez43cCumU+PYufpEcprRDxY7hVCNQHdIEDtI=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -872,58 +872,58 @@ "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, "openstack": { - "hash": "sha256-Iauu0sQf8wq4Ev8JflxrthXYe99YDnt5ZzWQ/q3Bjfw=", + "hash": "sha256-sFv7n5tf3aAwe6R1XeJdU3XMDF9ZMCM3t/vVLegZaXM=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.52.1", + "rev": "v1.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" + "vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ=" }, "opentelekomcloud": { - "hash": "sha256-ozaIQiYpo0M0yuFSk70kw3tPZbEhZjHkq1FzUKOZP4Q=", + "hash": "sha256-3p5R8thq5iWaeAsvqoA03UK6hzVGi4DlEe3PHJBP3xA=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.10", + "rev": "v1.35.11", "spdx": "MPL-2.0", - "vendorHash": "sha256-cFZO7GSv2+FpSZcYNRbuRkX3DJ7m0JwW/TCPo41F800=" + "vendorHash": "sha256-MD3tywosRUbkzeXQA2yTHr3p8RJlzNZVbrlTesDHpMI=" }, "opsgenie": { - "hash": "sha256-3iPprhDd9nnF9NnaGHp8rQ57rvA1jxZuSjIFsfGtEMU=", + "hash": "sha256-IIQtbRKfLbJz5J/T/YzVWSivMeuyKO6iKlXmbrslpQo=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.32", + "rev": "v0.6.34", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-FvWA1uS70sterPTSBMBclrMtNjxWPZPTgSuEdslUgvg=", + "hash": "sha256-s8Tg1j47J0sj9Jt98mS4rFgtGl4uFIfdaQDNXOV8Bbg=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.34.0", + "rev": "v0.35.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-h1yy/TfiqYgAmQ5A2vn3WFrgI70JDX7G/3289tfFTHc=", + "hash": "sha256-4TplBhRU4k7ucDCsgWcqEok9tOADuZAwqOonAY+eLdY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.0.2", + "rev": "v3.1.1", "spdx": "MPL-2.0", "vendorHash": null }, "pass": { - "hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=", + "hash": "sha256-QGcHOsyUINH4bqK14OEzNm4b7oMK/4hwN9SuKt4m6t8=", "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", "repo": "terraform-provider-pass", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" + "vendorHash": "sha256-LWyfkhyTr6xHtt8nCdqid/zKwGerYVxSEpqSe853S9w=" }, "postgresql": { "hash": "sha256-r1Im4bhAakBe0PoDTpiQWPfnoFBtMCrAyL7qBa1yTQc=", @@ -944,13 +944,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-UO9GBBoOzA1stMq8naXWtxomme6CVdlngVCLQlbZDv0=", + "hash": "sha256-bLzJT+ZyBtnehpiR02tyCcI5xOC2vJxBlYW1cLX7yqI=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.3.3", + "rev": "v1.3.4", "spdx": "Apache-2.0", - "vendorHash": "sha256-Tj+NefCIacwpPS9rNPPxV2lLeKsXJMZhf9Xo+Rzz6gI=" + "vendorHash": "sha256-ZDscj89bnLiubB+cxWjK1v9DXc5RX21pxfksJd6pQxk=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -998,22 +998,22 @@ "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" }, "rundeck": { - "hash": "sha256-PVLehIrj4vleOtcpNcHfpk6NOKsmrF8FCJXILlru7Ss=", + "hash": "sha256-VPkHnSOTnRvvX6+K0L0q5IqSSFCE6VPdg2BaSejFMNc=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.6", + "rev": "v0.4.7", "spdx": "MPL-2.0", "vendorHash": null }, "scaleway": { - "hash": "sha256-Fx77O5FHRZAFGNojWUxPPhlJ+hv2XVvh4RVYnMt1WXQ=", + "hash": "sha256-lOoxgWps6r4/7JhK0Z0Iz5EA2mHYNrdIgOntRqXFrH8=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.30.0", + "rev": "v2.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4fIFZRAx0Vkl7QK13Vp/QJN+WDtk40RsvGYm6wPnfAI=" + "vendorHash": "sha256-tly9+vClV/IGivNBY114lNXxnYjJVvhVAi1tEyCtIoo=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1070,13 +1070,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-p2VN5M9OCEdA0olIx5HmB3g62sZVnJZEob40p8UgIXs=", + "hash": "sha256-O5Nt+CcVppo5w4gD+NQ/XrRbkJicIzQrh5gffjPNvvw=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.74.0", + "rev": "v0.75.0", "spdx": "MIT", - "vendorHash": "sha256-lxjAtxY++tITodDbdxZorIzkJXKPHqO/UZqBr5IBNys=" + "vendorHash": "sha256-VD3zXfaa2fmq85a/k7LPbDVS1gA5xHC2F3Ojqpmt8MI=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", @@ -1088,13 +1088,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-banhAkXLg3iWH7/eiPodOreReqaDskmlCdNIPZYbM3E=", + "hash": "sha256-mYLIOnWI1yzfmuKikDib4PIDLJulGBqvo2OkGmUt7fw=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.147.0", + "rev": "v1.149.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sr2VAFSc6VfLW0KNGQMxYuAITjFaWOQaJjIlaMYamS0=" + "vendorHash": "sha256-6UUXMcfyIiZWc7HSy3P8gc7i1L9cVjifwREfmw05Qco=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", @@ -1142,22 +1142,22 @@ "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-TJKLBMgxQXKhdKG7HCUFLWAtWCoZFla4CvSeN1a2k44=", + "hash": "sha256-o9PY7kZAsF/bOkmIa0QKW2SabK0u56FtjMxmlKNROBg=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.38", + "rev": "v1.81.45", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-MTPtt87Kq3gOxF85Wwc6SWRy90+kK4BeHivAQTo32f8=", + "hash": "sha256-HsoqWDwze/INB3KfQzwKKGbyKiU7xfsI4Bg/4/xFGr4=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.49.2", + "rev": "v0.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PQanCxvb1sT5SSLNH4fKFwF8j5ycU+6Os63GZuyBUSo=" + "vendorHash": "sha256-D8ouBW20jzFi365gDgL2sRk2IERSgJN3PFb7e1Akl50=" }, "thunder": { "hash": "sha256-wS50I4iTnHq0rDUoz7tQXpqW84wugQQiw42xhzxFiRw=", @@ -1215,23 +1215,23 @@ "vendorHash": null }, "utils": { - "hash": "sha256-YkEklRSjAvBzySfc4nmmOaDmzcQlW9uAtoJMMHOqJEQ=", + "hash": "sha256-WbJy1lwEX6RCYxZydCJ+0U/mJB4NoYiUg9+zf8Mxnwk=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.12.0", + "rev": "1.14.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-aMN25qa67m2Z8ZdMqtob0rj70Oy+E8bXEiRVb1HmGOk=" + "vendorHash": "sha256-vFfwa8DfmiHpbBbXPNovPC7SFoXRjyHRwOVqBcWCEtI=" }, "vault": { - "hash": "sha256-HWEPeIhYCdM6m1hEuX5ozZFl5yRlND0heF+sl+uaNHM=", + "hash": "sha256-9SOHw46KChe7bGInsIIyy0pyNG3K7CXNEomHkmpt8d4=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.21.0", + "rev": "v3.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tas0801GM+E1yuMEFoFo8GfizeJaDwKfvK8TsCf/big=" + "vendorHash": "sha256-HvjbXSAkbTmADyWQaw0lZV3nZUEIYiAB3VahYvIQeb4=" }, "vcd": { "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", @@ -1261,11 +1261,11 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-AVN2WDVDAc11p0i/d8wb/AvITMStrtsIq+MqXWYdwL8=", + "hash": "sha256-03qXrYDpmPc7gHELzjS5miLm5NPTrF0AV1sUSCM0/4o=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.10", + "rev": "v3.0.11", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1279,30 +1279,30 @@ "vendorHash": "sha256-4ulRYzb4bzk0TztT04CwqlnMGw8tp7YnoCm2/NqGN7Y=" }, "vultr": { - "hash": "sha256-8pj+udTNTjT/tXggOaIOThRQkYoI3v68rEssSUojM2A=", + "hash": "sha256-9HEuJXV6spLoLEVwdNid+MfVrBvrdUKjHWkDvQLSG+s=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.16.4", + "rev": "v2.17.1", "spdx": "MPL-2.0", "vendorHash": null }, "wavefront": { - "hash": "sha256-FvRrX8T9PDz5gJZuE9sARfa9ERaEFMk0vmX4xDcrbVY=", + "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", "homepage": "https://registry.terraform.io/providers/vmware/wavefront", "owner": "vmware", "repo": "terraform-provider-wavefront", - "rev": "v5.0.4", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GuOdD1m3elBj9k7YfUYbyqJNzIwmZZ1O1lplpBUPH+g=" + "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-t4NvehAHS0U9kPQsA6otAga9YQWZ0rJrm3YFi9SgKQY=", + "hash": "sha256-QirLhOAvOcsMFR0ZWHCCI2wbfcD5hfHSlZ0bguvAHiI=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.100.0", + "rev": "v0.102.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2+VeNaTZK4K3jqcKnSfzqlIvfzJF9HFv04Z99ImCWT8=" + "vendorHash": "sha256-y8M50X2F4olM1I0i32uUd/FASY9wUnMOF5k4AEP6b9I=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ed252614490ce..70f547fb02253 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.3"; - hash = "sha256-2ai0WAknz4rt33BuBoqnTCsfPNHmet9+PdgYeeJKQkQ="; - vendorHash = "sha256-ZtaXUX0PgL1nwXgohcfCyj/fLPAodx8amHEsQnlOQrc="; + version = "1.6.4"; + hash = "sha256-kA0H+JxyMV6RKRr20enTOzfwj2Lk2IP4vivfHv02+w8="; + vendorHash = "sha256-cxnvEwtZLXYZzCITJgYk8hDRndLLC8YTD+RvgcNska0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 638a3089033ff..f559df2747d81 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.53.2"; + version = "0.53.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo="; + hash = "sha256-UPbiqo0HvBEIAimugNa7WwqwPsLk8C2gS0KqfgFMGQU="; }; - vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo="; + vendorHash = "sha256-h1rDXxvPhQfGUpxOmnksy3l8kMq93nxOQ9adJFyZnOY="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/applications/networking/cluster/tfautomv/default.nix index 7409ec8ea4460..358dfd0a39fde 100644 --- a/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-A1/sf+QjxQ8S2Cqmw9mD0r4aqA2Ssopeni0YNLND9L8="; + hash = "sha256-irB0Kfd8eqIKq0ooJRxB0X4t2/1aFCNYRwaG6lAw3ic="; }; - vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU="; + vendorHash = "sha256-Wc5hpiHL5I01IodcHX0IzeKfthkFS7SuUxmaxOU6WkA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index a1a72a69885a7..d71e9fb7fb7d4 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -10,7 +10,7 @@ openssl, parted, procps, # for pidof, - python3, + python39, # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 shadow, # for useradd, usermod util-linux, # for (u)mount, fdisk, sfdisk, mkswap }: @@ -19,7 +19,7 @@ let inherit (lib) makeBinPath; in -python3.pkgs.buildPythonPackage rec { +python39.pkgs.buildPythonPackage rec { pname = "waagent"; version = "2.8.0.11"; src = fetchFromGitHub { @@ -28,9 +28,14 @@ python3.pkgs.buildPythonPackage rec { rev = "04ded9f0b708cfaf4f9b68eead1aef4cc4f32eeb"; sha256 = "0fvjanvsz1zyzhbjr2alq5fnld43mdd776r2qid5jy5glzv0xbhf"; }; + patches = [ + # Suppress the following error when waagent try to configure sshd: + # Read-only file system: '/etc/ssh/sshd_config' + ./dont-configure-sshd.patch + ]; doCheck = false; - buildInputs = with python3.pkgs; [ distro ]; + buildInputs = with python39.pkgs; [ distro ]; runtimeDeps = [ findutils gnugrep diff --git a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch new file mode 100644 index 0000000000000..9068f4a3ddd30 --- /dev/null +++ b/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch @@ -0,0 +1,23 @@ +From 383e7c826906baedcd12ae7c20a4a5d4b32b104a Mon Sep 17 00:00:00 2001 +From: "Yang, Bo" <bo@preemo.io> +Date: Wed, 8 Nov 2023 23:08:07 +0000 +Subject: [PATCH] Don't configure sshd + +--- + azurelinuxagent/pa/provision/default.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/azurelinuxagent/pa/provision/default.py b/azurelinuxagent/pa/provision/default.py +index 91fe04edab..48edf01490 100644 +--- a/azurelinuxagent/pa/provision/default.py ++++ b/azurelinuxagent/pa/provision/default.py +@@ -237,9 +237,6 @@ def config_user_account(self, ovfenv): + self.osutil.conf_sudoer(ovfenv.username, + nopasswd=ovfenv.user_password is None) + +- logger.info("Configure sshd") +- self.osutil.conf_sshd(ovfenv.disable_ssh_password_auth) +- + self.deploy_ssh_pubkeys(ovfenv) + self.deploy_ssh_keypairs(ovfenv) + diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index a268f262ead08..336d840eb58ca 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "weave-gitops"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W7Q5rsmNEDUGofQumbs9HaByQEb7sj4tOT7ZpIe98E4="; + sha256 = "sha256-H/l/b6yPoNZeBG1TPc9PCBpZg4ETnF9FmYnbRmKl8c8="; }; ldflags = [ "-s" "-w" "-X github.com/weaveworks/weave-gitops/cmd/gitops/version.Version=${version}" ]; - vendorHash = "sha256-+UxrhtwYP+ctn+y7IxKKLO5RVoiUSl4ky0xprXr98Jc="; + vendorHash = "sha256-le34zvlgquxOv0xdOPfpf7/ZuoPd9MEfp8Gshigvtas="; subPackages = [ "cmd/gitops" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 0d58e54bcb423..9895729c29eb9 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.267"; + version = "1.2.269"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-OlTlyo/JbmXyoMBSDnKHvjGN6NMRrk0kQT63R34gtOs="; + hash = "sha256-LUHENANM+3wGftTVXaQsGykKayzEAIQ3TQ5qM77TJVA="; }; - vendorHash = "sha256-0bxM0Y4K6wxg6Ka1A9MusptiSMshTUWJItXoVDpo7lI="; + vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 3099df6e9f12b..ca26ee1c4b3b4 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.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc="; + hash = "sha256-E/M0GliZwe8aDZDtuCea5II452Zy9pD+9MmYFSkmjE8="; }; - vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw="; + vendorHash = "sha256-VmukCrEl2hldN0kBgDycp/junmXCZsH+utNJGNjodW0="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 3f6c52a4d473a..188eaecd2dc23 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -8,26 +8,25 @@ , gtk3 , jre , libXtst +, coreutils +, gnugrep , zulu , preferGtk3 ? true , preferZulu ? true }: let - rev = 3423; + rev = 3464; jre' = if preferZulu then zulu else jre; gtk' = if preferGtk3 then gtk3 else gtk2; - - inherit (lib) makeLibraryPath versions; - in stdenv.mkDerivation rec { pname = "davmail"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; - sha256 = "sha256-/JsJFtGalNuOz21eeCPR/LvLueMtQAR7VSKN8SpnPvA="; + sha256 = "sha256-FatB0t/BhZRMofYE0KD5LDYGjDQ8hriIszKJP8qNvhw="; }; postPatch = '' @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --set-default JAVA_OPTS "-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=${lib.versions.major gtk'.version}" \ - --prefix PATH : ${jre'}/bin \ + --prefix PATH : ${lib.makeBinPath [ jre' coreutils gnugrep ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk' libXtst ]} runHook postInstall diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 87f9c4bbc19ea..50112238215de 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-2023-10-22"; + version = "unstable-2023-11-14"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5"; - hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0="; + rev = "002e382c0de1d87e2ce7fd579346da4f339880ca"; + hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk="; }; - vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA="; + vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index be8173da16d9a..b10dac2262abe 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; + hash = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index bd1b74fe4a744..a3671b4766824 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -12,25 +12,25 @@ in { guiStable = mkGui { channel = "stable"; - version = "2.2.43"; - hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; + version = "2.2.44.1"; + hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.43"; - hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; + version = "2.2.44.1"; + hash = "sha256-Ae1Yij81/rhZOMMfLYaQKR4Dxx1gDGZBpBj0gLCSToI="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.43"; - hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; + version = "2.2.44.1"; + hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.43"; - hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; + version = "2.2.44.1"; + hash = "sha256-YtYXTEZj5009L8OU7jdhegYu5Xll3jZAW6NJFWOvxHQ="; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index a9537d9931711..85f0d7c0e638f 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -8,6 +8,8 @@ , fetchFromGitHub , qt5 , wrapQtAppsHook +, testers +, gns3-gui }: python3.pkgs.buildPythonApplication rec { @@ -56,6 +58,11 @@ python3.pkgs.buildPythonApplication rec { export QT_QPA_PLATFORM=offscreen ''; + passthru.tests.version = testers.testVersion { + package = gns3-gui; + command = "${lib.getExe gns3-gui} --version"; + }; + meta = with lib; { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 48d48de83b2a5..9253412aac033 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -8,6 +8,8 @@ , fetchFromGitHub , pkgsStatic , stdenv +, testers +, gns3-server }: python3.pkgs.buildPythonApplication { @@ -32,7 +34,6 @@ python3.pkgs.buildPythonApplication { aiohttp-cors async-generator distro - importlib-resources jinja2 jsonschema multidict @@ -45,6 +46,8 @@ python3.pkgs.buildPythonApplication { truststore yarl zipstream + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; postInstall = lib.optionalString (!stdenv.hostPlatform.isWindows) '' @@ -72,6 +75,11 @@ python3.pkgs.buildPythonApplication { "--reruns 3" ]; + passthru.tests.version = testers.testVersion { + package = gns3-server; + command = "${lib.getExe gns3-server} --version"; + }; + meta = with lib; { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' @@ -84,5 +92,6 @@ python3.pkgs.buildPythonApplication { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "gns3server"; }; } diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 4fd9a36b0f516..3d49f47f81635 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ genericnerdyusername ]; - platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index ecbe202487a09..69515f82ddf73 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.4.0"; + version = "9.5.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - sha256 = "sha256-bOK6QP9uLMJP9pgts4EyvW0WIKqcfhtvb1heG629Q38="; + hash = "sha256-UQg7yGKdjZWrJpPAaHpPz9aQuxLvuRDXeQaOg7WorwE="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang hexchen ]; + mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index deff202d2e689..fea9da80d19ec 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -15,6 +15,8 @@ , sqlcipher , stdenv , CoreServices +, testers +, deltachat-desktop }: let @@ -33,16 +35,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "unstable-2023-11-03"; + version = "1.41.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; - rev = "40152e9543eb773fc27e7a4f96ef1eecebe9310e"; - hash = "sha256-9GPXFUCu9GKa/bJgO8CIPMLccI6WAJ6PhfoyJ6s/DHE="; + rev = "v${version}"; + hash = "sha256-ITcBIm47OiGy/i6jnG6r1OoStjRPystOts6ViLioLNY="; }; - npmDepsHash = "sha256-g3nkgqZNoq+xuwXbXLHEMVpHH6Sq3792xhITCx7WvOc="; + npmDepsHash = "sha256-+t6m2kDUOh6kIkbZgol/CQciDTxUZSkTr1amPywrMb4="; nativeBuildInputs = [ makeWrapper @@ -116,6 +118,12 @@ buildNpmPackage rec { ]; }); + passthru.tests = { + version = testers.testVersion { + package = deltachat-desktop; + }; + }; + meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1862cf6e04a75..6a5cdfd152de0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,14 +1,14 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.33"; - ptb = "0.0.53"; - canary = "0.0.173"; - development = "0.0.1"; + stable = "0.0.35"; + ptb = "0.0.56"; + canary = "0.0.184"; + development = "0.0.0"; } else { - stable = "0.0.282"; - ptb = "0.0.84"; - canary = "0.0.329"; + stable = "0.0.284"; + ptb = "0.0.87"; + canary = "0.0.340"; development = "0.0.2"; }; version = versions.${branch}; @@ -16,33 +16,33 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; + hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; + hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; + hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-ogLOZZ9pTXB01TqdnmdORIzZ8GbGzskUzbG4E68gZwY="; + hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; + hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; + hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; + hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index de955ab393aa4..b3ea2b3fe820b 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: 2023-10-16 +# Last updated: 2023-11-14 { - version = "3.2.1-17412"; - urlhash = "423936b9"; - arm64_hash = "sha256-gvKBcfQafDtNioFg4Cyy92VMAX4uKL5H7wBkxQgDwjI="; - amd64_hash = "sha256-cg2YXB1/pf5eDRHFgzydIb4GICjh9XRtCquPspgCL6c="; + version = "3.2.2-18394"; + urlhash = "fd2e886e"; + arm64_hash = "sha256-6E3h7Z4936YKZb+G0FoMb90T3EzH8z07mmGMnL4SDFk="; + amd64_hash = "sha256-L1M8O0FzVKLXNNYGGMPf1Nbh/DFxLHBlbzapr7uz5Sk="; } diff --git a/pkgs/applications/networking/instant-messengers/qq/update.sh b/pkgs/applications/networking/instant-messengers/qq/update.sh index 312fc210857ae..8b9121299bbec 100755 --- a/pkgs/applications/networking/instant-messengers/qq/update.sh +++ b/pkgs/applications/networking/instant-messengers/qq/update.sh @@ -9,7 +9,7 @@ payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") -urlhash=$(grep -oP "(?<=QQNT/)[a-e0-9]+(?=/linuxqq)" <<< "$amd64_url") +urlhash=$(grep -oP "(?<=QQNT/)[a-f0-9]+(?=/linuxqq)" <<< "$amd64_url") version=$(grep -oP "(?<=/linuxqq_).*(?=_amd64.deb)" <<< "$amd64_url") amd64_hash=$(nix-prefetch-url $amd64_url) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 74b34d4d3e980..dccdf634b599e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-6fnO/e5lFrY5t2sCbrrYHck29NKt2Y+FH0N2cxunvZs="; + sha256 = "sha256-P6ia7IU6OQJQXANy1snIZEqarKUcRmgbkP6L+UMwi+8="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index f612ec524a7b1..99c7cbbc7d8ee 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -6,7 +6,6 @@ , qtbase , qttools , qtmultimedia -, qtquick1 , qtquickcontrols , openssl , protobuf @@ -38,7 +37,6 @@ mkDerivation rec { qtbase qttools qtmultimedia - qtquick1 qtquickcontrols openssl protobuf diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index d3c6a33d248bb..63d8b250b96a7 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.9"; + version = "3.9.10"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-50mVmE+q2VYJXIv2iD6ppS83We0aJRT9vje+zpJcdq0="; + hash = "sha256-VLHkFiIwfjCHr08wTsD8rMWSvHEswZCKl2XJr61cQYE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 7989713d4a3d2..214551cf237cd 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.11.3"; + version = "1.11.4"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - hash = "sha256-HdgW7Ls0h75BXKXGzzf37K9w4bgkfA9eAUEmBrSDT+U="; + hash = "sha256-fSa113BYpTZ4jvxroQsoslAkWfQr4/ROkgVOFyiVsKQ="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a18afedaecdc3..0e66707349dbc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.38.0"; - hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0="; + version = "6.39.0"; + hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.39.0-beta.2"; - hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko="; + version = "6.40.0-beta.1"; + hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 38719920d8a22..aec46a8c0f6bb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -15,6 +15,7 @@ , at-spi2-atk , cairo , pango +, pipewire , gdk-pixbuf , glib , freetype @@ -150,7 +151,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc pipewire ] }" # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043 #--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 9d639817c39f9..91be487a264f2 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 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20231107-1"; + version = "20231114"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-5JF/cU2yz1TDKUSAiZJ5LQfvsGSQtuww543O03gkZ+Y="; + hash = "sha256-5ZDHAv8le1MLS394fto4Rg19J/b2QkZZ70Sn0Yap/hs="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 266c843931b64..5d5c8301378df 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.106.0.212"; + version = "8.108.0.205"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-TlqhCj5nyL8SEo3M6ahPLYOTDrEjHvxtu1qFSR8LtkM="; + sha256 = "sha256-9V+/tTFco69NkCeswbGobr3ZxcS3q+Zd7fiei4N8uTY="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; 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 2ff8a8d81a89c..a30f5be4ce9f3 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.3.18"; + version = "1.3.19"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-evOwjHUmeGw8AUpXSig8zVW2cpJbWkNTH/RUuNipFsQ="; + hash = "sha256-+n26VTNRymPdzMbSz8AZsQ73xOHizOFAstw6toKfZQM="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tMC8/qHYli7+OTdxVWRDEyCNzrkYA+zKlHJXlTsl+W0="; + hash = "sha256-SxUdTzk8WngkKwT05U8HJsK8+8ezcJWdiT/ettxpeEE="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Unofficial Microsoft Teams client for Linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly ]; + maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index b5879ffe5b465..694021d0f7fe2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -82,15 +82,15 @@ stdenv.mkDerivation { }) ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' + rm -r src/third_party/libsrtp + cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp + '' + lib.optionalString stdenv.isLinux '' substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index c6191e8b47761..83a4f48142f11 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -60,6 +60,9 @@ , mm-common , rlottie , stdenv +, darwin +, lld +, libicns , nix-update-script }: @@ -72,6 +75,7 @@ let tg_owt = callPackage ./tg_owt.nix { + inherit stdenv; abseil-cpp = abseil-cpp.override { cxxStandard = "20"; }; @@ -100,20 +104,22 @@ let perlPackages.XMLParser ]; }); + mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.11.6"; + version = "4.11.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-GV5jaC1chm4cq097/aP18Z4QemTO4tt8SBrdxCQYaS8="; + hash = "sha256-VuMcqbGo1t1J7I8kXdqsw/01Mth9YKEbiy8aNtM3azw="; }; patches = [ + ./macos.patch # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 @@ -123,7 +129,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -143,39 +149,45 @@ stdenv.mkDerivation rec { cmake ninja python3 + wrapQtAppsHook + ] ++ lib.optionals stdenv.isLinux [ gobject-introspection wrapGAppsHook - wrapQtAppsHook extra-cmake-modules + ] ++ lib.optionals stdenv.isDarwin [ + lld ]; buildInputs = [ qtbase - qtwayland qtsvg qtimageformats - gtk3 boost - fmt - libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus + range-v3 + tl-expected + rnnoise + protobuf + tg_owt + microsoft-gsl + rlottie + ] ++ lib.optionals stdenv.isLinux [ + qtwayland + gtk3 + fmt + libdbusmenu alsa-lib libpulseaudio pipewire - range-v3 - tl-expected hunspell glibmm webkitgtk_6_0 jemalloc - rnnoise - protobuf - tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre @@ -192,9 +204,44 @@ stdenv.mkDerivation rec { libsysprof-capture libpsl brotli - microsoft-gsl - rlottie - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Cocoa + CoreFoundation + CoreServices + CoreText + CoreGraphics + CoreMedia + OpenGL + AudioUnit + ApplicationServices + Foundation + AGL + Security + SystemConfiguration + Carbon + AudioToolbox + VideoToolbox + VideoDecodeAcceleration + AVFoundation + CoreAudio + CoreVideo + CoreMediaIO + QuartzCore + AppKit + CoreWLAN + WebKit + IOKit + GSS + MediaPlayer + IOSurface + Metal + NaturalLanguage + libicns + ]); + + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; cmakeFlags = [ "-Ddisable_autoupdate=ON" @@ -210,13 +257,21 @@ stdenv.mkDerivation rec { export GI_GIR_PATH="$XDG_DATA_DIRS" ''; - postFixup = '' + installPhase = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r ${mainProgram}.app $out/Applications + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + ''; + + postFixup = lib.optionalString stdenv.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/telegram-desktop \ + wrapProgram $out/bin/${mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + '' + lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -231,10 +286,9 @@ stdenv.mkDerivation rec { the MTProto secure protocol. ''; license = licenses.gpl3Only; - platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - mainProgram = "telegram-desktop"; + inherit mainProgram; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch new file mode 100644 index 0000000000000..c8424359fdbfd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch @@ -0,0 +1,69 @@ +diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +index ef544803e9..69c61b3139 100644 +--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { + [window setTitleVisibility:NSWindowTitleHidden]; + [window setTitlebarAppearsTransparent:YES]; + [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; ++#if 0 + if (@available(macOS 12.0, *)) { + _data->topNotchSkip = [[window screen] safeAreaInsets].top; + } ++#endif + } + + void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +index 7ce90d3..dac3c2c 100644 +--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; + + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; ++#if 0 + if (@available(macOS 12.0, *)) { + [center + addObserver: _observer +@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + name: NSProcessInfoPowerStateDidChangeNotification + object: nil]; + } ++#endif + [center + addObserver: _observer + selector: @selector(powerStateChanged:) +@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const { + return std::nullopt; + } + NSProcessInfo *info = [NSProcessInfo processInfo]; ++#if 0 + if (@available(macOS 12.0, *)) { + if ([info isLowPowerModeEnabled]) { + return true; + } + } ++#endif + const auto state = DetectBatteryState(); + if (!state.has || !state.draining) { + return false; +Submodule Telegram/lib_webview contains modified content +diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +index 738e574..80ff5f0 100644 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -254,10 +254,12 @@ void *Instance::winId() { + } + + void Instance::setOpaqueBg(QColor opaqueBg) { ++#if 0 + if (@available(macOS 12.0, *)) { + [_webview setValue: @NO forKey: @"drawsBackground"]; + [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; + } ++#endif + } + + void Instance::resizeToWindow() { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index c26bebc8a893f..dddbfb799396c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -4,7 +4,7 @@ , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, mesa, libepoxy, libglvnd, unstableGitUpdater +, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin }: stdenv.mkDerivation { @@ -24,12 +24,28 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg libopus ffmpeg alsa-lib libpulseaudio protobuf - openh264 usrsctp libevent libvpx + libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp + ] ++ lib.optionals stdenv.isLinux [ libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi - glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio mesa libepoxy libglvnd - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + OpenGL + Metal + MetalKit + CoreFoundation + ApplicationServices + ]); patches = [ # GCC 12 Fix diff --git a/pkgs/applications/networking/irc/halloy/Cargo.lock b/pkgs/applications/networking/irc/halloy/Cargo.lock index 5d545ee3d1f0d..ccb4789706316 100644 --- a/pkgs/applications/networking/irc/halloy/Cargo.lock +++ b/pkgs/applications/networking/irc/halloy/Cargo.lock @@ -146,6 +146,134 @@ dependencies = [ ] [[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "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-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -212,6 +340,15 @@ 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.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -231,6 +368,21 @@ dependencies = [ ] [[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] name = "bumpalo" version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -313,7 +465,7 @@ dependencies = [ "js-sys", "num-traits", "serde", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -413,6 +565,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" [[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -474,6 +635,15 @@ dependencies = [ ] [[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -532,6 +702,16 @@ 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 = "d3d12" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -568,6 +748,27 @@ dependencies = [ ] [[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 = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -629,6 +830,27 @@ dependencies = [ ] [[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -679,6 +901,12 @@ dependencies = [ ] [[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.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -828,6 +1056,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,6 +1112,16 @@ dependencies = [ ] [[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.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1020,6 +1273,7 @@ dependencies = [ "iced", "image", "log", + "notify-rust", "once_cell", "open", "palette", @@ -1085,6 +1339,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] name = "hexf-parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1523,6 +1783,19 @@ dependencies = [ ] [[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 0.3.23", +] + +[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1778,6 +2051,19 @@ dependencies = [ ] [[package]] +name = "notify-rust" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1982,6 +2268,16 @@ dependencies = [ ] [[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 = "ouroboros" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2038,6 +2334,12 @@ dependencies = [ ] [[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] name = "parking_lot" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2191,6 +2493,22 @@ 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 = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2553,6 +2871,17 @@ dependencies = [ ] [[package]] +name = "serde_repr" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] name = "serde_spanned" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2574,6 +2903,27 @@ dependencies = [ ] [[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-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2771,6 +3121,16 @@ dependencies = [ ] [[package]] +name = "tauri-winrt-notification" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +dependencies = [ + "quick-xml", + "windows 0.39.0", +] + +[[package]] name = "tempfile" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2835,6 +3195,22 @@ dependencies = [ ] [[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] name = "tiny-skia" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3008,10 +3384,22 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] name = "tracing-core" version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3038,6 +3426,22 @@ dependencies = [ ] [[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[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" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3149,6 +3553,12 @@ dependencies = [ ] [[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3542,6 +3952,19 @@ dependencies = [ [[package]] name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" @@ -3635,6 +4058,12 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[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" @@ -3647,6 +4076,12 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[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" @@ -3659,6 +4094,12 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[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" @@ -3671,6 +4112,12 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[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" @@ -3695,6 +4142,12 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[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" @@ -3816,6 +4269,16 @@ dependencies = [ ] [[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.2", + "winapi", +] + +[[package]] name = "xml-rs" version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3837,6 +4300,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[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", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.2", + "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.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 = "zeno" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3850,3 +4379,41 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[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/networking/irc/halloy/default.nix b/pkgs/applications/networking/irc/halloy/default.nix index eb54490c60b68..1c88cb3727fea 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 = "2023.4"; + version = "2023.5"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-j5Yw7rXdNd32RnbV2jQ+ZUjbm14AKZ7khQNX6A+qPAM="; + hash = "sha256-XGNFLfZDDGTT55UAsapUf1B0uSzrNjwSRK+yQSU3wG0="; }; cargoLock = { diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 75c69596ddd57..117fbc850d063 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.23.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.24.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-ycXn8h8sFGJXVMldneN51lZgXoPaZ/XeXLtqqJ4w6H0="; + hash = "sha256-stSjLvg8G1EiXon3Qby4wLgbhX7Aaj9pnxcvE32/42k="; }; # tarball contains multiple files/directories diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 019da46951241..719b730817b41 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -3,14 +3,14 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_21 +, protobuf_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; - protobuf = protobuf3_21.override { enableShared = false; }; + protobuf = protobuf_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index 87e0eb25dd404..09987ab587195 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -60,6 +60,7 @@ let homepage = "https://localsend.org/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; + mainProgram = "localsend"; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; }; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index c5a07a89c35e2..bcd9573974d35 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,40 +1,55 @@ -{ lib, python3Packages, fetchPypi, notmuch }: +{ lib, python3Packages, fetchPypi, pkgs, testers, afew }: python3Packages.buildPythonApplication rec { pname = "afew"; version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; }; - nativeBuildInputs = with python3Packages; [ sphinx setuptools-scm ]; - - propagatedBuildInputs = with python3Packages; [ - python3Packages.setuptools python3Packages.notmuch chardet dkimpy + nativeBuildInputs = with python3Packages; [ + sphinxHook + setuptools + setuptools-scm ]; - nativeCheckInputs = with python3Packages; [ - freezegun notmuch + sphinxBuilders = [ + "html" + "man" ]; - makeWrapperArgs = [ - ''--prefix PATH ':' "${notmuch}/bin"'' + propagatedBuildInputs = with python3Packages; [ + chardet + dkimpy + notmuch + setuptools ]; - outputs = [ "out" "doc" ]; + nativeCheckInputs = [ + pkgs.notmuch + ] ++ (with python3Packages; [ + freezegun + pytestCheckHook + ]); - postBuild = '' - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py build_sphinx -b html,man - ''; + makeWrapperArgs = [ + ''--prefix PATH ':' "${pkgs.notmuch}/bin"'' + ]; - postInstall = '' - install -D -v -t $out/share/man/man1 build/sphinx/man/* - mkdir -p $out/share/doc/afew - cp -R build/sphinx/html/* $out/share/doc/afew - ''; + outputs = [ + "out" + "doc" + "man" + ]; + passthru.tests = { + version = testers.testVersion { + package = afew; + }; + }; meta = with lib; { homepage = "https://github.com/afewmail/afew"; diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index c98e80b2deea6..7febb62a0f396 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.3.2"; + version = "115.4.2"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb15"; + rev = "${version}-bb17"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-6alAGEid7ipr01I52TB0xrlLroCIc03N2IagGJq8te8="; + hash = "sha256-hfM1VzYD0TsjZik0MLXBAkD5ecyvbg7jn2pKdrzMEfo="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-kn35avKqUdMix8VJrKJjSWViMLe/WnnxNasPpM7/cdM="; + hash = "sha256-PAjj7FvIA7uB0yngkL4KYKZoYU1CF2qQTF5+sG2VLtI="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 2ae02236fe078..51f6eeacd1be7 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,7 +31,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true -, enablePluginFancy ? true, libsoup, webkitgtk +, enablePluginFancy ? true, webkitgtk , enablePluginFetchInfo ? true , enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar @@ -67,7 +67,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } - { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ libsoup webkitgtk ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } @@ -96,11 +96,11 @@ let ]; in stdenv.mkDerivation rec { pname = "claws-mail"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - hash = "sha256-sYnnAMGJb14N6wt21L+oIOt6wZNe4Qqpr7raPPU6A0Q="; + hash = "sha256-fIqxcy10GX3wbWGmt+vHxYDs9ukuse9q5bAQdTPxrwc="; }; outputs = [ "out" "dev" ]; @@ -136,8 +136,6 @@ in stdenv.mkDerivation rec { "--disable-manual" # Missing docbook-tools, e.g., docbook2html "--disable-compface" # Missing compface library "--disable-jpilot" # Missing jpilot library - - "--disable-gdata-plugin" # Complains about missing libgdata, even when provided ] ++ (map (feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags) features); diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 4f61935faac16..702e92c04c325 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - hash = "sha256-aAqkltVxIlGwRVGM+1QkrVgfnitl+D3Xb0qi0o8ow+Q="; + hash = "sha256-6dTAPetJgYrvIEtu+2QxcBOeYFZfN/dFhM0CZFzcC/E="; }; nativeBuildInputs = [ @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { openssl (lib.getLib udev) libappindicator + libsecret ]; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 9ac8c83dc5e70..fccca24f9d288 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch (fetchpatch { + # https://github.com/neomutt/neomutt/pull/3933 name = "disable-incorrect-tests.patch"; - url = "https://github.com/neomutt/neomutt/pull/3933.patch"; + url = "https://github.com/neomutt/neomutt/compare/f624551b86cdb53224b5b48304a808ca2815111e...a9a1d99e6c0fdf367188125451300fa89d3e801a.patch"; hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; excludes = [".github/workflows/macos.yml"]; }) @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ]; + maintainers = with maintainers; [ erikryb vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 634e9ef358890..715ede00bda66 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.4.1"; + version = "115.4.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/af/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/af/thunderbird-115.4.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "984a5d9cd2f6ae70548c8b0453b7a3e0b50c18723215c158d20694d89027c85b"; + sha256 = "f6cb9c8a8069e430f2a11961880f0484ef0582ee98cd6cefc4136fe62882526b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ar/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ar/thunderbird-115.4.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9faa60b0ac4fbf396f4124113832024324a927bd1ad01275b8b11df27c75d29e"; + sha256 = "a3bf45d4268bb2af5ae843e54e32c7bf879666113a76d6091b2b1b8f4a3afd05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ast/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ast/thunderbird-115.4.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa855f0d40993560f643c22d7781ce2587788e7e7f6aca1612180fe54dbdc11d"; + sha256 = "e14679065a5ef9825473749929086715d21c899ec03760d66420098af78bd364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/be/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/be/thunderbird-115.4.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "654ddfb82edbfedd07a83947fe1d0c9d08456841cbaefc6abc042203bc25cd24"; + sha256 = "cad53df572751af17c38ff18aed28ec65d376a02050e8341d76a96cc5e21e3c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/bg/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/bg/thunderbird-115.4.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "59904cc762ff431031a9de37267bd1610a0adbc8adb2300b98636d7c2fb1e7fc"; + sha256 = "ae6eb58bc7b7036a4a5283f9968cb734a9e3f5caf680cd9565a71a3a4b5fbb81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/br/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/br/thunderbird-115.4.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6fd568603e1672f415a3c96cb81491281156c4ab3c1c49a1b8798a1a7c3d92b0"; + sha256 = "763d2ca13ffe77f5cd7d8e65a1b99d13de48e44ca6e4069dd263354eac1b5ec5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ca/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ca/thunderbird-115.4.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c1387f5c9b51c4a30269f72a65b6bb525e9c61db9c78bfd02e09ee8a3d94f250"; + sha256 = "48eecfd0f6156bf8e1e065a1a26c78486876f32f08cee4ff864316a351518ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cak/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cak/thunderbird-115.4.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "bfc5c46c935df1c6fe5c407b0b92adf35b00b31e3689ecefaefac59a0f7f9903"; + sha256 = "412ca26696c0f75b265c4f14d8edf1274427b641062ec30e1b3f81bb4816bdc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cs/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cs/thunderbird-115.4.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3eeb5619ec3804fabe40c6a8c68df9a28f41dc40f250fb4ca0e825595825bb34"; + sha256 = "52348c625287a7ab209e714b3bb05f5bacd51d8ffe9d4adf978b6970ff0c605c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cy/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/cy/thunderbird-115.4.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "71e11762188bd2f4476b722e8ac8302792ef6d1b4c07eb54affbc1e161376fd3"; + sha256 = "3249849916c27cc1cea3e8414c89fbb96a95654aa9d9d13c513e8ae3ecac2241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/da/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/da/thunderbird-115.4.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "108dd7e1910fe0773ba08250b7d6e09a63ae805b596da9ecdeb23c93cd25f4c2"; + sha256 = "8e0531a525128b4b02547b11b48a7938c18356bc2cc8bfe7f86841bfc188656f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/de/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/de/thunderbird-115.4.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8632aaec06d4f41403631c7d8a777c151aa2ca78c6342e49bbda1551316812c6"; + sha256 = "f60fc1958d29faf1047ea7eaeb900a02351e569685dd4c3594db45edb97905b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/dsb/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/dsb/thunderbird-115.4.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "20334b09cbdcf1ce0c9a7a3545283d69952976adc363856394209e34fd0802c6"; + sha256 = "5953e818188ec5c4780a45dfe8ca576a3a3b9f8cd196ff81a380e161a6ae10d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/el/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/el/thunderbird-115.4.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c519b753f81f92f437cfd4bb9d11423c69195ca4de6dfce227af4408f26d09f8"; + sha256 = "e6f5021f37bb842aa9baef26dd4895a028d7c81345acaa13b2be027392a5818b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-CA/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-CA/thunderbird-115.4.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1a899fd1bbf89adc9e149cb16fccf46c1881ee1f36b75f62fd70f9af1db5faaf"; + sha256 = "991533bc7344cba739e95e0e979e724070bda14df8de43dacc1dec4cfa1cdc89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-GB/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-GB/thunderbird-115.4.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "156d6dcac9653b69875c751cad090d77adc35118df051ca5ce1cb384f28ff7a3"; + sha256 = "ccb93e3d905481c45756edc8926ff9999a1d697a428a3a31b9ed3c366aa9e325"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-US/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/en-US/thunderbird-115.4.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "80f9534e18ab00956410374b800db21e7a79eab4f9e452b2a908b4e29d708f1d"; + sha256 = "3f7571801f390131dcf98bf97565391b35ea883a1a835229c5ed6c790f1bdfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-AR/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-AR/thunderbird-115.4.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "606ce30a8f0005953791ba1a3c612809e1d875ebe1cc257afd4d6a0447ce557d"; + sha256 = "39562a107559766857a369b4a2d48273c852548564a1b5a145c75ed5073d6362"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-ES/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-ES/thunderbird-115.4.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "fa41210efdd8f7086db9fbebb54730079e555a3a316b3d5fea3fb015ad4696fa"; + sha256 = "b246ca331d7626477203a720318394d4750da96eb0e66336ffd4e34f345bc9f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-MX/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/es-MX/thunderbird-115.4.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d5d8c3e7daed458c0445cfb42d046e3d81f65b84f0510348d42f17651e3e598a"; + sha256 = "9860008e2344e7e42e7856ee83f384c4f13fa8bcdb06c9dce7a5536449c3955f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/et/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/et/thunderbird-115.4.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e94ba80c70ad4a6dd11257b2a456226c96df4f8da7908618b0460625932e3276"; + sha256 = "a4b3beed7208991ddecf91f2c92586f5267daf862feb228688192c3d2ce3695d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/eu/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/eu/thunderbird-115.4.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2055513d9741fcef221308ce61354df4d22276e088ccd9ae6430ccf82368252a"; + sha256 = "f75f7557ca1b920a68f52c39c97952741cebe7bb4fa1222f0db8e11cad9ee00f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fi/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fi/thunderbird-115.4.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c916c8dc7a3d064cb7d6036722e3f2a010dc12e6564608cdad329628691c3e83"; + sha256 = "c064953b062e8c29b880cd07b504d36d26fc909bc0a7a6728af964bc845ebe0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fr/thunderbird-115.4.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2b6e1711762e8c00b87f37461df628e0d45d15f1ac1b19ffdd94ef6c470c9caa"; + sha256 = "e49b72d8258d4140494d7f4ac44bae0fec2bfaf19adb4e186b65cc1acd9d912d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fy-NL/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/fy-NL/thunderbird-115.4.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1a44264af2d0bedfe930ee09b1036f76fc7f6612f3852ef9b2cfd7ac0dc66fff"; + sha256 = "4485958ba2c9f2f23b9bc7e698a85e16299c359111cbb99221d0edacfc263360"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ga-IE/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ga-IE/thunderbird-115.4.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "fbb59c517f4e24e18da62eecb5f4bb9312d6987fbba472b3d7c095b42f5658ec"; + sha256 = "8153c43633a6b0cd66aaedd3d71b91f3eb7697f1985909f295d70b87ed5a1c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/gd/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gd/thunderbird-115.4.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "220f166ef4b1cc5d2e36e4a8cf5ae0ee4ad529e97442e9f41c3efac7a09f486c"; + sha256 = "ac847943ca5da90e8dd2c3041cf960b6f5a84d648a17f3441fa6bb2ccc0829e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/gl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/gl/thunderbird-115.4.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b73e8ae380b8f659d6a96afde2d9c63b280c0741201311abe9b3ba244700a46f"; + sha256 = "5dbbe07d7ec93d852c46a45aa919b05956f1630352547efd86ba90ba37ce8969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/he/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/he/thunderbird-115.4.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4a286adf9815f199e9cf0d10f3ba5e1fcb55e44a7e7b7945baa4196458968c3a"; + sha256 = "8628fce18ee60217944cc21312ba4df777bc90091bc77424ca2012e8aecbb9e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hr/thunderbird-115.4.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a362008a5e567e2f17f1236c661356ff9a366d014e7449b5fd4dab68f69dfaa6"; + sha256 = "8829ad3546b7e12a9cefbd993083733d876752aa03a41236668eb84565c235e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hsb/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hsb/thunderbird-115.4.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e2cfa6ea00d866ea019184f97ae4aa2c390849a135924852aa03dc0feb980c2f"; + sha256 = "e55e7006c6e80c1bc2d59e41a4475be97abfd385c4433bdd3d3b9d633a7c4a45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hu/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hu/thunderbird-115.4.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ddb3f51aa4c597a0162ff3f84cde69b885fed79ba641bba29e18016d8f2214e2"; + sha256 = "77d5dc64238ec7914b7fce05fa94d2a5d8e11928380ee1d0322c414d69aa5a2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hy-AM/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/hy-AM/thunderbird-115.4.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f08d5845354b7fc90aabfe363b4b4f4b4c7f07c9f5d982942647677f78be0fa6"; + sha256 = "2bb6da6af7201d25e7c11895dc969e5f17dd3a5bed963ec930eab091e706bcbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/id/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/id/thunderbird-115.4.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "61ae2261379a7e31c0ee9c6a949a03bb4853bcf813eb647eb2f30239516085d5"; + sha256 = "8db39f0b0aeebd47c6db4dee6057053b578b3d6c09668a0d64c3141c80421821"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/is/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/is/thunderbird-115.4.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ffb985a0f75c9bd56ae7e344791e86fd2a9f17007050b62fda2886547cd56334"; + sha256 = "a23ed8b9e000eb5579b710706e656d66667b384af0d3ddb7530ce85733c75233"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/it/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/it/thunderbird-115.4.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e8dc54db11815ae9e891f2c79c5e5218147d6694bc7055e933a0397c1619fd61"; + sha256 = "7f7f89bcf11366e7b1485b8e26aef44fd565c8d4d67839473171517a8a9f074f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ja/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ja/thunderbird-115.4.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a510a719215362a33ada3a29641a3999656fa73c5f2ea1cdc2c5c3b2b539f9ec"; + sha256 = "2da90acef62b2d1f4b5c70a857a58bceaaa59eea06cd5c55476c2d555bda66d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ka/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ka/thunderbird-115.4.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6b4d0240dc65f3544f2b3c32876720783f179298fa575f8445b4d45449485742"; + sha256 = "e7722b2a7118d2ac5991ba535a277acf2ffd1f6e56f36f7a2f35b465eed1657a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/kab/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kab/thunderbird-115.4.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fa672dbdf6aa3ab56f1ec4ca741d01a0a0fa7ddbf0f1195824775a8990a65d33"; + sha256 = "e5d30697c976c25ff3845b3b83f98097cdb4aa0350c8362ddd0b9aaf68c63fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/kk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/kk/thunderbird-115.4.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f7cbf9147a4a7bed00e9dc52a6bba898b49aabe9e4daf0154a28662b4d16683b"; + sha256 = "f952cee1fa3a054683ebfeb256293a0172ab63806af2481980ca527a07f5b383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ko/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ko/thunderbird-115.4.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d95727839f9d348d67371c01dec0eb2ee874d36631fb1fcf5441774fdc2bcd9d"; + sha256 = "d0589966a1853541260b11f0848dc2621ef52f83426a2bd6115f0b28038289d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/lt/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lt/thunderbird-115.4.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cf87612f4d8ddddd0c1ce141c0edcec1bdd15ab73d51d5e83855694bc76e1a8c"; + sha256 = "4d1680aa863f93db1f800f0dcf35496fc4bf777ffc7eb7c853f84629054f53af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/lv/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/lv/thunderbird-115.4.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "228523902e069aef7c50a2a72fc5d7cdd987e896b263f91583ee8b5dfed36c49"; + sha256 = "24571d6977a3bf99a636598a527875f5037e290807ea1884583739df7cc3d0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ms/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ms/thunderbird-115.4.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ab13e157ffcf8949e23c704726ebcc656debb259deebe3897b7d9d4ad8b45464"; + sha256 = "937936b0e31500ff3c2e34090f79e158d23869faf829eed5d855c83c49946b38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nb-NO/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nb-NO/thunderbird-115.4.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d64a6286e3ce5a3dd28e43bfd7ba483587d42bfe9037e478a286af704b7cfb88"; + sha256 = "3084fed2561faf59c1ec4f75e6001181db689086daf8014a370c13f0709b1916"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nl/thunderbird-115.4.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3fa698cc239ae0bb0bd5d0984600f8b274e83528c42a62f20815245990fbdf4c"; + sha256 = "54f1294805f3899917cdfe3cd6e5dcc5ed054312d7a88fe89bab4d96a2bee1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nn-NO/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/nn-NO/thunderbird-115.4.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a811b1113f8490c7cf92bca1df2895d7253a07c7f59e3f70d26b3929b7c9b8a9"; + sha256 = "fa43ea181404914a61e790aab79538848f4a4c889f331795c7128360cd06f070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pa-IN/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pa-IN/thunderbird-115.4.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "766e77b7a863d6db6b8da29d351650a921bc34742a6a1e389101ed74b41d7e45"; + sha256 = "95276577202c4214712f8b53270cc67c46004842d3d508003e0de9568128b44f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pl/thunderbird-115.4.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7dff7fb5255688e75cdde4189de8c8b2e0c0c9f94e6928819282669b35f4b2fc"; + sha256 = "d9f440c272f9a7ece1e0d93beb29c42eb7cc9058a46c9876e9643485ef203eeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pt-BR/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-BR/thunderbird-115.4.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5c55931aad41a8a801805b9b59d6698ede34cf4613205cac7591e112051e29d5"; + sha256 = "65ab26c8db2e47bd33cdbd054b053116abec1229fb852ff9a2a6e08989d17214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pt-PT/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/pt-PT/thunderbird-115.4.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ea4cc3fd7cffa2d18e66dc1137da283157ebfda7fe4289059bc2fa0506385582"; + sha256 = "d2313d541e70bb5884a32d3ba47f2c08f605a7eedab03043070c9ff4e1e70238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/rm/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/rm/thunderbird-115.4.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa04eb51601d0d777ae785acac0a6e573fb92d2f3d0fed0d2c4bcc7b54384f9d"; + sha256 = "099c226a5cb0b0f33c55132f93422d7a831a0db701c2d35fe9b15187fb661e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ro/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ro/thunderbird-115.4.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "478109fd6564c4dd08629fdae951331c0c1e49f245a3ee9fd875ae4bfeba39eb"; + sha256 = "495819d350ee091fd70134e7614fc53a77898563cc001e16b90befeddd6097c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ru/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/ru/thunderbird-115.4.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "708f01aa9736c21bc261054b4b71114752621ddabfc6b373c76411fa777cdc46"; + sha256 = "b230727076e96b9343b16ebdeaa81d4bafe9aa7cf7b505e0ff80a69eb5524f77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sk/thunderbird-115.4.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bdeee131a254dded4975e613d66f3c127736c4fd982a63d5c2de1fd3ab08c14e"; + sha256 = "38957f7a5d76b613b5d0e72282556f04d9c5ddc145ce2082a047a2ef57cec1af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sl/thunderbird-115.4.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "38e9e1b964a599d46143a2255ef7d01e97f1e519b333e578cb5c6f8f1b48e7cc"; + sha256 = "8ea2a350f4eb609cb5ec9cffabfc3af342ddf34612368acd272c8658ff382fab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sq/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sq/thunderbird-115.4.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1b6c3b84b123655088a49785bb7347ae8b4014677e12aa5e0a591f380962c7a2"; + sha256 = "cc33784f9b3b255ef63007ac348d0c995a41716c6cec9a1b93a21c6881908837"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sr/thunderbird-115.4.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "17bdc9c1bfaa2c320f196c6847606c0085c92fc15c2870b00f15481f1db7f119"; + sha256 = "2e1013b838117e10bcc66f320df8095ccdf0338c76dc8cd8737357b2bbcf77b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sv-SE/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/sv-SE/thunderbird-115.4.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "371b7bb4c3c2870c8cf61fafe42b281e3de960d26c83de3d07b55e68bf2e9ff5"; + sha256 = "23942d8165eb78889890269b82e0404984f89e636ed050b7d14a5625dc889aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/th/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/th/thunderbird-115.4.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c2e73af892e0e8fe968017e8337980c33ca2e960b607db7e8d2c5c3479e4103f"; + sha256 = "c6d83bda21db67bcecb4923f68c5a311edf14749a04726457f251bdc14d18d71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/tr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/tr/thunderbird-115.4.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "58fe07598a46b89f88bb6f543c2627cec64a27adf8cf8c067e2c9cd313823529"; + sha256 = "72429c1ce1a44bc0a55973b31ace62f1dd408e8aab2e84483414bd5d09b0533d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/uk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uk/thunderbird-115.4.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d9471d2dab40fad2cc860c1c8d61e447a22c896b1e55b2fc6fd9371d0ddbbe2e"; + sha256 = "2dc323d8b0a5f3636d938e08245bd66624b4c1388078fa06acda9da12a250585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/uz/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/uz/thunderbird-115.4.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7208f963139afb6bdc6a31a5c756876e25b75dd729a759913abfaaa2ffb3c6a4"; + sha256 = "b79e94e508ed7b4344683a8e56d4417519058a111ac3afcee5242b787e8da403"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/vi/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/vi/thunderbird-115.4.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3001fb66160dc7a4d919e3ceabaf3e1c1edde6e3adfff69ea258d3e4092ae545"; + sha256 = "08d243efb6fb4c7bebd9ccd7720c4b583d30e2cce6142d6769745778aa847f1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/zh-CN/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-CN/thunderbird-115.4.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f10c31a9f5516035b40699512205c14fb52be0bb0bbfabc6f2ef36536c1699df"; + sha256 = "b3fced53a9ffd152a9d7301da4b3119d70e09d38352d997cb1938656d53f4e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/zh-TW/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-x86_64/zh-TW/thunderbird-115.4.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c7554050509eb446a1c0de17f8f2417009ac5185080daf60e40f7cddf48cc08f"; + sha256 = "328bf581c63dfcfe8702e718a1112a62cd3fa544023618282c14111e6586375c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/af/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/af/thunderbird-115.4.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "340b2e82108e0d0ab8980b0df0995fb90ef7869ffe54496cc3538699efb54c6b"; + sha256 = "08383e3f87665461568adcbd7cc12e0811d9e3b52ab51ea32573c851eb59c4cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ar/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ar/thunderbird-115.4.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a3577d6224ad9b4f71dbc28e93fe867843804e2c2e506ab83cf9fdb4915fa965"; + sha256 = "90fe66398616435addf7cd9871c42fe0419089729bf8fc0f9473cd557e32a3d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ast/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ast/thunderbird-115.4.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1d4bba1671d23e9cb66622b8a1db264bd142c6ba4573be090bad847bae96a99c"; + sha256 = "940299f1d667e1b4cce44b1b4d7b26021ee1313fadca391cc18e8551b56ff1fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/be/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/be/thunderbird-115.4.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9535fcc380a092fcb580f172ae72b4616e5a68005b4e8b72b7bfd0e25d19446f"; + sha256 = "7c5fb060a3e269cdc929d190fe96d2e1caf4ec6298e3372314e8fedc1cf64c22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/bg/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/bg/thunderbird-115.4.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7851ef4d8c8ffe3c39b87c75408d5aa2c48dad9bad066308316f9770c75420aa"; + sha256 = "1814d1b9e840261693a2c48124f610c2a3f2da53711799d9b12f1904064b20ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/br/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/br/thunderbird-115.4.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d1928d7d1dadeab49cef49efd55df4c652fb55cbf8f1e91dace8d9aec4bbdeb2"; + sha256 = "7a85ca429f007cccaf44e923084a1eafffd2148303cfd54a991768417dd4a945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ca/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ca/thunderbird-115.4.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "3f9cb1b1335686428a2b38bee4de95da2fe45c31e6c5417789611797413f5bd0"; + sha256 = "3d90952a9becc9da367a16c8606b74debc6eeba66650d8456aba959b5c8af54e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cak/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cak/thunderbird-115.4.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6d01411ae87372d8f3ff108166c513fc3dc28d7475c32ba9077ada8699da6ac3"; + sha256 = "9b27c4bbebb87d079d12c83c2d4aba6eeb778d97afdd28f8df52093cea82a206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cs/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cs/thunderbird-115.4.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "4854ea58c23f3ff702ce55a2f7159e3383beb2a4df468d164e831e999d54d3ae"; + sha256 = "0a50cbaa130b23276ce5b0e58d72f6e7dae1c15c6089cb3aed7148d676244b6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cy/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/cy/thunderbird-115.4.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "42255d0c90bc56f3c580f2a195ed4802eecb0a860d8181e31920c5615019baa1"; + sha256 = "97ec55678e2b4e821b6b33667fa8eb4ab9b66ad39a263eccb13ff4ae4050bb17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/da/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/da/thunderbird-115.4.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "21e793bc846402a5633caf336386281bee63b553954a98e52cab85c134d9c9a7"; + sha256 = "281b4050241ac64eccf5c0c1d077c986b8d9f9dbe7ca39ef25ca5a967d2dba9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/de/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/de/thunderbird-115.4.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a5b87277e4fb238fe3db244aa75bd77cb20f9c964d7a4eaca92252cef0b1d4b3"; + sha256 = "9ccfa1201294f2d9c9d65643f95eeb90dae1cfacff7cb8d81b6760285c382d33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/dsb/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/dsb/thunderbird-115.4.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e0c9d4d7e32a677a51dd0211bcb42ab1545b3580dc0f9d9abb6e3be9a750cc31"; + sha256 = "f71f6b889deeca16de9ccd1c38afa9c9e0cc18a7fcef16cb42c2c5349988a8b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/el/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/el/thunderbird-115.4.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7cc4762d51133a6c9b80a4ece730c98f21e39ce89d8a66a433a503816a5d2e89"; + sha256 = "f6bb942f8ac7a9fd2a73869639646ce7c80f71cf51ec4a35d448ae79a65e0d3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-CA/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-CA/thunderbird-115.4.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b1eda5622f414ba75c5972d6653dcfed7a54ec3eeab7a1fe0eafb07c0998865c"; + sha256 = "52e4f617f06d21b60ae3a41bd053d73a56c05115fcad963b2b4c4eef1e85756f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-GB/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-GB/thunderbird-115.4.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d97bad986e68254c3f92c00ea6c517bd42bb0b8ac2c0a5e39df88543a329e277"; + sha256 = "dba2923a47c12dd14542a27cca051df17c6e00f54eacb2ffe0fbd08730d35701"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-US/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/en-US/thunderbird-115.4.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "2e5807f8c6610aa871b79ea62fc063c5655bad70d019a9525845396b7f85b3b0"; + sha256 = "d42af97a227a9622f246025d522e86ee0274de090c7a007a88e1eed9861be382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-AR/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-AR/thunderbird-115.4.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ff1def53d0391a96aba158dd9b967c303bedf71b4e78419290c745e0a88496c2"; + sha256 = "94d7fe7f3c857086361212ed098087e3bb592fbdfb11845f08f1c531434ad477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-ES/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-ES/thunderbird-115.4.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "bce7dc0d2ac514f1f66f8441a3229920239265c01e3f6a999441c0f0f9806644"; + sha256 = "d014c178c9bb16838fb1b14df01e6b6d5df4c87c4421c4a4fdff4cf17d019285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-MX/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/es-MX/thunderbird-115.4.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a0c6da966679f3eaa93eca1d347b0d221fa26d20b6c01a3544ec5a7519020e26"; + sha256 = "ae785957277ff303e6df28589c1cbb536e98143daefae7d55b95abb327ce97d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/et/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/et/thunderbird-115.4.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6d7f2d67053e5479e2f4f6fb1184901a7fe6f0100f8a8675dde0139195e32da2"; + sha256 = "8138692b55a357f7c00969ced73dcdb03d536806df02905414a589b89026c67f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/eu/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/eu/thunderbird-115.4.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3b4e08d9eccea42976b07b80a9d84a9c2aee4223a83b128c9aa65357cba0d11f"; + sha256 = "14c61bf1db21cf5f3b07e3cde8945135957d8a30aa7fdb0e47e54b10255cf1ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fi/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fi/thunderbird-115.4.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bad3c5047dc9d4283723a6f24113fa93434fd44cbb139dd9420a69a759606675"; + sha256 = "8d3815fca050082244ce006020463588f115bede9a85ab92fd7b5e129e610a7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fr/thunderbird-115.4.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e656c0fe050a4e3c772514f60c6452e8de1f7b14b11b814f20044d32e4bae916"; + sha256 = "3b75ca8cc061aa81fea54c974a796435a20344f43f7aaacdc7fd3e69982f8b0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fy-NL/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/fy-NL/thunderbird-115.4.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2a93d49f76354071f43f549a04b035dd1eb47c1b7c4f4c87de1ad6b519e989b5"; + sha256 = "4fdc9e70b935cc39853a045eef3f5f992dd46327e07ace300307a9a12a188cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ga-IE/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ga-IE/thunderbird-115.4.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c65a11178928b4ddb9febe35e514a8233a7d6560ef3366cf3fd2141ab19735bf"; + sha256 = "01c8c390636fd567ef3f72099f349f7273b0cede1aab69251916f90ea6640817"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/gd/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gd/thunderbird-115.4.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "36ef04774e588691c7722e460c6ac95db528bbad29dde07b3e1d5a569889aaef"; + sha256 = "e92d9c51e1093814d39564c99558d3324c7774f72b7b3baa6f2f09056180b817"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/gl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/gl/thunderbird-115.4.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84c9327c3bd811ab722371a396064689486b36083d36e89fb6f6364670d3d94a"; + sha256 = "0ef59efe918b0a11cf7acbf3cf5faac4fb4fd11dd42c6c2eb74ded8921ce8070"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/he/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/he/thunderbird-115.4.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "abd1a3650e46ffdee5edd3d8b450644b2169650ffd9d75fa0b47c4c5567ebd2c"; + sha256 = "2f4085a6d052147eafceed86dbef1060c9bc6e46483a8dfc4ed6e64ec6906593"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hr/thunderbird-115.4.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0daf5e121293462df3b86018bab57e658602d4fdcd67faf8d7ea8f21aaf7632b"; + sha256 = "1bd34790200a497a85c0c9df008159189183f35752b3a0ee30b7136b0b7bc533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hsb/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hsb/thunderbird-115.4.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4a4e81cee163c24773f7bc03c218611134e1004222ce3573e551f6293d8efd58"; + sha256 = "826501b1ef15b0e29f199d20e306c0da884d147a744dc21600e42c0c5a4552f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hu/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hu/thunderbird-115.4.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f7e8e917827e9c3e52ef48879765258b92fead33bc0e2147a1df6728f6764831"; + sha256 = "c96b3cc9d3cf1ac7426d4368d23efb8ce8421212ea412cee3c35f1fb1b334736"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hy-AM/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/hy-AM/thunderbird-115.4.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4c9cbfd06984815fc61ea98e0c17639c8fca7ebe701a407e841966bb05aa09d7"; + sha256 = "aea19658cc49e236e2e5b9365a89e70e3430f084f4f578c1632dad4158ed386f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/id/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/id/thunderbird-115.4.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3d9eedf96670bb449646b17f5a8a9385855b3854b30b6ba05767b309ba381e2"; + sha256 = "671a7938c700e305575d5afa1cddee2efc272eb42bf25eefa556c9f734593daa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/is/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/is/thunderbird-115.4.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "ee64b52c00a78b4bba3ff14277cee29ce098e2aa28440d034c57769faea9351e"; + sha256 = "a7b0d1de39daa5349bc8fb18e7c873cdaf361b6ab37407ccb0ea727d263bb966"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/it/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/it/thunderbird-115.4.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4c26187f7eb32ee878ca9df24b8416b7f0fa23d739adb9bf4e58bc9d3cb3fe70"; + sha256 = "764a66760083bfd09f073cc88f0cac67cd2712482a833ded3130c4f584d30dca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ja/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ja/thunderbird-115.4.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "1d65c17a94131fc651ca3b9db0e5968434ec60096758f1f2ab5f4ebf4e845a26"; + sha256 = "edbf7f3d41e3828b0092e5dcf0a3338526809b0e8810f9819e33f41b9afbc62f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ka/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ka/thunderbird-115.4.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "da40fa8bc0f1b1dd4f0d3c062cc79e7179d6e9a29a4f80323b9da8b3e5a38727"; + sha256 = "dd74e35eaf32c8c5e5acfa43f4bcf0c9c123eb416ee9602bfa6cfd5476daf267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/kab/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kab/thunderbird-115.4.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fbdfc11b4cc9cb0c92e32e2ab1eba6bfc010a84c964c63a05b3672095f6be438"; + sha256 = "3eca6970ce51a50420a8af1f497e025095e62a591663ee13a50e19344a34f6fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/kk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/kk/thunderbird-115.4.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dd1419aabe279cbf1c182425b8aa57d97d510fd2586a9f63d6619bf52902dc93"; + sha256 = "194f9573ed80d89ebb227cad02c2aadbd2fff7a924efe95836b25b869a776052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ko/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ko/thunderbird-115.4.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9901570e3cb732036b430493cb1a21fa645d33c1ada119e65b434ff481c1e732"; + sha256 = "76de2ae5ccd6ae6e0e0e751b142f3151899d046e27be7244519535ebc2c0e514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/lt/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lt/thunderbird-115.4.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0066a94f77ac6c4602137bef783f45c36b5a0f845c0ad48e7b158c0bd282fd2b"; + sha256 = "1e4031535b0306b9f876ce01dda4913cf7bb2f3506bf3e0a8b095f14f7e75d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/lv/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/lv/thunderbird-115.4.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6abf69968fe1d37096c39f083241afd3e5d2389c929d1939bd8dda6473474044"; + sha256 = "2e92b529ddee80cabf2d9ddaf831c04350a0839ba04945c0bbe944005852971b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ms/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ms/thunderbird-115.4.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "afe39f70b1ba61e4e3260e629dc60adc3430a8478f3508645c4ab1e6353ca6a5"; + sha256 = "ae21aa767a9e0e30a306e87041900e6563654a128b496c26061ae83665ad1048"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nb-NO/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nb-NO/thunderbird-115.4.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "703c9509e2965b5cd9b20204e1e390530896aefc61afada60ceec46657b5c052"; + sha256 = "6af7284b487fd40f2785677b411a2d9a40a17ec40a6d3473709de7e87d069303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nl/thunderbird-115.4.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f8901735d4ac97a8e64fb22ac98f1e249399023853761f404e06ed5bb557d6af"; + sha256 = "0703e2a855aa259e1133390b27c376d6c98fafede9a9629ef970b31a1cf5bf80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nn-NO/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/nn-NO/thunderbird-115.4.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "74f7767af5fc88adc4e65bc14794d193069572378a9314bcb1224a90e4991d0b"; + sha256 = "b40f8ffba3ab3ed6ae27c395d9d9e9106d026c5ca6bec6801560ad75d33b755a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pa-IN/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pa-IN/thunderbird-115.4.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d427a7712ed85b24418f95f8dfbf35c2888bc4f774dddd9594895c3eb30fbbe2"; + sha256 = "fca4d6fe2e4af82920065ec759f44f2032f8a4f237408352ba481552079bb65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pl/thunderbird-115.4.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5dbb18db564a047556eecf848e9c42d39b28dd3b3b4f94be01aba52ed6d09a83"; + sha256 = "2fd14fee330663d551d513c2fc02c8d325180c99bab5199cf03df9d9a0c42297"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pt-BR/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-BR/thunderbird-115.4.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "44097bbfaa7c70687d0ebdab94a3ec1c8db326c4d333ff7167c93f65122d2717"; + sha256 = "90ec7cf1df0e88e40ae1a372d4db118dd4d7395b055e7cf0b137a5a968f0690e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pt-PT/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/pt-PT/thunderbird-115.4.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b4195c7c92d18fcc350925ff867515c2ee619d76ca40d16de18e77a504e7e3a3"; + sha256 = "33ed9c0c2e357694ba2f942f8322bf72b9da7a4ea699c9371f24f4282702c80a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/rm/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/rm/thunderbird-115.4.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b5b1bde8faf2de0e2027b98e2adcaa1cb85b0402c9a4a1fcdebaa2933b5076c4"; + sha256 = "6f42ae9d7c342d4f0c49cb6a40250abc94e3688015d7c2d18b60ea9749482a91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ro/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ro/thunderbird-115.4.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8e0b8e83a86ccde5530604f89ce989d5e701dc2bf07bf57b2637e3a6cbbb28ce"; + sha256 = "21c5a6025a9134beec3647691d0e843e31d28649c2179fdca8b6209cb86ff55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ru/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/ru/thunderbird-115.4.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "347ccd0bdc999131b5ed6cfc3c3c74d522644c918673d19d1b919a07f778bb80"; + sha256 = "e848ff4e0867d346096fe417239ad9ab1c1680f1df5d68622a65340c0579e579"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sk/thunderbird-115.4.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3e0bf1d75d822b5646774d36432d861fea1c8daf848ca434357ac05c49a501be"; + sha256 = "e02d48cb66318cebeb764014e47b4d5f8623d7cbf66f665ff4018dac9656ee4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sl/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sl/thunderbird-115.4.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "88eaaacd0b1f0d1096acfa6a7c9e79b6b1268da35e299fdbe435386323564275"; + sha256 = "c64947d2efb20bd3a9d0371114bc58cfbd6cc903a8ac9233565d38aeea474c79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sq/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sq/thunderbird-115.4.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d95fe0d8a6f960809f85507cf22f6283d97177aa57f802f731519d5c8286502b"; + sha256 = "65291c7a93eaa973410ecc642111030ddd3083a76419c35632bf6d5b11ed9659"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sr/thunderbird-115.4.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "85382234c67e5d4756f2c8d1e69a51918391b361e9bbabfd4509755d3e9bbb57"; + sha256 = "33df374a558e147840773676e8a849d792224a77e3da4dc2366e56d2863962b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sv-SE/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/sv-SE/thunderbird-115.4.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "85f536a1a1fea39bada579df14024228b369daff04cb334e5121df26e9dc9abb"; + sha256 = "2d2a7af5330149a14ff550bf0572226e77cb92529269666ffd05f00b0061f2f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/th/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/th/thunderbird-115.4.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "16aa164a8a874a5e29490e802d081a0ac0e0cc8308294fb7718b84b2f1907dd3"; + sha256 = "4593a11c4ba6ab479734c52ee818ff6b304a74ac94199b77d6f2008f3dabe5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/tr/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/tr/thunderbird-115.4.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "33361a2b058ce97605d6cc49bd8d5f98ff906a033d3d6690a9ead68c5c112a80"; + sha256 = "c363acf14f55c307e9d0a1d9d23dd33f40e72da9c9c22f5ef0c9b9eca13a639f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/uk/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uk/thunderbird-115.4.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "be242d2c67e1bfa8f0a982fdb468ba895e4c20e4048f4558846ef15b3370d9a2"; + sha256 = "b4f356f80d2d8d8167b404553fa3bc55b392157b0ccf70ae471bd91433d58a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/uz/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/uz/thunderbird-115.4.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1ce3c9ba4348e87d91b058d9c86d9f069efce0fdcbde74cb301b97de2cbc0db"; + sha256 = "9a875b9bdf2de6ea3ca5a86381e4f0e02b16940f456bbc86387e1b19aac51efb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/vi/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/vi/thunderbird-115.4.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a7215f92ac980a5dc0d09ecb52185dfd28cb2295cce0f6f443f8820958e6de3d"; + sha256 = "3370cbd9253379c7cc1096a85b8b37d6102e4af9343a303024dc1811b82e2293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/zh-CN/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-CN/thunderbird-115.4.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d1c0b04516aed697a4b93c88a60f3cb0b2ce8479818334b29a262d72afb485d1"; + sha256 = "b85d1962f95954ea8ad8b4306fe6f6bea352c2fc47db039477952bdb69f07457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/zh-TW/thunderbird-115.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.2/linux-i686/zh-TW/thunderbird-115.4.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f689bd01e5a43475247b61c4fc3d0699c13a2ba5cafa13bb8c8eeaa669c29951"; + sha256 = "286e8f3d72f2510919e30989d9c4eca3a3e2e0ef4162400942d5b2fa0777dac5"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index d778bebd12ff6..523a1f3a3904d 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.4.1"; + version = "115.4.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "ccf48a5376027b1e0182d4040a0571e5f34c2378349c0d11cb4e14c75f10247e2522e8d8d2a0a45022ff1a463a49f59b1cf611c70951cf5e1b383051c0573164"; + sha512 = "44cedd5931edbac2ab0babfaf0e71a0262317c01fd7d71e8740bb8f54766c9b49b9e325f1d2796c3a233d4298457d8769b675213a21bef759c46086080bcc8bc"; }; 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 44eba5bc021e7..0d0be882f4307 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.13"; + version = "3.118.27"; 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-3kpfF/XG7w6qUooS5UsntMKnggG1LhmV9f+R35kkmb0="; + hash = "sha256-z2Ir8O7IDiE7cYuLshpMQMnOJanaECUvKlUEyPayIPo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 479d0980919c5..174fa5e9d9f57 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -19,6 +19,7 @@ , libsecret , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, withScripts ? true }: let @@ -124,9 +125,11 @@ let }; in -symlinkJoin { - name = "msmtp-${version}"; - inherit version meta; - paths = [ binaries scripts ]; - passthru = { inherit binaries scripts; }; -} +if withScripts then + symlinkJoin + { + name = "msmtp-${version}"; + inherit version meta; + paths = [ binaries scripts ]; + passthru = { inherit binaries scripts; }; + } else binaries diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 71a53aa3344bd..0904fd5c75807 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { # talpid-core wants libwg.a in build/lib/{triple} preBuild = '' - dest=build/lib/${stdenv.targetPlatform.config} + dest=build/lib/${stdenv.hostPlatform.config} mkdir -p $dest ln -s ${libwg}/lib/libwg.a $dest ''; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 5b493e5460b7a..ffab340d023fa 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { description = "WireGuard automation from homelab to enterprise"; homepage = "https://netmaker.io"; changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; - license = licenses.sspl; + license = licenses.asl20; maintainers = with maintainers; [ urandom qjoly ]; }; } diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 839766e2ac7b9..82f8ec4d55b12 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.154"; + version = "0.155"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "v${version}"; - hash = "sha256-o+JFUraSoQ0HDmldHvTX+X7rl2L4n4lJmI4UFZrsfkQ="; + hash = "sha256-DsoTqZLcZOc3HlpCC8rmu/rcFeHkb9IWd4PSLwxKqJI="; }; nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index b9c88bf3bdc12..d1aef51808377 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -8,6 +8,8 @@ , flask , flask-httpauth , flask-socketio +, gevent-socketio +, gevent-websocket , cepa , psutil , pyqt5 @@ -80,6 +82,8 @@ rec { flask flask-httpauth flask-socketio + gevent-socketio + gevent-websocket cepa psutil pycrypto diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 8a46b5a476c1e..3ca23647251a1 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -16,8 +16,9 @@ let patches = [ # gradle 7 support + # https://github.com/freenet/fred/pull/827 (fetchpatch { - url = "https://github.com/freenet/fred/pull/827.patch"; + url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; }) ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 12aa4b8e508c1..968268adbdd38 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-o9zMGjVCXLqdRdXzRs1kFPDMFJXQWBEtWwIfeIyFxJw="; + hash = "sha256-XpPRiWC4HO8t++Fv4Que6TjwSs+go0K/bJWzmGkbLOY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 78f5b6cf25434..027564ae7a011 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -35,6 +35,7 @@ , enableCli ? true , installLib ? false , apparmorRulesFromClosure +, extraAppArmorPaths ? [] }: stdenv.mkDerivation (finalAttrs: { @@ -134,11 +135,13 @@ stdenv.mkDerivation (finalAttrs: { r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, - r $out/share/transmission/web/**, + r $out/share/transmission/public_html/**, + ${lib.strings.concatMapStrings (x: "r ${x},\n") extraAppArmorPaths} include <local/bin.transmission-daemon> } EOF + install -Dm0444 -t $out/share/icons ../qt/icons/transmission.svg ''; passthru.tests = { diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix index 8af457c7d4c24..843322df55f03 100644 --- a/pkgs/applications/networking/remote/dayon/default.nix +++ b/pkgs/applications/networking/remote/dayon/default.nix @@ -10,21 +10,15 @@ stdenv.mkDerivation rec { pname = "dayon"; - version = "12.0.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${version}"; - hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis="; + hash = "sha256-2Fo+LQvsrDvqEudZxzQBtJHGxrRYUyNyhrPV1xS49pQ="; }; - # https://github.com/RetGal/Dayon/pull/66 - postPatch = '' - substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \ - --replace "Exec=/usr/bin/" "Exec=" - ''; - nativeBuildInputs = [ ant jdk @@ -47,11 +41,15 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar mkdir -p $out/bin + # jre is in PATH because dayon needs keytool to generate certificates makeWrapper ${jre}/bin/java $out/bin/dayon \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-jar $out/share/dayon/dayon.jar" makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner" makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner" install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png runHook postInstall diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 931b788156d38..b159bd0a996ac 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation rec { "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=incompatible-function-pointer-types" ]); NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix index 2a06e3f9da56f..a4b7cf7ccb4af 100644 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -11,6 +11,7 @@ , glib , gst_all_1 , gtk3 +, libayatana-appindicator , libgit2 , libpulseaudio , libsodium @@ -145,6 +146,10 @@ rustPlatform.buildRustPackage rec { install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; + postFixup = '' + patchelf --add-rpath "${libayatana-appindicator}/lib" "$out/lib/rustdesk/rustdesk" + ''; + env = { SODIUM_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 3b0c494bb6f35..c7d4508c060cc 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.3"; + version = "9.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-zoo34mhNZTEwxjSy8XgmZfEjkujmWj34OtDJQSCb/zk="; + sha256 = "sha256-Qt4Y7s2BMwuKXTYjHAzK40HgAsxlk98af3irOXT4/Vs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index fe06e6a09a447..dd94e7bd88d17 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.58"; + version = "3.59"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-4USDCss2KYjyuwH55ZqMwBWsf7iDcjN7qxTSXvKDkus="; + hash = "sha256-askngehfEBJzJG0MVBA4WCRUPDELWlwJWcRPH6gTvzw="; }; - vendorHash = "sha256-cbc6xKAneBCWpc4kUQUtgV5rrsggCGvVkt9tkypeCiE="; + vendorHash = "sha256-o+moq4arkQLQZcsW4Tahpv1MpGRHwMv+IL5E03W0U5c="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index cfb35e526806f..e87ea1bbe5149 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.5"; + version = "0.13.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-+2YYTnQDU9AkCjWvUEsddgu8GVJk0VUCMkEeWhW/u0w="; + hash = "sha256-oUgxYVnSPlUxQW3egZuzGad1IduvG9pvgFiR9jmljQU="; }; modRoot = "./agent"; - vendorHash = "sha256-lZ7W7YpigcVaLO9HoS5V379nyKHemRh9Z2NjlZbJcPg="; + vendorHash = "sha256-SNQuw9RRWuRndUwUiXwGs95CrXRrk72Gey5h1rtwWeo="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index 419fabc9348f3..bd571b1aed356 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, backintime-common, python3 }: +{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }: let python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]); @@ -21,6 +21,29 @@ mkDerivation { preFixup = '' wrapQtApp "$out/bin/backintime-qt" \ - --prefix PATH : "${backintime-common}/bin:$PATH" + --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" + + substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ + --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + + substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \ + --replace "/usr/bin/backintime-qt" "backintime-qt" + + substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \ + --replace "'which'" "'${lib.getBin which}/bin/which'" \ + --replace "/bin/su" "${lib.getBin su}/bin/su" \ + --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \ + --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ + --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" + + substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ + --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ + --replace "/usr/share/backintime" "$out/share/backintime" + + substituteInPlace "$out/bin/backintime-qt_polkit" \ + --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + + wrapProgram "$out/bin/backintime-qt_polkit" \ + --prefix PATH : "${lib.getBin polkit}/bin:$PATH" ''; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 9df26b6bb8453..1baf1c40eb14b 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; + patches = [ + # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 + # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 + ./rsync-fortified-strlcpy-fix.patch + ]; + buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd diff --git a/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch b/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch new file mode 100644 index 0000000000000..296445b4bb563 --- /dev/null +++ b/pkgs/applications/networking/sync/rsync/rsync-fortified-strlcpy-fix.patch @@ -0,0 +1,49 @@ +From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 +From: Jiri Slaby <jslaby@suse.cz> +Date: Fri, 18 Aug 2023 08:26:20 +0200 +Subject: [PATCH] exclude: fix crashes with fortified strlcpy() + +Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when +its third parameter (size) is larger than the buffer: + $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx + sending incremental file list + *** buffer overflow detected ***: terminated + +It's in the exclude code in setup_merge_file(): + strlcpy(y, save, MAXPATHLEN); + +Note the 'y' pointer was incremented, so it no longer points to memory +with MAXPATHLEN "owned" bytes. + +Fix it by remembering the number of copied bytes into the 'save' buffer +and use that instead of MAXPATHLEN which is clearly incorrect. + +Fixes #511. +--- + exclude.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/exclude.c b/exclude.c +index ffe55b167..1a5de3b9e 100644 +--- a/exclude.c ++++ b/exclude.c +@@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + parent_dirscan = True; + while (*y) { + char save[MAXPATHLEN]; +- strlcpy(save, y, MAXPATHLEN); ++ /* copylen is strlen(y) which is < MAXPATHLEN. +1 for \0 */ ++ size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; + *y = '\0'; + dirbuf_len = y - dirbuf; + strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); +@@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, + lp->head = NULL; + } + lp->tail = NULL; +- strlcpy(y, save, MAXPATHLEN); ++ strlcpy(y, save, copylen); + while ((*x++ = *y++) != '/') {} + } + parent_dirscan = False; + diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index f1cf8489c8086..154906bf2eea7 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.90.1"; + version = "1.90.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-LJtNsemNbN+TLyUxSgB/wftKxOfI/y/t+qv1TjcsXzQ="; + hash = "sha256-VEO9LV6hzEd4IDnSPE5H0CDlwgRFEg4cheDx/RUGQug="; }; subPackages = [ "cmd/uplink" ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 042f623366db6..35c6620c34c4d 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,13 +13,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-JsjZzOYBQ5DD7BsBq/lO2AZvC3Rx4mGr5cUJEU6ufNc="; + hash = "sha256-R7JTHlNP1guKRfiDjPVi1lnvfUAXuPDNDAMTGmbj3Hc="; }; vendorHash = "sha256-XYXIj+7xe33hCYM6Z9tqGSgr/P0LVlaPNf3T0PrxU7I="; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index dfa19511327dc..3e281d59bc9d9 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.3.7"; + version = "0.3.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws="; + hash = "sha256-3ICeKSqzx1zp/KpaAFl9qLSaugWm4HZrKjrDCWz9ok4="; stripRoot = false; }; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 91fea99ff1e51..cd640e89bf876 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DLINK_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=OFF" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" "-DLINK_MUJS=OFF" "-DLINK_GUMBO=ON" diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index b7e2105a94eab..2e869daff5323 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.1"; + version = "1.26.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; + hash = "sha256-+rMuVfe6BDAcZgJkBb18YLFZirOBfad6WGbWtAT21uI="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; @@ -31,6 +31,11 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'setuptools_scm>=8.0' 'setuptools_scm' + ''; + preCheck = '' export HOME=$TEMPDIR ''; diff --git a/pkgs/applications/office/onlyoffice-bin/7_4.nix b/pkgs/applications/office/onlyoffice-bin/7_5.nix index bf587a4c9bc28..33744bb3831ef 100644 --- a/pkgs/applications/office/onlyoffice-bin/7_4.nix +++ b/pkgs/applications/office/onlyoffice-bin/7_5.nix @@ -26,6 +26,7 @@ , libdrm , makeWrapper , mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -54,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -76,11 +65,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "7.4.1"; + version = "7.5.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY="; }; nativeBuildInputs = [ @@ -134,10 +123,6 @@ let dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner ''; - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - installPhase = '' runHook preInstall @@ -179,12 +164,14 @@ in # In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { name = derivation.name; targetPkgs = pkgs': [ curl derivation + noto-fonts-cjk-sans ]; runScript = "/bin/onlyoffice-desktopeditors"; diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index c576319643f5b..824a20a31329a 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.5.0"; + version = "6.6.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-RO8PhEjvDye6p6vgqNexIJ1ymTlVtF8yWQAUbJGaZYk="; + sha256 = "sha256-RmWRNKy2w3BM/ipQyFpkNC3+XXsJXjN6VYWNo8OKpy0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index c9e787f6d9a71..b21f3edaa5322 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "zim"; - version = "0.75.1"; + version = "0.75.2"; src = fetchurl { url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; - sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; + hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; @@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; + mainProgram = "zim"; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 66a932b9c99df..a337470664af6 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-3SQ3a1gg4/cXy8BJXazTgh6nkS/KQpM0fCA6JcbHOPc="; + hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --replace "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" - sed -i "/hdiutil/d" src/CMakeLists.txt + sed -i "/codesign/d;/hdiutil/d" src/CMakeLists.txt ''; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index d909751969c7d..49e13f4ab08db 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.23.0402"; + version = "1.23.1112"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-6SQuFN8Fi0fbWCYrQIIeSaXR2haI7uux4txCPKEoJvo="; + sha256 = "sha256-0A1/P57RtUExxflr2XayHPEyr28B6UDYY7pVCAJpWX0="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix new file mode 100644 index 0000000000000..098b51954a4eb --- /dev/null +++ b/pkgs/applications/radio/qlog/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, qtbase +, stdenv +, lib +, wrapQtAppsHook +, qmake +, qtcharts +, qtwebengine +, qtserialport +, qtwebchannel +, hamlib +, qtkeychain +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.29.2"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + rev = "v${version}"; + hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = [ + qtbase + qtcharts + qtwebengine + qtserialport + qtwebchannel + hamlib + qtkeychain + ]; + + nativeBuildInputs = [ + wrapQtAppsHook + qmake + pkg-config + ]; + + meta = with lib; { + description = "Amateur radio logbook software"; + license = with licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with maintainers; [ mkg20001 ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 6a196cdea350c..c3f7b58fa1ba6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.5.0.0"; + version = "4.6.0.0"; outputs = [ "out" "dev" ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps="; + hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; # Please don't convert this to a hash, in base64, see comment near src's # hash. - sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly"; + sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; }; passthru = { updateScript = [ @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ] + ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix index 7d74b51f6066f..254a3c011d276 100644 --- a/pkgs/applications/science/biology/flywheel-cli/default.nix +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -5,7 +5,7 @@ }: let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; os = { diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index e0555055c1a4c..880ea77e9d245 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-6nnKYnml6BjLb6aKNHbd55nH6gP/5Somo8poxx7yhVk="; + sha256 = "sha256-FcefUf0KwAEEn53XubrB2991ncsCMKicf20fJG6LurQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index f4a2bab4243d6..228c77ee5c0e4 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -33,6 +33,10 @@ let "-DBUILD_SUPERLU=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; + }; + buildInputs = [ blas superlu @@ -92,6 +96,10 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_TESTS=1" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + doCheck = true; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 5bc0dddd79b67..16eabbcbcaa1f 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -28,8 +28,16 @@ , spfft , enableElpa ? false , elpa -, gpuBackend ? "none" , cudaPackages +, rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) # gpuVersion needs to be set for both CUDA as well as ROCM hardware. # gpuArch is only required for the ROCM stack. # Change to a value suitable for your target GPU. @@ -37,7 +45,6 @@ # and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems , gpuVersion ? "Mi100" , gpuArch ? "gfx908" -, rocmPackages }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 89fb3534c6070..5794d7077af96 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -12,7 +12,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin + openglSupport ? !stdenv.isDarwin, libGL }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = with lib; [ gtk2 fftw ] ++ - optional openglSupport gnome2.gtkglext ++ + optionals openglSupport [ gnome2.gtkglext libGL ] ++ optional openexrSupport openexr ++ optional libXmuSupport xorg.libXmu ++ optional fitsSupport cfitsio ++ diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 9d643c6eda3c9..98c35c37e8d59 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dsview"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; rev = "v${version}"; - sha256 = "sha256-wnBVhZ3Ky9PXs48OVvSbD1aAUSEqAwaNLg7Ntim7yFM="; + sha256 = "sha256-LwrlB+Nwq34YjwGmnbUWS3W//ZHr8Do2Wf2te+2oBeI="; }; patches = [ diff --git a/pkgs/applications/science/electronics/kicad/addons/default.nix b/pkgs/applications/science/electronics/kicad/addons/default.nix new file mode 100644 index 0000000000000..5170e7efce363 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/addons/default.nix @@ -0,0 +1,5 @@ +{ kicad }: +{ + kikit = kicad.callPackage ./kikit.nix { addonName = "kikit"; }; + kikit-library = kicad.callPackage ./kikit.nix { addonName = "kikit-library"; }; +} diff --git a/pkgs/applications/science/electronics/kicad/addons/kikit.nix b/pkgs/applications/science/electronics/kicad/addons/kikit.nix new file mode 100644 index 0000000000000..6e5fc5ad96781 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/addons/kikit.nix @@ -0,0 +1,52 @@ +# For building the multiple addons that are in the kikit repo. +{ stdenv +, bc +, kikit +, zip +, python3 +, addonName +, addonPath +}: +let + # This python is only used when building the package, it's not the python + # environment that will ultimately run the code packaged here. The python env defined + # in KiCad will import the python code packaged here when KiCad starts up. + python = python3.withPackages (ps: with ps; [ click ]); + kikit-module = python3.pkgs.toPythonModule (kikit.override { inherit python3; }); + + # The following different addons can be built from the same source. + targetSpecs = { + "kikit" = { + makeTarget = "pcm-kikit"; + resultZip = "pcm-kikit.zip"; + description = "KiCad plugin and a CLI tool to automate several tasks in a standard KiCad workflow"; + }; + "kikit-library" = { + makeTarget = "pcm-lib"; + resultZip = "pcm-kikit-lib.zip"; + description = "KiKit uses these symbols and footprints to annotate your boards (e.g., to place a tab in a panel)."; + }; + }; + targetSpec = targetSpecs.${addonName}; +in +stdenv.mkDerivation { + name = "kicadaddon-${addonName}"; + inherit (kikit-module) src version; + + nativeBuildInputs = [ python bc zip ]; + propagatedBuildInputs = [ kikit-module ]; + + buildPhase = '' + patchShebangs scripts/setJson.py + make ${targetSpec.makeTarget} + ''; + + installPhase = '' + mkdir $out + mv build/${targetSpec.resultZip} $out/${addonPath} + ''; + + meta = kikit-module.meta // { + description = targetSpec.description; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3403e410cf85f..a2e5bbe72a56a 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch + # https://gitlab.com/kicad/code/kicad/-/issues/15687 + ./runtime_stock_data_path.patch ]; # tagged releases don't have "unknown" diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a49c813036d38..c6c66839e4bc5 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,6 @@ { lib, stdenv +, runCommand +, newScope , fetchFromGitLab , gnome , dconf @@ -11,6 +13,8 @@ , callPackages , librsvg , cups +, unzip +, jq , pname ? "kicad" , stable ? true @@ -18,6 +22,7 @@ , libngspice , withScripting ? true , python3 +, addons ? [ ] , debug ? false , sanitizeAddress ? false , sanitizeThreads ? false @@ -27,6 +32,14 @@ , symlinkJoin }: +# `addons`: https://dev-docs.kicad.org/en/addons/ +# +# ```nix +# kicad = pkgs.kicad.override { +# addons = with pkgs.kicadAddons; [ kikit kikit-library ]; +# }; +# ``` + # The `srcs` parameter can be used to override the kicad source code # and all libraries, which are otherwise inaccessible # to overlays since most of the kicad build expression has been @@ -106,6 +119,32 @@ let wxGTK = wxGTK32; python = python3; wxPython = python.pkgs.wxPython_4_2; + addonPath = "addon.zip"; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; + + addonsJoined = + runCommand "addonsJoined" + { + inherit addonsDrvs; + nativeBuildInputs = [ unzip jq ]; + } '' + mkdir $out + + for pkg in $addonsDrvs; do + unzip $pkg/addon.zip -d unpacked + + folder_name=$(jq .identifier unpacked/metadata.json --raw-output | tr . _) + for d in unpacked/*; do + if [ -d "$d" ]; then + dest=$out/share/kicad/scripting/$(basename $d)/$folder_name + mkdir -p $(dirname $dest) + + mv $d $dest + fi + done + rm -r unpacked + done + ''; inherit (lib) concatStringsSep flatten optionalString optionals; in @@ -113,6 +152,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable baseName; inherit kicadSrc kicadVersion; @@ -131,7 +171,7 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (withScripting) - [ wxPython python.pkgs.six python.pkgs.requests ]; + [ wxPython python.pkgs.six python.pkgs.requests ] ++ addonsDrvs; nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) @@ -164,6 +204,17 @@ stdenv.mkDerivation rec { "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" "--set-default KICAD7_TEMPLATE_DIR ${template_dir}" ] + ++ optionals (addons != [ ]) ( + let stockDataPath = symlinkJoin { + name = "kicad_stock_data_path"; + paths = [ + "${base}/share/kicad" + "${addonsJoined}/share/kicad" + ]; + }; + in + [ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] + ) ++ optionals (with3d) [ "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" diff --git a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch new file mode 100644 index 0000000000000..16f7e493c6238 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch @@ -0,0 +1,15 @@ +diff --git a/common/paths.cpp b/common/paths.cpp +index a74cdd9..790cc58 100644 +--- a/common/paths.cpp ++++ b/common/paths.cpp +@@ -151,6 +151,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir ) + { + wxString path; + ++ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { ++ return path; ++ } ++ + if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) ) + { + // Allow debugging from build dir by placing relevant files/folders in the build root diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/applications/science/electronics/picoscope/sources.json index 15a748dc7ceec..6b1d81978b9da 100644 --- a/pkgs/applications/science/electronics/picoscope/sources.json +++ b/pkgs/applications/science/electronics/picoscope/sources.json @@ -1,69 +1,69 @@ { "x86_64-linux": { "libpicocv": { - "sha256": "feddc1cb9082005e80c4e2c2732ee4c537915c463ea327aa53a642aab95b8691", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.33-beta2r167_amd64.deb", - "version": "1.1.33-beta2r167" + "sha256": "c0c5bec33c2c7fdd0f26b035ed942175f87012e33d6764c3abf1da31b5626037", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicocv/libpicocv_1.1.34-beta2r172_amd64.deb", + "version": "1.1.34-beta2r172" }, "libpicoipp": { - "sha256": "2d749b8fd5dbd811c270e4aa78c5ee9cd33832b90d089ae386b0f85aed2d0204", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r136_amd64.deb", - "version": "1.4.0-4r136" + "sha256": "4a84f0af7f4e8cba91fad620eac0cd23c36b2fdda4637904be564286b10ffe1d", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libpicoipp/libpicoipp_1.4.0-4r161_amd64.deb", + "version": "1.4.0-4r161" }, "libps2000": { - "sha256": "d306890d1e87651ae83ef00143c8e62b82fae2be39886b6884408751cb910fa4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.89-3r3163_amd64.deb", - "version": "3.0.89-3r3163" + "sha256": "473b065e79a7414c1e2b8c8468c8d2654333ac28f3a8c33b535626b33c60d2ca", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000/libps2000_3.0.127-3r5552_amd64.deb", + "version": "3.0.127-3r5552" }, "libps2000a": { - "sha256": "38391dfbe6c6c04ba5b5c99bd53404d5342e40c9eca703e3d95cbc6302114270", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.89-5r3163_amd64.deb", - "version": "2.1.89-5r3163" + "sha256": "8eba0052f9c7ef327710f2fba5aa11bec0c20225b39d77bb7b69cf80055c039c", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps2000a/libps2000a_2.1.127-5r5552_amd64.deb", + "version": "2.1.127-5r5552" }, "libps3000": { - "sha256": "39b4b56a839eb5d7abcf1de2bab472c2de2d8aa5ffc3ba445e99d5aa8178ba07", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.89-3r3163_amd64.deb", - "version": "4.0.89-3r3163" + "sha256": "4e786036b8de0dd0f922aed947f30a53d31bed46b2df5132e8c9480c8a5d93e9", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000/libps3000_4.0.127-3r5552_amd64.deb", + "version": "4.0.127-3r5552" }, "libps3000a": { - "sha256": "ea96735b90d02c72c9c7b517413fed0d366ac634100e22467a39c780985669e4", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.89-6r3163_amd64.deb", - "version": "2.1.89-6r3163" + "sha256": "d2bb1e5bb151b0953ed30ca5421bb93d05dab898c33cdc89927e943ea991867a", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps3000a/libps3000a_2.1.127-6r5552_amd64.deb", + "version": "2.1.127-6r5552" }, "libps4000": { - "sha256": "7177cd4debf811fa7d7105703a4fc546fe1a79fc3275e3f36326b014c1334f55", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.89-2r3163_amd64.deb", - "version": "2.1.89-2r3163" + "sha256": "4c127e67949835b5ab5c5c8caa55f73c69df354d761aa53d6df99c8f8ac39009", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000/libps4000_2.1.127-2r5552_amd64.deb", + "version": "2.1.127-2r5552" }, "libps4000a": { - "sha256": "ebe94d6d9f349e5082dcbed55d059ac77c0129b967467786d1cef3f662ebac99", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.89-2r3163_amd64.deb", - "version": "2.1.89-2r3163" + "sha256": "26df82bc946e5bb30d599c4c365247bdbaa01e830d4d00630b46a6abcc1eef04", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps4000a/libps4000a_2.1.127-2r5552_amd64.deb", + "version": "2.1.127-2r5552" }, "libps5000": { - "sha256": "732164658acb4bdfdbf3fc785419ea6a4944ed2892be9dde134b345a976c3318", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.89-3r3163_amd64.deb", - "version": "2.1.89-3r3163" + "sha256": "106ef17862e98c3621f95c377f271c843664f481f84ef918d9eadd013561cd1b", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000/libps5000_2.1.127-3r5552_amd64.deb", + "version": "2.1.127-3r5552" }, "libps5000a": { - "sha256": "3438f51c8646e3ac5a479c88aa7a89b3dfcce2090720317b4efb8db538372cdb", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.89-5r3163_amd64.deb", - "version": "2.1.89-5r3163" + "sha256": "fe9def134ef9df6654485911f14ece7b2ee3d79113aeee7826dd6e36bb5de3b4", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps5000a/libps5000a_2.1.127-5r5552_amd64.deb", + "version": "2.1.127-5r5552" }, "libps6000": { - "sha256": "fe4165ab0d323728b473347b61439b074486809d673e47f169d0062cf917191c", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.89-6r3163_amd64.deb", - "version": "2.1.89-6r3163" + "sha256": "9b08c5b7fb2d34b0e2e98f2e0452a59105f612cd445a9e45d3cac14d931d18f2", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000/libps6000_2.1.127-6r5552_amd64.deb", + "version": "2.1.127-6r5552" }, "libps6000a": { - "sha256": "0552811f92a015ef47b09947631f5f5d8c30b122425de083bea79df88957a9c7", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.89-0r3163_amd64.deb", - "version": "1.0.89-0r3163" + "sha256": "2a23ccad72b9be83b87d449b6bb8ded23fd29c85ec9f78a45b6d45b38ccf335b", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/libp/libps6000a/libps6000a_1.0.127-0r5552_amd64.deb", + "version": "1.0.127-0r5552" }, "picoscope": { - "sha256": "b060edb02bc2de5d10a45d31d4b7f9c767d18511e2f65a1ebdd70cc3e8780262", - "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.0.100-1r11387_amd64.deb", - "version": "7.0.100-1r11387" + "sha256": "d95f269171da7273b596dae95452789e889f12ef0f15c3baea26dd1b3a8117fc", + "url": "https://labs.picotech.com/rc/picoscope7/debian/pool/main/p/picoscope/picoscope_7.1.17-1r17318_amd64.deb", + "version": "7.1.17-1r17318" } } } diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 86d6716eaeb75..0c2adf0907e91 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.016"; + version = "5.018"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-MVQbAZXSIdzX7+yKbSrFLLd0j6dfLSXpES3uu6bcPt8="; + hash = "sha256-f06UzNw2MQ5me03EPrVFhkwxKum/GLDzQbDNTBsJMJs="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 0a93759947d70..06e8a94a4c537 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # NOTE(jleightcap): the `make check` target only runs a "Hello, World"-esque sanity check. # the tests in the doInstallCheck phase run a full regression test suite. # however, these tests currently fail upstream on aarch64 diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 1d0c72359cfcc..7e4cfad72ed1e 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "abella"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "http://abella-prover.org/distributions/${pname}-${version}.tar.gz"; - sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc="; + sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; strictDeps = true; - nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); + nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml dune_3 menhir findlib ]); + buildInputs = with ocamlPackages; [ cmdliner yojson ]; installPhase = '' mkdir -p $out/bin - rsync -av abella $out/bin/ + rsync -av _build/default/src/abella.exe $out/bin/abella mkdir -p $out/share/emacs/site-lisp/abella/ rsync -av emacs/ $out/share/emacs/site-lisp/abella/ diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 4f3f585c220cb..5b9e8f62aa01c 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; }; + patches = [ + # Fix implicit declaration of `isatty`, which is an error with newer versions of clang. + ./fix-missing-header.patch + ]; + enableParallelBuilding = true; configurePhase = '' diff --git a/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/pkgs/applications/science/logic/aiger/fix-missing-header.patch new file mode 100644 index 0000000000000..5f0101bd7a03d --- /dev/null +++ b/pkgs/applications/science/logic/aiger/fix-missing-header.patch @@ -0,0 +1,11 @@ +diff -ur a/aigunconstraint.c b/aigunconstraint.c +--- a/aigunconstraint.c 2013-10-06 09:08:03.000000000 -0400 ++++ b/aigunconstraint.c 2023-10-27 08:55:01.678566389 -0400 +@@ -26,6 +26,7 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> ++#include <unistd.h> + + static const char * USAGE = + "usage: aigunconstraint [-h][-v] [<input> [<output>]]\n" diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 32243455ae5f5..2ea2dea70718c 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3, python3 }: stdenv.mkDerivation rec { pname = "easycrypt"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { findlib menhir ocaml + python3.pkgs.wrapPython ]; buildInputs = with ocamlPackages; [ batteries @@ -33,10 +34,13 @@ stdenv.mkDerivation rec { substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})' ''; + pythonPath = with python3.pkgs; [ pyyaml ]; + installPhase = '' runHook preInstall dune install --prefix $out ${pname} rm $out/bin/ec-runtest + wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath" runHook postInstall ''; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 400d636346c53..ec1fc6b11d25c 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eprover"; - version = "2.6"; + version = "3.0"; src = fetchurl { url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - sha256 = "sha256-qh896qIpFR5g1gdWAwGkbNJLBqUQCeCpuoYHHkDXPt0="; + hash = "sha256-gBgDC+GH948JMsjzo/SOpWDzJXu0g58YX1VW28PeorI="; }; buildInputs = [ which ]; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 5f4bc89db397c..813397ba01f93 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -12,10 +12,12 @@ let '' #!${runtimeShell} cd $out/lib/hol_light + export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}${camlp5}/lib/ocaml/${ocaml.version}/site-lib/" exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ - -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma + -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma \ -init make.ml ''; in @@ -25,13 +27,13 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2023-07-21"; + version = "unstable-2023-11-03"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; - hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; + rev = "dcd765c6032f52a0c0bf21fce5da4794a823e880"; + hash = "sha256-k2RBNDo4tc3eobKB84Y2xr0UQJvef0hv6jyFCaDCQFM="; }; patches = [ diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 253c88705aea3..a3c1aa3f131d9 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = "https://github.com/vprover/vampire/pull/54.patch"; + url = "https://github.com/vprover/vampire/commit/b4bddd3bcac6a7688742da75c369b7b3213f6d1c.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = "https://github.com/vprover/vampire/pull/55.patch"; + url = "https://github.com/vprover/vampire/commit/6da10eabb333aec54cdf13833ea33cb851159543.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) ]; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index fedb219a0c194..fdf07a2a3299d 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 603a3c4f60bf9..1e80d9a06eba9 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-2023-10-26"; + version = "unstable-2023-11-17"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "043895fbaed27a4baace7c7c0c1f69ea5a9f3d1a"; - hash = "sha256-roPyRaT89I3HbyvBK/owiigMus1EeKEhhKHFsgfzp10="; + rev = "b0d822f10243ad5b1c88efb5a82b43a0bbf1bfbc"; + hash = "sha256-eJ/EmzV5UZGxwZNIna/XXkYY+vkLc610KcywBFPRfyM="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 536d520058a2d..35b9e9d7a8d4a 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index efbf80ba16ed2..08555d12640fa 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "readstat"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-4lRJgZPB2gfaQ9fQKvDDpGhy1eDNT/nT1QmeZlCmCis="; }; + patches = [ + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; + hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ libiconv ]; @@ -22,5 +29,6 @@ stdenv.mkDerivation rec { description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ swflint ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8064a965bd1f6..97754c04d95ce 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,11 +104,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc="; }) - # https://github.com/sagemath/sage/pull/36006, positively reviewed + # https://github.com/sagemath/sage/pull/36006, landed in 10.2.beta2 (fetchpatch { name = "gmp-6.3-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; - sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; + url = "https://github.com/sagemath/sage/commit/5e841de46c3baa99cd1145b36ff9163e9340a55c.diff"; + sha256 = "sha256-fJPDryLtGBQz9qHDiCkBwjiW2lN6v7HiHgxY7CTeHcs="; }) # https://github.com/sagemath/sage/pull/36279, landed in 10.2.beta4 @@ -117,6 +117,20 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/0fcf88935908440930c5f79202155aca4ad57518.diff"; sha256 = "sha256-mvqAHaTCXsxPv901L8HSTnrfghfXYdq0wfLoP/cYQZI="; }) + + # https://github.com/sagemath/sage/pull/35658, landed in 10.1.beta2 + (fetchpatch { + name = "sphinx-7-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/cacd9a89b5c4fdcf84a8dd2b7d5bdc10cc78109a.diff"; + sha256 = "sha256-qJvliTJjR3XBc5pH6Q0jtm8c4bhtZcTcF3O04Ro1uaU="; + }) + + # https://github.com/sagemath/sage/pull/36296, landed in 10.2.beta4 + (fetchpatch { + name = "duplicate-args-region_plot.patch"; + url = "https://github.com/sagemath/sage/commit/461727b453712550a2c5dc0ae11933523255aaed.diff"; + sha256 = "sha256-mC8084VQoUBk4hocALF+Y9Cwb38Zt360eldi/SSjna8="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index 47fb7cf61df98..87daa8cac8535 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , autoreconfHook +, wrapGAppsHook , pkg-config , which , gtk3 @@ -20,7 +21,12 @@ stdenv.mkDerivation rec { hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; }; - nativeBuildInputs = [ autoreconfHook pkg-config which ]; + nativeBuildInputs = [ + autoreconfHook + wrapGAppsHook + pkg-config + which + ]; buildInputs = [ gtk3 blas lapack ]; meta = with lib; { diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index e42aa253dbfe6..fb314cdff30ce 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 9c44946f38269..1a036106c6dfc 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -103,7 +103,7 @@ mkDerivation rec { homepage = "https://github.com/contour-terminal/contour"; changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index c6a250d9123a6..528c82fe81993 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , mkDerivation , qtbase -, qtquick1 , qmltermwidget , qtquickcontrols2 , qtgraphicaleffects @@ -28,7 +27,6 @@ mkDerivation rec { buildInputs = [ qtbase - qtquick1 qmltermwidget qtquickcontrols2 qtgraphicaleffects diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 13f4e3c4119e0..877655ffbc070 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests +, pcre2 }: stdenv.mkDerivation rec { pname = "lxterminal"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxterminal"; rev = version; - sha256 = "sha256-5J21Xvx43Ie01IxB2usyixDl+WZEeFHn2HXZsRS5imo="; + sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0="; }; configureFlags = [ @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; - buildInputs = [ gtk3 vte ]; + buildInputs = [ gtk3 vte pcre2 ]; patches = [ ./respect-xml-catalog-files-var.patch @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.lxde.org/en/LXTerminal"; license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.velovix ]; + maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index afd3205343e5c..6ebd8f6f521d1 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -1,10 +1,13 @@ { lib +, stdenv +, darwin , fetchFromGitHub , rustPlatform , nixosTests , nix-update-script , autoPatchelfHook +, cmake , ncurses , pkg-config @@ -14,18 +17,21 @@ , vulkan-loader , libxkbcommon -, withX11 ? true +, withX11 ? !stdenv.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? true +, withWayland ? !stdenv.isDarwin , wayland }: let - rlinkLibs = [ + rlinkLibs = if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk_11_0.frameworks.AppKit + ] else [ (lib.getLib gcc-unwrapped) fontconfig libGL @@ -43,21 +49,23 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.19"; + version = "0.0.27"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-N7eHIyp2imkMUVwiOCameOROoaDJ7g+zNKdIB2aGZy0="; + hash = "sha256-q3Wq7jIYE4g1uPAlpzNWvwUvMy9eN6NQNmPNC4cFmYg="; }; - cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; + cargoHash = "sha256-SP85se+H4jL/cXyvfbFS2lxpNSjuptAIPs3/htcrMcw="; nativeBuildInputs = [ - autoPatchelfHook ncurses + ] ++ lib.optionals stdenv.isLinux [ + cmake pkg-config + autoPatchelfHook ]; runtimeDependencies = rlinkLibs; @@ -67,10 +75,9 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; buildNoDefaultFeatures = true; - buildFeatures = [ - (lib.optionalString withX11 "x11") - (lib.optionalString withWayland "wayland") - ]; + buildFeatures = [ ] + ++ lib.optional withX11 "x11" + ++ lib.optional withWayland "wayland"; checkFlags = [ # Fail to run in sandbox environment. @@ -79,13 +86,18 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 644 misc/rio.desktop -t $out/share/applications - install -D -m 644 rio/src/screen/window/resources/images/logo.png \ - $out/share/icons/hicolor/scalable/apps/rio.png + install -D -m 644 misc/logo.svg \ + $out/share/icons/hicolor/scalable/apps/rio.svg install -dm 755 "$terminfo/share/terminfo/r/" tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + '' + lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications/ + mv misc/osx/Rio.app/ $out/Applications/ + mkdir $out/Applications/Rio.app/Contents/MacOS/ + ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/ ''; passthru = { diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 6179c1719d33b..b0d8dd7a4b399 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 = "384"; + version = "388"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Me+HB0DOrgIMPEtKlgHH9Hv9RmcsGq8tITpWXWTLw3M="; + hash = "sha256-rEKTReb5N6WUWonUJaJl/ubCFfxmnb3GoDJuIfTF9nQ="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index d6727d327ce5c..4c99078ab275b 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { ) ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + postInstall = '' wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 9f039c4ab0044..4ee553c6c4be8 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + doCheck = false; # fails 1 of 1 tests meta = with lib; { diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 4731355ac0f39..15d6bc84caa59 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-gdgj/29dF1s4TfqE7roNBS2nOjfNZs1yt4bnFnEhDWs="; + hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM="; }; # required for build time tool `./tools/translate.c` @@ -66,5 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; maintainers = with maintainers; [ maggesi viric ]; platforms = platforms.all; + mainProgram = "fossil"; }; }) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 702040695a50b..cd3c6ce6dd139 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.38.0"; + version = "2.39.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-t+JpCxJM2PO9nT9nYn/Rsz/s2lQQviggbjuEy0OQV88="; + hash = "sha256-OvelaxyQNeh6h7wn4Z/vRicufOoxrTdmnWl9hKW00jU="; }; - vendorHash = "sha256-XZhZDYdbjA/1g7/mPxm5u1b+z/TmwoH60/sJZ63LQMg="; + vendorHash = "sha256-RFForZy/MktbrNrcpp9G6VCB7A98liJvCxS0Yb16sMc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index ae99781f83e72..962bf18b366b6 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.3.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM="; + hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 96dbf0bb96570..053da15bd50c0 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,20 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-preview6"; sha256 = "14m7bg6ric8hpa2kmkhff6hpljfa73snbkj8fqida7hfd0nhggyl"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-preview6"; sha256 = "12lps97bqgd65z0y4d73ql2rcxaaaylb2x8fqvkb2jbrd76n30wz"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-preview6"; sha256 = "1kk4ids80gzkf8llasmcairmmz6yfsi7mbld21gb3sdwdf0wf92y"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-preview6"; sha256 = "18rabqzs5namzi0y6435blm6j54cnwsc8bkq2daj9bim5njy56pm"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-preview6"; sha256 = "0l9c7zakk17xyag9cl9nxq4j6wzlr6kgzzwpl7zwj7f3vypxlp6v"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-preview6"; sha256 = "0ni3y5qkpsz2s5hflkipwmpmb21b2mfs6h06rrvrq95m4l0bil7i"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-preview6"; sha256 = "0m1zbcbypj06xkmyjx56smh5smi02gdvn6xbqi92k185aiiwicj1"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-preview6"; sha256 = "0wws5z8vmagzh7x47mlgf780579d5zqv0hyd649sycdxkaadcz5r"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-preview6"; sha256 = "15572ibkb7ihgdmcxzj3avb1g4lcqrjxdxgf66ifvfyjj49vfi8h"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-preview6"; sha256 = "1hm8ax9bq7vj458f2lrcppv3ylc6zmmdwp6zkbf2s6fv7nhvpmgf"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-preview6"; sha256 = "1b1y2a3bkwz38a5nvwqhw23gp10a63046qiprapyxp589gbkf8cj"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-preview6"; sha256 = "0img9zmrppikzgw48j5a3svcrv9skbh13wzrdqnk0648n8fgj9k4"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-preview6"; sha256 = "04923qvlpgszr1zlcg0pfxzsgqgdjcrpqgkqlrlp62ac6yv8dr9g"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "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"; }) @@ -107,6 +108,5 @@ (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.14.0"; sha256 = "1j7ifcv621z5kjafs0c1qw4xcgv4kd4hwp0qamhcrllvshd2mabq"; }) - (fetchNuGet { pname = "Tmds.DBus.SourceGenerator"; version = "0.0.4"; sha256 = "16qa3xi0ip2nvgnjjqj64ppjdrf4p4skrfqzfnb39rp0k7v8smfx"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) ] diff --git a/pkgs/applications/version-management/git-credential-manager/update.sh b/pkgs/applications/version-management/git-credential-manager/update.sh index e87352a36521e..fc9ef4199678d 100755 --- a/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/pkgs/applications/version-management/git-credential-manager/update.sh @@ -1,23 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq nix-prefetch nix coreutils gnused - -cd "$(dirname "$0")" - -set -euo pipefail - -latestVersion="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" -currentVersion="$(nix-instantiate --eval -E "with import ../../../.. {}; git-credential-manager.version" | tr -d '"')" - -if [[ "$latestVersion" == "$currentVersion" ]]; then - echo "up to date" - exit 0 +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +new_version="$(curl -s "https://api.github.com/repos/git-ecosystem/git-credential-manager/releases?per_page=1" | jq -r '.[0].name' | sed 's|^GCM ||')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 fi -echo "updating $currentVersion -> $latestVersion" - -sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix -hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)" -sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix - - -$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) +cd ../../../.. +update-source-version git-credential-manager "$new_version" +$(nix-build -A git-credential-manager.fetch-deps --no-out-link) diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 0f630f049ba96..bcaf37cdcb342 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.171"; + version = "5.12.175"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-K2d12isOOPs8ba77VhQSXRHSYLZZIkZJlM9d3/G4nOo="; + hash = "sha256-c026r3F/oNk/DyEwHb/1kSL99bqmYp7mqOdsWbB7Njo="; }; - cargoHash = "sha256-m5b57dJ6IRJ10eJRF5lj2+WiNswHxj08LgXz7KJiTaw="; + cargoHash = "sha256-QpmgGonDy3Pkx2i5X3ZxmBXqupOoESoFMIBorFeqam4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index e56e57201e57b..7ceb970737c3d 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; + sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; }; - cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; + cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bc5d3aa8b33d6..c3e715ad46fe4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv -, ruby_3_0, tzdata, git, nettools, nixosTests, nodejs, openssl +, ruby_3_2, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config }: @@ -17,7 +17,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_0; + ruby = ruby_3_2; gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix") src; diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 723f4c59e3fc9..f4e1815e278e2 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-YMiT1eJyBwKKFxonQCAu7st+JoU/YLpxKCcMfs/sZ1U="; + hash = "sha256-4kd3+IdVZbWVGbY3B8V1F07k67BvKOCfom4ZukNxrRo="; }; - vendorHash = "sha256-o/B5enbrmv/+zJYBQkxbdUaiieaFyOJDc8Fm6tV//uM="; + vendorHash = "sha256-x96ChhozvTrX0eBWt3peX8dpd4gyukJ28RkqcD2W/OM="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 40b8a9b207c79..60a093e1c80bb 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-XqS2oG3/dPHBC/sWN9B7BliSv4IJ1iskrQRTh8vQNd4="; + hash = "sha256-+f/OMU8fwwnlm8zTyE5XyIzfFwIB917tH9jaqSW8Skg="; }; - cargoHash = "sha256-0mUkXez+5Z8UGKMrUUjt+aF4zv3EJKgnFoQ068gTlX0="; + cargoHash = "sha256-A3o9OE8VO7z04WmbZL2rvlZRN/ZHOIGklKZQgiFSfxE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index 0ed9d70c46232..4486c71605da3 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -23,13 +23,15 @@ buildGoModule rec { patches = [ # Fix `fish` completions + # https://github.com/github/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/pull/3036.patch"; + url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions + # https://github.com/github/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/pull/2948.patch"; + url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index c86cd6e6b303f..a4e68c190ae1b 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA="; + hash = "sha256-yEW7+0MnJlW0WeZ6UItaCDrihPLA52mLcu15tJwZx9w="; }; - cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM="; + cargoHash = "sha256-xA9SDq1Kc0u8qFEPFFCic9uwE2Y/BXJzUHBCs1Czxtw="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = true; # nextest is the upstream integration framework diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix index e2cf8e1013c3d..d7dcd1405575b 100644 --- a/pkgs/applications/version-management/p4d/default.nix +++ b/pkgs/applications/version-management/p4d/default.nix @@ -7,23 +7,19 @@ let # Upstream replaces minor versions, so use cached URLs. srcs = { - "i686-linux" = fetchurl { - url = "https://web.archive.org/web/20220907001049/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86/helix-core-server.tgz"; - sha256 = "e9cf27c9dd2fa6432745058a93896d151543aff712fce9f7322152d6ea88a12a"; - }; "x86_64-linux" = fetchurl { - url = "https://web.archive.org/web/20220907001202/https://ftp.perforce.com/perforce/r22.1/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "9c272b67574264a4f49fe846ccda24fbd4baeb282665af74b6fbccff26a43558"; + url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz"; + sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362"; }; "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20220907001334/https://ftp.perforce.com/perforce/r22.1/bin.macosx1015x86_64/helix-core-server.tgz"; - sha256 = "2500a23fe482a303bd400f0de460b7624ad3f940fef45246004b9f956e90ea45"; + url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz"; + sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11"; }; }; in stdenv.mkDerivation { pname = "p4d"; - version = "2022.1.2305383"; + version = "2023.1.2513900"; src = assert lib.assertMsg (builtins.hasAttr stdenv.hostPlatform.system srcs) "p4d is not available for ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1ea92e333d5bb..63f7bf7fbbe2a 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.7"; src = fetchCrate { inherit version pname; - hash = "sha256-1cIb4QsDYlOCGrQrLgEwIjjHZ3WwD2o0o0bF+OOqEtI="; + hash = "sha256-BXDz9po8i937/xYoIW4S/FddtcWxSmtRUWYIphgh060="; }; - cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; + cargoHash = "sha256-+KF1G4bDfcjHHzZR93lIR8muO6s3j5jDobr3A7Arr+Q="; doCheck = false; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 2c0463dc21d0b..20f5616cc39fa 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -38,35 +38,27 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -87,6 +79,18 @@ dependencies = [ ] [[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" @@ -105,19 +109,67 @@ dependencies = [ ] [[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 = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" dependencies = [ "backtrace", ] [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -133,9 +185,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert-json-diff" @@ -156,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "bzip2", @@ -186,17 +238,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -205,7 +257,7 @@ dependencies = [ name = "async-runtime" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "num_cpus", "once_cell", "tokio", @@ -213,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -227,6 +279,7 @@ name = "atexit" version = "0.1.0" dependencies = [ "once_cell", + "tracing", ] [[package]] @@ -261,7 +314,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap", + "indexmap 1.9.3", "once_cell", "pem", "simple_asn1", @@ -274,9 +327,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "0.4.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cbf586c80ada5e5ccdecae80d3ef0854f224e2dd74435f8d87e6831b8d0a38" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2", @@ -295,15 +348,19 @@ name = "backingstore" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "configloader", + "constructors", "eagerepo", "edenapi", - "env_logger 0.10.0", + "env_logger 0.10.1", "identity", + "indexedlog", "libc", "log", "manifest", - "parking_lot 0.11.2", + "parking_lot", + "repo", "revisionstore", "tracing", "tracing-collector", @@ -312,46 +369,45 @@ dependencies = [ ] [[package]] +name = "backingstore-benches" +version = "0.1.0" +dependencies = [ + "backingstore", + "configloader", + "identity", + "minibench", + "procinfo", + "repo", + "tempfile", + "types", +] + +[[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[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 = "base64" -version = "0.21.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindag" @@ -376,6 +432,7 @@ dependencies = [ "pyblackbox", "pybytes", "pycats", + "pycext", "pycheckout", "pyclientinfo", "pycliparser", @@ -389,6 +446,7 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", + "pyedenclient", "pyerror", "pyexchange", "pyfail", @@ -399,10 +457,12 @@ dependencies = [ "pyidentity", "pyindexedlog", "pyio", + "pylinelog", "pylock", "pylz4", "pymanifest", "pymetalog", + "pymodules", "pymutationstore", "pynodeipc", "pynodemap", @@ -420,9 +480,12 @@ dependencies = [ "pysptui", "pystatus", "pythreading", + "pytoml", "pytracing", "pytreestate", + "pyversion", "pyvlq", + "pywebview", "pyworker", "pyworkingcopy", "pyxdiff", @@ -431,6 +494,14 @@ dependencies = [ ] [[package]] +name = "bindings-lib" +version = "0.1.0" +dependencies = [ + "cpython", + "hgcommands", +] + +[[package]] name = "bit-set" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -452,6 +523,21 @@ 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 = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + +[[package]] name = "blackbox" version = "0.1.0" dependencies = [ @@ -461,7 +547,7 @@ dependencies = [ "lazy_static", "libc", "minibench", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_alt", "serde_cbor", @@ -472,20 +558,18 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "crypto-mac", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.7", ] [[package]] name = "blake3" -version = "1.3.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", @@ -493,7 +577,6 @@ dependencies = [ "cfg-if 1.0.0", "constant_time_eq", "digest 0.10.7", - "rayon", ] [[package]] @@ -516,9 +599,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", @@ -527,9 +610,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", @@ -537,9 +620,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -547,40 +630,30 @@ dependencies = [ [[package]] name = "bufsize" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bbc61bc8800fb287f3394487c159af745cdf2e74743f12245d874ce20eb529" +checksum = "da2a4f1be8d12d1d69cbcfd3e740dddba696710847cf8630f6676860045345e8" dependencies = [ - "bytes 1.4.0", + "bytes", ] [[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 = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +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", ] @@ -618,7 +691,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "thiserror", @@ -628,11 +701,12 @@ dependencies = [ [[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 = [ "jobserver", + "libc", ] [[package]] @@ -656,12 +730,12 @@ dependencies = [ "async-trait", "configmodel", "fail", - "futures 0.3.28", + "futures 0.3.29", "io", "manifest", "manifest-tree", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -684,18 +758,15 @@ dependencies = [ [[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 0.3.9", + "windows-targets 0.48.5", ] [[package]] @@ -706,7 +777,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -720,20 +791,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.3", "once_cell", "regex", "strsim 0.10.0", "termcolor", - "terminal_size", + "terminal_size 0.2.6", "textwrap 0.16.0", "unicase", ] [[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive 4.4.7", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.6.0", + "strsim 0.10.0", + "terminal_size 0.3.0", + "unicase", + "unicode-width", +] + +[[package]] name = "clap_derive" version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -747,6 +843,18 @@ dependencies = [ ] [[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", +] + +[[package]] name = "clap_lex" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -756,6 +864,12 @@ dependencies = [ ] [[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] name = "clidispatch" version = "0.1.0" dependencies = [ @@ -765,11 +879,13 @@ dependencies = [ "configloader", "configmodel", "hgplain", + "hostname 0.1.0", "identity", "indexedlog", "io", "network-doctor", "repo", + "sampling", "termlogger", "thiserror", "thrift-types", @@ -784,10 +900,20 @@ name = "clientinfo" version = "0.1.0" dependencies = [ "anyhow", - "configmodel", "hostname 0.1.0", + "lazy_static", + "rand 0.8.5", "serde", "serde_json", + "tracing", +] + +[[package]] +name = "clientinfo_async" +version = "0.1.0" +dependencies = [ + "clientinfo", + "tokio", ] [[package]] @@ -796,7 +922,8 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "cpython_ext", + "indexmap 1.9.3", + "serde", "shlex", "thiserror", ] @@ -824,32 +951,55 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" + +[[package]] +name = "codegen" +version = "0.1.0" +dependencies = [ + "zstdelta", +] [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "quote", ] [[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 = "colored" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" dependencies = [ - "atty", + "is-terminal", "lazy_static", "winapi 0.3.9", ] [[package]] name = "comfy-table" -version = "6.1.4" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ "crossterm", "strum", @@ -858,18 +1008,41 @@ dependencies = [ ] [[package]] +name = "commandserver" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "configmodel", + "dirs 2.0.2", + "fn-error-context", + "fs2", + "identity", + "libc", + "nodeipc", + "once_cell", + "procutil", + "serde", + "spawn-ext", + "system-command", + "tracing", + "udsipc", + "version", +] + +[[package]] name = "commitcloudsubscriber" version = "0.1.0" dependencies = [ "anyhow", "filetime", - "futures 0.3.28", + "futures 0.3.29", "hostcaps", "identity", "lazy_static", "log", "mime", - "parking_lot 0.11.2", + "parking_lot", "regex", "reqwest", "reqwest-eventsource", @@ -882,6 +1055,42 @@ dependencies = [ ] [[package]] +name = "commits-git" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "factory", + "fs-err", + "futures 0.3.29", + "gitdag", + "metalog", + "minibytes", + "parking_lot", + "refencode", + "storemodel", + "tracing", + "types", +] + +[[package]] +name = "commits-trait" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "dag", + "futures 0.3.29", + "metalog", + "minibytes", + "serde", + "storemodel", + "types", +] + +[[package]] name = "conch-parser" version = "0.1.1" dependencies = [ @@ -899,11 +1108,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "crossbeam-utils 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -913,13 +1122,11 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_types", "const-cstr", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "thiserror", "thrift_compiler", "tracing", @@ -933,17 +1140,47 @@ dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", + "config_thrift_types", "const-cstr", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", + "ref-cast", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "config_thrift_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "config_types" +version = "0.1.0" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", "once_cell", "ref-cast", "serde", "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] @@ -951,7 +1188,7 @@ name = "configloader" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.11.0", + "base64 0.13.1", "configmodel", "configset", "dirs 2.0.2", @@ -962,19 +1199,17 @@ dependencies = [ "hostname 0.3.1", "http-client", "identity", - "lazy_static", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", "regex", "serde", "serde_json", "serde_urlencoded 0.7.1", - "sha2 0.10.6", + "sha2 0.10.8", "staticconfig", - "tempdir", "tempfile", + "testutil", "tracing", "types", "unionconfig", @@ -1001,9 +1236,9 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap", + "indexmap 1.9.3", "minibytes", - "tempdir", + "tempfile", "tracing", "util", ] @@ -1028,9 +1263,21 @@ checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "constructors" +version = "0.1.0" +dependencies = [ + "commits-git", + "eagerepo", + "edenapi", + "gitstore", + "hgcommits", + "once_cell", +] [[package]] name = "control-point" @@ -1038,14 +1285,42 @@ version = "0.1.0" dependencies = [ "anyhow", "lazy_static", - "parking_lot 0.11.2", + "parking_lot", "serde_json", - "tempdir", + "tempfile", "tracing", "util", ] [[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 = "copytrace" version = "0.1.0" dependencies = [ @@ -1055,10 +1330,13 @@ dependencies = [ "dag", "git2", "hg-metrics", + "lru-cache", "manifest", "manifest-tree", + "parking_lot", "pathhistory", "pathmatcher", + "serde", "storemodel", "thiserror", "tokio", @@ -1086,9 +1364,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1114,7 +1392,7 @@ dependencies = [ "async-runtime", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "itertools", "tokio", ] @@ -1125,10 +1403,9 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "io", "libc", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde", "serde_bytes", @@ -1148,30 +1425,16 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.4", - "crossbeam-epoch 0.8.2", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-epoch 0.9.14", - "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.15", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1185,33 +1448,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1221,57 +1463,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.14", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", + "crossbeam-epoch", + "crossbeam-utils 0.8.16", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", - "memoffset 0.8.0", + "crossbeam-utils 0.8.16", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-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 0.8.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1286,45 +1502,34 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", - "parking_lot 0.12.1", - "signal-hook 0.3.15", + "parking_lot", + "signal-hook 0.3.17", "signal-hook-mio", "winapi 0.3.9", ] [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi 0.3.9", ] @@ -1340,23 +1545,13 @@ 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 = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.1", + "phf 0.11.2", ] [[package]] @@ -1371,11 +1566,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.3.1" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.2", + "nix 0.27.1", "windows-sys 0.48.0", ] @@ -1390,15 +1585,15 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2", + "socket2 0.4.10", "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.62+curl-8.1.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274ef7ef7c1113c7611af49ce248a700afa1171045a1aaa40137030773f993b8" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -1407,7 +1602,51 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi 0.3.9", + "windows-sys 0.48.0", +] + +[[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.39", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -1416,16 +1655,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "byteorder", "dag-types", "dev-logger", "drawdag", "fail", "fs2", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", - "indexmap", + "indexmap 1.9.3", "mincode", "minibytes", "nonblocking", @@ -1466,15 +1705,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.3", + "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core 0.9.7", + "parking_lot_core", "rayon", "serde", ] @@ -1490,9 +1729,18 @@ dependencies = [ [[package]] name = "deltae" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef311e2c0a388b9ba56c839ac68d33b92d18ce7104d0acc4375cb479e2b9a53" +checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "dev-logger" @@ -1590,12 +1838,12 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "configloader", "configmodel", "dag", "edenapi_trait", + "factory", "fail", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "http", "identity", @@ -1603,7 +1851,7 @@ dependencies = [ "metalog", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "storemodel", "tempfile", "thiserror", @@ -1623,7 +1871,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "structopt", ] @@ -1634,23 +1882,23 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bytes 1.4.0", + "bytes", "chrono", + "clientinfo", + "clientinfo_async", "configmodel", "edenapi_trait", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hg-http", "http-client", "itertools", - "lazy_static", "metrics", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pprint", "progress-model", - "rand 0.8.5", "repo_name", "serde", "serde_cbor", @@ -1669,10 +1917,10 @@ dependencies = [ "anyhow", "blake2", "cloned", - "crossbeam 0.8.2", + "crossbeam", "edenapi", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "itertools", "minibytes", "tokio", @@ -1689,7 +1937,7 @@ dependencies = [ "auth", "configmodel", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "http", "http-client", "minibytes", @@ -1704,7 +1952,9 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "bytes 1.4.0", + "blake2", + "blake3", + "bytes", "dag-types", "insta_ext", "paste", @@ -1716,38 +1966,56 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", + "sha1", + "sha2 0.10.8", "thiserror", "type_macros", "types", ] [[package]] -name = "edenfs_client" +name = "edenfs-client" version = "0.1.0" dependencies = [ "anyhow", - "byteorder", - "chrono", + "async-runtime", + "clientinfo", "fbthrift_socket", + "fs-err", "identity", - "io", "serde", - "sha2 0.10.6", - "status", - "thiserror", "thrift-types", - "tokio", "tokio-uds-compat", "toml", + "tracing", + "types", +] + +[[package]] +name = "edenfs_ffi" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "cxx", + "cxx-build", + "futures 0.3.29", + "identity", + "manifest", + "manifest-tree", + "once_cell", + "pathmatcher", + "repo", + "sparse", + "tokio", "types", - "util", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1766,23 +2034,23 @@ dependencies = [ [[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 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -1797,9 +2065,9 @@ dependencies = [ [[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", @@ -1809,24 +2077,28 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ - "cc", "libc", + "windows-sys 0.48.0", ] [[package]] @@ -1874,6 +2146,14 @@ dependencies = [ ] [[package]] +name = "factory" +version = "0.1.0" +dependencies = [ + "anyhow", + "tracing", +] + +[[package]] name = "fail" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1885,6 +2165,16 @@ dependencies = [ ] [[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] name = "faster-hex" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1900,30 +2190,51 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#5ed29aacd750ec0eb3914f255feab6705fe9d90e" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" dependencies = [ "anyhow", "async-trait", "codegen_includer_proc_macro", "const-cstr", + "fb303_core_types", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", + "ref-cast", + "thiserror", + "thrift_compiler", + "tracing", + "tracing-futures", +] + +[[package]] +name = "fb303_core_types" +version = "0.0.0" +source = "git+https://github.com/facebook/fb303.git?branch=main#b43090b2a64a33076412ab593ee1ada5e48a7a9c" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.29", "once_cell", "ref-cast", "serde", "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "fbinit_macros", "quickcheck", @@ -1932,7 +2243,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quote", @@ -1942,18 +2253,18 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#68e4e25248eee387a2aa869cac55a18e1041649b" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#7ba2d200ef5654b277c9ae85fe8b3bdbe15433e0" dependencies = [ "anyhow", "async-trait", - "base64 0.11.0", + "base64 0.13.1", "bufsize", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "ghost", "num-derive", "num-traits", - "ordered-float 1.1.1", + "ordered-float", "panic-message", "serde_json", "thiserror", @@ -1962,34 +2273,34 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "byteorder", - "bytes 1.4.0", - "tokio-util 0.6.10", + "bytes", + "tokio-util 0.7.10", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "bytes 1.4.0", + "bytes", "fbthrift", "fbthrift_framed", "fbthrift_util", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tokio-tower", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "tokio", ] @@ -2018,13 +2329,13 @@ dependencies = [ [[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 1.0.0", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -2042,16 +2353,23 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "futures 0.1.31", - "libc", - "miniz_oxide 0.4.4", - "tokio-io", + "miniz_oxide", +] + +[[package]] +name = "fn-error-context" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2077,9 +2395,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2097,6 +2415,15 @@ dependencies = [ ] [[package]] +name = "fs-err" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f" +dependencies = [ + "autocfg", +] + +[[package]] name = "fs2" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2147,9 +2474,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2162,9 +2489,9 @@ 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", "futures-sink", @@ -2172,15 +2499,15 @@ dependencies = [ [[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", @@ -2189,9 +2516,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2199,7 +2526,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2210,26 +2537,26 @@ dependencies = [ [[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.16", + "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-timer" @@ -2239,9 +2566,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[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 0.1.31", "futures-channel", @@ -2288,9 +2615,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 1.0.0", "libc", @@ -2299,20 +2626,20 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.9" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" +checksum = "ef81e7cedce6ab54cd5dc7b3400c442c8d132fe03200a1be0637db7ef308ff17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -2320,7 +2647,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2337,7 +2664,7 @@ dependencies = [ "dag", "git2", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "tracing", ] @@ -2347,7 +2674,8 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "factory", + "fs-err", "git2", "minibytes", "storemodel", @@ -2362,33 +2690,34 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", "regex", + "serde", ] [[package]] name = "h2" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.1.0", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tracing", ] @@ -2404,7 +2733,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash 0.4.7", + "ahash 0.4.8", ] [[package]] @@ -2415,11 +2744,12 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", + "allocator-api2", ] [[package]] @@ -2448,18 +2778,9 @@ dependencies = [ [[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" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2487,7 +2808,7 @@ name = "hg-metrics" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -2505,8 +2826,10 @@ dependencies = [ "cliparser", "clone", "comfy-table", + "commandserver", "configloader", "configmodel", + "constructors", "cpython", "cpython_ext", "ctrlc", @@ -2514,39 +2837,43 @@ dependencies = [ "debugtop", "eagerepo", "edenapi", - "edenfs_client", + "edenfs-client", "exchange", "fail", "flate2", "formatter", + "fs-err", "fsyncglob", "hg-http", + "hg-metrics", "hgplain", "hgtime", "hostname 0.3.1", "identity", "indexedlog", "libc", + "metalog", "metrics-render", "migration", "mincode", "minibytes", "network-doctor", "nodeipc", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "procinfo", "progress-model", "progress-render", "pyconfigloader", + "pyedenclient", + "pyio", + "pymodules", "python3-sys", "pytracing", "rand 0.8.5", "repo", "repo_name", "revisionstore", - "revsets", "runlog", "sampling", "serde", @@ -2573,19 +2900,17 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "commits-trait", "dag", "edenapi", - "futures 0.3.28", - "gitdag", - "metalog", + "factory", + "fs-err", + "futures 0.3.29", "minibytes", - "parking_lot 0.11.2", - "refencode", + "parking_lot", "revlogindex", - "serde", "storemodel", "streams", - "thiserror", "tracing", "types", "zstore", @@ -2605,6 +2930,8 @@ dependencies = [ "identity", "libc", "pyblackbox", + "tracing", + "webview-app", "winapi 0.3.9", ] @@ -2637,17 +2964,26 @@ dependencies = [ ] [[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 = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2666,13 +3002,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 1.4.0", + "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.9", ] [[package]] @@ -2681,7 +3017,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes", "http", "pin-project-lite", ] @@ -2693,19 +3029,20 @@ dependencies = [ "anyhow", "assert_matches", "async-compression", - "atty", - "crossbeam 0.8.2", + "async-runtime", + "clientinfo", + "crossbeam", "curl", "curl-sys", - "env_logger 0.10.0", - "futures 0.3.28", + "env_logger 0.10.1", + "futures 0.3.29", "http", "lru-cache", "maplit", "mockito", "once_cell", "openssl", - "parking_lot 0.11.2", + "parking_lot", "paste", "pin-project 0.4.30", "regex", @@ -2715,7 +3052,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.6.10", + "tokio-util 0.7.10", "tracing", "url", "zstd", @@ -2729,9 +3066,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 = "humantime" @@ -2741,11 +3078,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2754,9 +3091,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -2765,10 +3102,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -2782,7 +3120,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.4.0", + "bytes", "hyper", "native-tls", "tokio", @@ -2791,16 +3129,16 @@ dependencies = [ [[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", + "windows-core", ] [[package]] @@ -2819,13 +3157,24 @@ dependencies = [ "anyhow", "dirs 2.0.2", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "tracing", ] [[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" @@ -2835,6 +3184,16 @@ dependencies = [ ] [[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" @@ -2852,11 +3211,26 @@ dependencies = [ ] [[package]] +name = "im" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core 0.6.4", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] name = "indexedlog" version = "0.1.0" dependencies = [ "atomicfile", "byteorder", + "configmodel", "dev-logger", "fs2", "hex", @@ -2872,6 +3246,7 @@ dependencies = [ "tracing", "twox-hash", "vlqencoding", + "winapi 0.3.9", ] [[package]] @@ -2888,10 +3263,20 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] name = "insta" -version = "1.29.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -2921,60 +3306,69 @@ dependencies = [ name = "io" version = "0.1.0" dependencies = [ - "atty", "configmodel", "hgplain", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pipe", "streampager", - "terminal_size", + "terminal_size 0.3.0", "termwiz", + "time-interval", ] [[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 0.3.3", "libc", "windows-sys 0.48.0", ] [[package]] -name = "iovec" -version = "0.1.4" +name = "ipnet" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "ipnet" -version = "2.7.2" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] [[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", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.24", "windows-sys 0.48.0", ] [[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -2987,24 +3381,24 @@ 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 = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -3050,9 +3444,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3070,15 +3464,26 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.7+1.45.0" +version = "0.1.8+1.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" 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.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libssh2-sys" version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3094,9 +3499,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3114,6 +3519,23 @@ dependencies = [ ] [[package]] +name = "linelog" +version = "0.1.0" +dependencies = [ + "im", + "rand_chacha 0.3.1", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + +[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3126,6 +3548,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] name = "local-encoding" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3138,9 +3566,9 @@ dependencies = [ [[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", @@ -3148,21 +3576,20 @@ 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 1.0.0", "value-bag", ] [[package]] name = "lru" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.2", ] [[package]] @@ -3211,12 +3638,12 @@ name = "manifest-tree" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "manifest", "minibench", "minibytes", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "quickcheck", @@ -3247,20 +3674,20 @@ 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]] -name = "maybe-uninit" -version = "2.0.0" +name = "matches" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[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" @@ -3279,15 +3706,6 @@ checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" [[package]] name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" @@ -3297,9 +3715,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3314,7 +3732,7 @@ dependencies = [ "lazy_static", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", @@ -3330,7 +3748,7 @@ dependencies = [ name = "metrics" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "once_cell", ] @@ -3387,7 +3805,7 @@ version = "0.1.0" name = "minibytes" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes", "memmap2", "quickcheck", "serde", @@ -3401,33 +3819,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3441,7 +3849,7 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.6", + "sha2 0.10.8", "toml", ] @@ -3483,14 +3891,14 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "dag", "drawdag", - "futures 0.3.28", + "futures 0.3.29", "indexedlog", "rand 0.8.5", "rand_chacha 0.3.1", - "tempdir", + "tempfile", "types", "vlqencoding", ] @@ -3535,7 +3943,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3543,14 +3951,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "libc", - "static_assertions", ] [[package]] @@ -3560,12 +3967,18 @@ dependencies = [ "anyhow", "filedescriptor 0.7.3", "libc", - "once_cell", + "nodeipc_derive", + "paste", "serde", "serde_json", + "winapi 0.3.9", ] [[package]] +name = "nodeipc_derive" +version = "0.1.0" + +[[package]] name = "nodemap" version = "0.1.0" dependencies = [ @@ -3601,7 +4014,7 @@ dependencies = [ name = "nonblocking" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", ] [[package]] @@ -3616,9 +4029,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3648,20 +4061,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 0.3.3", "libc", ] @@ -3676,18 +4089,18 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +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 = "opaque-debug" @@ -3696,12 +4109,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] +name = "open" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] name = "openssl" -version = "0.10.52" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3718,7 +4142,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -3729,9 +4153,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3741,24 +4165,16 @@ dependencies = [ [[package]] name = "ordered-float" -version = "1.1.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", + "rand 0.8.5", "serde", ] [[package]] -name = "ordered-float" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" -dependencies = [ - "num-traits", -] - -[[package]] name = "ordered-multimap" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3770,18 +4186,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi 0.3.9", -] +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -3797,20 +4204,9 @@ checksum = "384e52fd8fbd4cbe3c317e8216260c21a0f9134de108cea8a4dd4e7e152c472d" [[package]] name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.11.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3819,41 +4215,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", - "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "winapi 0.3.9", + "windows-targets 0.48.5", ] [[package]] -name = "parking_lot_core" -version = "0.9.7" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "paste" -version = "1.0.12" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pathhistory" @@ -3866,6 +4254,7 @@ dependencies = [ "dev-logger", "manifest", "manifest-tree", + "sha1", "storemodel", "tokio", "tracing", @@ -3877,14 +4266,17 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", + "fancy-regex", + "fs-err", + "glob", "globset", "ignore", - "parking_lot 0.11.2", - "regex-automata", - "regex-syntax 0.6.29", + "parking_lot", + "regex-automata 0.3.9", "tempfile", "thiserror", + "tracing", "types", "util", ] @@ -3902,25 +4294,31 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "perthread" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" [[package]] name = "pest" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -3928,26 +4326,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "pest_meta" -version = "2.6.0" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] @@ -3961,45 +4359,45 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand 0.8.5", ] [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.1", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -4013,9 +4411,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -4031,11 +4429,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "pin-project-internal 1.1.0", + "pin-project-internal 1.1.3", ] [[package]] @@ -4051,20 +4449,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "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" @@ -4089,16 +4487,16 @@ 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.1", - "indexmap", + "base64 0.21.5", + "indexmap 2.1.0", "line-wrap", "quick-xml", "serde", - "time 0.3.21", + "time", ] [[package]] @@ -4108,7 +4506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", @@ -4118,6 +4516,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "pprint" version = "0.1.0" dependencies = [ @@ -4133,13 +4537,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -4169,9 +4571,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4186,13 +4588,24 @@ dependencies = [ ] [[package]] +name = "procutil" +version = "0.1.0" +dependencies = [ + "libc", + "once_cell", + "tracing", + "winapi 0.3.9", +] + +[[package]] name = "progress-model" version = "0.1.0" dependencies = [ "arc-swap", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "paste", + "thread_local", "tokio", "tracing", ] @@ -4203,10 +4616,27 @@ version = "0.1.0" dependencies = [ "progress-model", "termwiz", + "unicode-segmentation", "unicode-width", ] [[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 = "pulldown-cmark" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4222,6 +4652,7 @@ dependencies = [ "atexit", "cpython", "cpython_ext", + "procutil", ] [[package]] @@ -4250,7 +4681,6 @@ name = "pybytes" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "minibytes", "python3-sys", ] @@ -4259,12 +4689,19 @@ dependencies = [ name = "pycats" version = "0.1.0" dependencies = [ - "anyhow", "cats", "cpython", "cpython_ext", "pyconfigloader", - "url", +] + +[[package]] +name = "pycext" +version = "0.1.0" +dependencies = [ + "cc", + "cpython", + "python3-sys", ] [[package]] @@ -4285,8 +4722,6 @@ dependencies = [ "pystatus", "pytreestate", "storemodel", - "treestate", - "types", "vfs", ] @@ -4297,7 +4732,6 @@ dependencies = [ "clientinfo", "cpython", "cpython_ext", - "pyconfigloader", ] [[package]] @@ -4308,7 +4742,6 @@ dependencies = [ "cliparser", "configmodel", "cpython", - "cpython_ext", "pyconfigloader", ] @@ -4325,27 +4758,23 @@ dependencies = [ name = "pyconfigloader" version = "0.1.0" dependencies = [ - "anyhow", "configloader", "cpython", "cpython_ext", "util", - "version", ] [[package]] name = "pycopytrace" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "configmodel", "copytrace", "cpython", "cpython_ext", "dag", - "parking_lot 0.11.2", - "pymanifest", + "parking_lot", "storemodel", "types", ] @@ -4359,11 +4788,12 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "futures 0.3.28", + "futures 0.3.29", "hgcommits", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyedenapi", + "pyio", "pymetalog", "storemodel", ] @@ -4373,7 +4803,6 @@ name = "pydiffhelpers" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", ] [[package]] @@ -4382,7 +4811,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "encoding", + "dirs 2.0.2", ] [[package]] @@ -4390,7 +4819,6 @@ name = "pydoctor" version = "0.1.0" dependencies = [ "cpython", - "cpython_ext", "network-doctor", "pyconfigloader", ] @@ -4407,14 +4835,12 @@ dependencies = [ name = "pyeagerepo" version = "0.1.0" dependencies = [ - "anyhow", "async-runtime", "cpython", "cpython_ext", "dag", "eagerepo", "edenapi_types", - "pyconfigloader", "pydag", "pyedenapi", "storemodel", @@ -4426,7 +4852,6 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", - "blake2", "cpython", "cpython_async", "cpython_ext", @@ -4434,18 +4859,27 @@ dependencies = [ "edenapi", "edenapi_ext", "edenapi_types", - "futures 0.3.28", + "futures 0.3.29", "hgstore", "minibytes", "progress-model", "pyconfigloader", - "pyprogress", "pyrevisionstore", "revisionstore", "types", ] [[package]] +name = "pyedenclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", + "types", +] + +[[package]] name = "pyerror" version = "0.1.0" dependencies = [ @@ -4455,15 +4889,14 @@ dependencies = [ "cpython_ext", "dag", "edenapi", - "hgcommits", "http-client", "indexedlog", "metalog", + "pathmatcher", "repo", "repolock", "revisionstore", "revlogindex", - "treestate", "types", ] @@ -4502,7 +4935,6 @@ dependencies = [ name = "pygitstore" version = "0.1.0" dependencies = [ - "anyhow", "cpython", "cpython_ext", "gitstore", @@ -4551,14 +4983,22 @@ dependencies = [ name = "pyio" version = "0.1.0" dependencies = [ - "clidispatch", "cpython", "cpython_ext", + "io", "pyconfigloader", "termstyle", ] [[package]] +name = "pylinelog" +version = "0.1.0" +dependencies = [ + "cpython", + "linelog", +] + +[[package]] name = "pylock" version = "0.1.0" dependencies = [ @@ -4585,7 +5025,7 @@ dependencies = [ "cpython_ext", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "types", @@ -4598,7 +5038,17 @@ dependencies = [ "cpython", "cpython_ext", "metalog", - "parking_lot 0.11.2", + "parking_lot", +] + +[[package]] +name = "pymodules" +version = "0.1.0" +dependencies = [ + "cpython", + "minibytes", + "pybytes", + "python-modules", ] [[package]] @@ -4658,6 +5108,7 @@ dependencies = [ "cpython", "cpython_ext", "pathmatcher", + "tracing", "types", ] @@ -4676,6 +5127,7 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "procutil", "spawn-ext", ] @@ -4714,7 +5166,7 @@ dependencies = [ "cpython", "cpython_ext", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "renderdag", ] @@ -4722,16 +5174,20 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "pydag", + "pyeagerepo", "pyedenapi", "pymetalog", + "pyrevisionstore", "pyworkingcopy", "repo", "repolock", + "revisionstore", "util", "workingcopy", ] @@ -4746,10 +5202,10 @@ dependencies = [ "configmodel", "cpython", "cpython_ext", - "futures 0.3.28", + "futures 0.3.29", "io", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "pyconfigloader", "revisionstore", "storemodel", @@ -4762,7 +5218,6 @@ version = "0.1.0" dependencies = [ "cpython", "cpython_ext", - "dag", "pybytes", "pydag", "revlogindex", @@ -4787,6 +5242,17 @@ dependencies = [ "cpython_ext", "status", "types", + "util", +] + +[[package]] +name = "python-modules" +version = "0.1.0" +dependencies = [ + "codegen", + "once_cell", + "phf 0.11.2", + "zstdelta", ] [[package]] @@ -4804,6 +5270,16 @@ name = "pythreading" version = "0.1.0" dependencies = [ "cpython", + "rand 0.8.5", +] + +[[package]] +name = "pytoml" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "toml", ] [[package]] @@ -4814,7 +5290,7 @@ dependencies = [ "cpython_ext", "lazy_static", "mincode", - "parking_lot 0.11.2", + "parking_lot", "python3-sys", "serde_json", "tracing", @@ -4830,7 +5306,7 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pypathmatcher", "treestate", @@ -4839,22 +5315,40 @@ dependencies = [ ] [[package]] +name = "pyversion" +version = "0.1.0" +dependencies = [ + "cpython", + "version", +] + +[[package]] name = "pyvlq" version = "0.1.0" dependencies = [ "cpython", "cpython_ext", + "pyio", "vlqencoding", ] [[package]] +name = "pywebview" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "webview-app", +] + +[[package]] name = "pyworker" version = "0.1.0" dependencies = [ "anyhow", "cpython", "cpython_ext", - "crossbeam 0.7.3", + "crossbeam", "memmap2", "minibytes", "pyrevisionstore", @@ -4873,15 +5367,16 @@ dependencies = [ "anyhow", "cpython", "cpython_ext", + "fs-err", "io", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "pyconfigloader", - "pymanifest", "pypathmatcher", "pystatus", "pytreestate", - "storemodel", + "sparse", + "types", "workingcopy", ] @@ -4916,9 +5411,9 @@ dependencies = [ [[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", ] @@ -4937,7 +5432,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "proc-macro2", "quickcheck", @@ -4958,9 +5453,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -5011,6 +5506,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -5063,7 +5559,8 @@ 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", + "serde", ] [[package]] @@ -5076,10 +5573,19 @@ dependencies = [ ] [[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core 0.6.4", +] + +[[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -5087,14 +5593,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel 0.5.8", - "crossbeam-deque 0.8.3", - "crossbeam-utils 0.8.15", - "num_cpus", + "crossbeam-deque", + "crossbeam-utils 0.8.16", ] [[package]] @@ -5108,51 +5612,51 @@ dependencies = [ [[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 = "ref-cast" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] @@ -5164,13 +5668,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.2" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -5183,6 +5688,28 @@ dependencies = [ ] [[package]] +name = "regex-automata" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +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" @@ -5190,9 +5717,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remove_dir_all" @@ -5207,7 +5740,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dag", "itertools", "nonblocking", @@ -5221,18 +5754,20 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits-trait", "configloader", "configmodel", + "constructors", "eagerepo", "edenapi", + "factory", "fail", - "gitstore", - "hgcommits", + "fs-err", "identity", "manifest-tree", "metalog", "once_cell", - "parking_lot 0.11.2", + "parking_lot", "refencode", "repolock", "revisionstore", @@ -5262,8 +5797,9 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", + "fs-err", "fs2", - "parking_lot 0.11.2", + "parking_lot", "tempfile", "thiserror", "tracing", @@ -5272,12 +5808,14 @@ dependencies = [ [[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.1", - "bytes 1.4.0", + "base64 0.21.5", + "bytes", + "cookie", + "cookie_store", "encoding_rs", "futures-core", "futures-util", @@ -5302,10 +5840,11 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.8", + "tokio-util 0.7.10", "tower-service", "url", "wasm-bindgen", @@ -5318,9 +5857,9 @@ dependencies = [ [[package]] name = "reqwest-eventsource" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" dependencies = [ "eventsource-stream", "futures-core", @@ -5339,18 +5878,18 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "auth", - "bincode", - "blake2", - "blake3", "byteorder", + "clientinfo", + "clientinfo_async", "configmodel", - "crossbeam 0.8.2", + "crossbeam", "curl", "edenapi", "edenapi_types", "fbinit", - "futures 0.3.28", + "fn-error-context", + "fs-err", + "futures 0.3.29", "hex", "hg-http", "hg-metrics", @@ -5359,7 +5898,6 @@ dependencies = [ "http", "http-client", "indexedlog", - "lazy_static", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5369,8 +5907,7 @@ dependencies = [ "minibytes", "mockito", "mpatch", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "quickcheck", "quickcheck_arbitrary_derive", @@ -5383,7 +5920,8 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.6", + "sha2 0.10.8", + "stats", "storemodel", "tempfile", "thiserror", @@ -5422,7 +5960,7 @@ dependencies = [ "lz4-pyframe", "minibytes", "nonblocking", - "parking_lot 0.11.2", + "parking_lot", "radixbuf", "tempfile", "thiserror", @@ -5435,7 +5973,9 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "configmodel", "dag", + "edenapi", "metalog", "refencode", "thiserror", @@ -5445,17 +5985,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom 0.2.11", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5468,7 +6007,7 @@ dependencies = [ "fs2", "hg-http", "libc", - "parking_lot 0.11.2", + "parking_lot", "progress-model", "rand 0.8.5", "repo", @@ -5496,23 +6035,36 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", @@ -5522,9 +6074,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -5534,18 +6086,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.1", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -5553,15 +6105,15 @@ dependencies = [ [[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" @@ -5583,18 +6135,19 @@ name = "sampling" version = "0.1.0" dependencies = [ "configmodel", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", + "serde", + "serde_json", "tracing", ] [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5604,7 +6157,7 @@ dependencies = [ "anyhow", "clap 2.34.0", "commitcloudsubscriber", - "env_logger 0.10.0", + "env_logger 0.10.1", "libc", "log", "serde", @@ -5615,15 +6168,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scratch" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[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", @@ -5631,11 +6190,11 @@ dependencies = [ [[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", @@ -5644,9 +6203,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", @@ -5672,9 +6231,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5686,11 +6245,11 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", "byteorder", - "bytes 1.4.0", + "bytes", "serde", "serde_bytes", "thiserror", @@ -5698,9 +6257,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] @@ -5717,31 +6276,40 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[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_spanned" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5765,16 +6333,16 @@ 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 = "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 1.0.0", "cpufeatures", @@ -5802,9 +6370,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -5813,9 +6381,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", ] @@ -5831,9 +6399,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" @@ -5847,9 +6415,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -5863,7 +6431,7 @@ checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", "mio", - "signal-hook 0.3.15", + "signal-hook 0.3.17", ] [[package]] @@ -5877,26 +6445,37 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple_asn1" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" dependencies = [ "chrono", "num-bigint", "num-traits", + "thiserror", ] [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sized-chunks" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] [[package]] name = "skeptic" @@ -5910,33 +6489,43 @@ 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.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 0.3.9", ] [[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 = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "itertools", "quickcheck", @@ -5947,7 +6536,7 @@ name = "sparse" version = "0.1.0" dependencies = [ "anyhow", - "futures 0.3.28", + "futures 0.3.29", "globset", "once_cell", "pathmatcher", @@ -5969,9 +6558,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "static_assertions" @@ -5984,7 +6573,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.1", + "phf 0.11.2", "staticconfig_macros", ] @@ -5993,7 +6582,30 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap", + "indexmap 1.9.3", +] + +[[package]] +name = "stats" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "fbinit", + "futures 0.3.29", + "once_cell", + "perthread", + "stats_traits", + "tokio_shim", +] + +[[package]] +name = "stats_traits" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "auto_impl", + "dashmap", + "fbinit", ] [[package]] @@ -6008,10 +6620,13 @@ name = "storemodel" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", - "auto_impl", - "futures 0.3.28", + "configmodel", + "edenapi_trait", + "futures 0.3.29", "minibytes", + "serde", "types", ] @@ -6022,7 +6637,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap", + "indexmap 1.9.3", "lazy_static", "lru", "memmap2", @@ -6046,7 +6661,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "futures 0.3.28", + "futures 0.3.29", "pin-project 0.4.30", "tokio", ] @@ -6114,9 +6729,71 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "1.0.0-alpha.5" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15df12a8db7c216a04b4b438f90d50d5335cd38f161b56389c9f5c9d96d0873" + +[[package]] +name = "sval_buffer" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e80556bc8acea0446e574ce542ad6114a76a0237f28a842bc01ca3ea98f479" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d93d2259edb1d7b4316179f0a98c62e3ffc726f47ab200e07cfe382771f57b8" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532f7f882226f7a5a4656f5151224aaebf8217e0d539cb1595b831bace921343" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +checksum = "76e03bd8aa0ae6ee018f7ae95c9714577687a4415bd1a5f19b26e34695f7e072" +dependencies = [ + "itoa 1.0.9", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ed054f2fb8c2a0ab5d36c1ec57b412919700099fc5e32ad8e7a38b23e1a9e1" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff191c4ff05b67e3844c161021427646cde5d6624597958be158357d9200586" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] [[package]] name = "syn" @@ -6131,9 +6808,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6153,6 +6830,31 @@ dependencies = [ ] [[package]] +name = "system-command" +version = "0.1.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 = "tempdir" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6164,22 +6866,22 @@ dependencies = [ [[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 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", ] [[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", ] @@ -6190,7 +6892,17 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", + "windows-sys 0.48.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.24", "windows-sys 0.48.0", ] @@ -6203,7 +6915,7 @@ dependencies = [ "dirs 4.0.0", "fnv", "nom 5.1.3", - "phf 0.11.1", + "phf 0.11.2", "phf_codegen", ] @@ -6245,7 +6957,7 @@ checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" dependencies = [ "anyhow", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "cassowary", "cfg-if 1.0.0", "filedescriptor 0.8.2", @@ -6260,7 +6972,7 @@ dependencies = [ "nix 0.24.3", "num-derive", "num-traits", - "ordered-float 3.7.0", + "ordered-float", "pest", "pest_derive", "phf 0.10.1", @@ -6282,6 +6994,14 @@ dependencies = [ ] [[package]] +name = "testutil" +version = "0.1.0" +dependencies = [ + "once_cell", + "parking_lot", +] + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6296,28 +7016,28 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size", + "terminal_size 0.2.6", "unicode-width", ] [[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.16", + "syn 2.0.39", ] [[package]] @@ -6341,14 +7061,12 @@ dependencies = [ "const-cstr", "fb303_core", "fbthrift", - "futures 0.3.28", - "once_cell", + "futures 0.3.29", "ref-cast", - "serde", - "serde_derive", "sorted_vector_map", "thiserror", "thrift_compiler", + "thrift_types", "tracing", "tracing-futures", ] @@ -6362,7 +7080,7 @@ dependencies = [ "config_thrift", "fb303_core", "fbthrift", - "futures 0.3.28", + "futures 0.3.29", "thiserror", "thrift", ] @@ -6370,33 +7088,44 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "anyhow", - "clap 2.34.0", + "clap 4.4.8", + "serde", "which", ] [[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +name = "thrift_types" +version = "0.1.0" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "anyhow", + "codegen_includer_proc_macro", + "config_thrift", + "fb303_core", + "fbthrift", + "futures 0.3.29", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "sorted_vector_map", + "thiserror", + "thrift_compiler", ] [[package]] name = "time" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.9", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -6404,20 +7133,34 @@ 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-interval" +version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] [[package]] +name = "tinyfiledialogs" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25fa0bc43a6566e2cc6d7ac96df3fa5a57beba34445bead1b368ba8fe9ca568" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6434,44 +7177,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", - "bytes 1.4.0", + "backtrace", + "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", ] [[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - -[[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.16", + "syn 2.0.39", ] [[package]] @@ -6486,9 +7218,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -6503,7 +7235,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.10", ] [[package]] @@ -6512,11 +7244,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4322b6e2ebfd3be4082c16df4341505ef333683158b55f22afaf3f61565d728" dependencies = [ - "crossbeam 0.8.2", + "crossbeam", "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.0", + "pin-project 1.1.3", "tokio", "tower", "tower-service", @@ -6526,10 +7258,10 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#20617c5fdbc91b4d2ca036d217d42015188ae382" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" dependencies = [ "async-io", - "futures 0.3.28", + "futures 0.3.29", "tokio", "tracing", "uds_windows", @@ -6541,7 +7273,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", "futures-io", "futures-sink", @@ -6553,23 +7285,39 @@ dependencies = [ [[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 1.4.0", + "bytes", "futures-core", + "futures-io", "futures-sink", + "futures-util", + "hashbrown 0.14.2", "pin-project-lite", + "slab", "tokio", "tracing", ] [[package]] +name = "tokio_shim" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#d17bd97085a53e3da27b6349a6c03e9210b15e05" +dependencies = [ + "futures 0.3.29", + "pin-project 0.4.30", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] name = "toml" -version = "0.7.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -6579,20 +7327,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6627,11 +7375,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 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6648,22 +7395,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap", + "indexmap 1.9.3", "libc", - "parking_lot 0.11.2", + "parking_lot", "serde", "serde_json", "tracing", @@ -6673,9 +7420,9 @@ dependencies = [ [[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", @@ -6687,20 +7434,20 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.28", + "futures 0.3.29", "futures-task", - "pin-project 1.1.0", + "pin-project 1.1.3", "tracing", ] [[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", ] @@ -6719,7 +7466,7 @@ name = "tracing-runtime-callsite" version = "0.1.0" dependencies = [ "once_cell", - "parking_lot 0.11.2", + "parking_lot", "regex", "tracing", ] @@ -6728,10 +7475,7 @@ dependencies = [ name = "tracing-sampler" version = "0.1.0" dependencies = [ - "once_cell", "sampling", - "serde", - "serde_json", "tempfile", "tracing", "tracing-serde", @@ -6750,21 +7494,21 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "time 0.3.21", + "time", "tracing", "tracing-core", "tracing-log", @@ -6799,8 +7543,10 @@ name = "treestate" version = "0.1.0" dependencies = [ "anyhow", - "bitflags", + "atomicfile", + "bitflags 1.3.2", "byteorder", + "fs-err", "fs2", "identity", "itertools", @@ -6809,7 +7555,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.6", + "sha2 0.10.8", "tempfile", "thiserror", "tracing", @@ -6848,9 +7594,9 @@ 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 = "types" @@ -6876,9 +7622,9 @@ dependencies = [ [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uds_windows" @@ -6891,10 +7637,21 @@ dependencies = [ ] [[package]] +name = "udsipc" +version = "0.1.0" +dependencies = [ + "anyhow", + "fn-error-context", + "fs-err", + "nodeipc", + "uds_windows", +] + +[[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -6907,9 +7664,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" @@ -6928,9 +7685,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" @@ -6943,24 +7700,24 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap", + "indexmap 1.9.3", "staticconfig", ] [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] @@ -6985,20 +7742,20 @@ dependencies = [ "once_cell", "rand 0.8.5", "shellexpand", - "tempdir", "tempfile", "thiserror", + "widestring", "winapi 0.3.9", ] [[package]] name = "uuid" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "atomic", - "getrandom 0.2.9", + "getrandom 0.2.11", "serde", "sha1_smol", ] @@ -7011,13 +7768,38 @@ 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" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba39dc791ecb35baad371a3fc04c6eab688c04937d2e0ac6c22b612c0357bf" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e06c10810a57bbf45778d023d432a50a1daa7d185991ae06bcfb6c654d0945" dependencies = [ - "ctor", "sval", - "version_check", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", ] [[package]] @@ -7047,7 +7829,7 @@ name = "vfs" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam 0.8.2", + "crossbeam", "dashmap", "fsinfo", "identity", @@ -7086,15 +7868,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -7102,11 +7884,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -7118,21 +7899,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.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7140,24 +7915,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7167,9 +7942,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7177,28 +7952,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -7210,11 +7985,11 @@ dependencies = [ [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#5a1c58828bacef2a8f0303f21223e62de720852f" +source = "git+https://github.com/facebook/watchman.git?branch=main#4bec06637edeb66496e53d678095fb427040b462" dependencies = [ "anyhow", - "bytes 1.4.0", - "futures 0.3.28", + "bytes", + "futures 0.3.29", "maplit", "serde", "serde_bser", @@ -7226,31 +8001,41 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "webview-app" +version = "0.1.0" dependencies = [ - "ring", - "untrusted", + "anyhow", + "base64 0.13.1", + "dirs 2.0.2", + "open", + "serde", + "serde_json", + "tinyfiledialogs", + "tracing", + "version", + "webview-sys", ] [[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +name = "webview-sys" +version = "0.6.2" dependencies = [ - "webpki", + "cc", ] [[package]] @@ -7282,7 +8067,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" dependencies = [ "log", - "ordered-float 3.7.0", + "ordered-float", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -7301,16 +8086,23 @@ dependencies = [ [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.24", ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7340,9 +8132,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 0.3.9", ] @@ -7354,27 +8146,12 @@ 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" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -7392,7 +8169,7 @@ 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]] @@ -7412,17 +8189,17 @@ 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]] @@ -7433,9 +8210,9 @@ 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 = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -7445,9 +8222,9 @@ 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 = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -7457,9 +8234,9 @@ 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 = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -7469,9 +8246,9 @@ 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_x86_64_gnu" @@ -7481,9 +8258,9 @@ 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 = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -7493,9 +8270,9 @@ 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_msvc" @@ -7505,26 +8282,27 @@ 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.6" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -7534,16 +8312,19 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags", + "bitflags 1.3.2", + "configloader", "configmodel", - "crossbeam 0.8.2", - "edenfs_client", - "futures 0.3.28", + "crossbeam", + "edenfs-client", + "fs-err", + "futures 0.3.29", + "hgtime", "identity", "io", "manifest", "manifest-tree", - "parking_lot 0.11.2", + "parking_lot", "pathmatcher", "progress-model", "repolock", @@ -7552,10 +8333,8 @@ dependencies = [ "sparse", "status", "storemodel", - "tempdir", "tempfile", "thiserror", - "thrift-types", "tokio", "tracing", "treestate", @@ -7596,32 +8375,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] @@ -7645,7 +8442,7 @@ dependencies = [ "lru-cache", "mincode", "minibytes", - "parking_lot 0.11.2", + "parking_lot", "quickcheck", "serde", "sha1", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 85a4e4d901f24..3a51d280db569 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -16,9 +16,12 @@ , fixup_yarn_lock , glibcLocales , libiconv +, Cocoa , CoreFoundation +, CoreGraphics , CoreServices , Security +, WebKit , enableMinimal ? false }: @@ -45,7 +48,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-NwOexCU+TdZAdruivqRuqhwt0veryeGykLdH6vth+p4="; + hash = "sha256-+LxvPJkyq/6gtcBQepZ5pVGXP1/h30zhCHVfUGPUzFE="; }; addonsSrc = "${src}/addons"; @@ -53,7 +56,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-AlY7/cdGr4i87+wMhPBh/+LFDoF8aC23OLDEHu9lYqU="; + sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU="; }; # Builds the NodeJS server that runs with `sl web` @@ -77,6 +80,14 @@ let yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + # TODO: build-tar.py tries to run 'yarn install'. We patched + # shebangs node_modules, so we don't want 'yarn install' + # changing files. We should disable the 'yarn install' in + # build-tar.py to be safe. + ${python3Packages.python}/bin/python3 build-tar.py \ + --output isl-dist.tar.xz \ + --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' + runHook postBuild ''; @@ -84,8 +95,7 @@ let runHook preInstall mkdir -p $out - cd isl - node release.js $out + install isl-dist.tar.xz $out/isl-dist.tar.xz runHook postInstall ''; @@ -103,14 +113,20 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-MKyj91z+hciJOg4Lhb6ik7zUgCwuHsX8N9HVSP2JkKE="; - "fb303_core-0.0.0" = "sha256-5AU54rpeDub2Iol56S4X+xfdU07zWAtOyCNRBZLzUZA="; - "fbthrift-0.0.1+unstable" = "sha256-n4ES6zRyTgsNxbrM4AUraJ6W4tLHiKdfSyL3Yd0ET34="; - "serde_bser-0.3.1" = "sha256-PkQx2/axT/7LQ4Mvfz1AYBWKXGvaTHkOP2jtljvuYxY="; + "cloned-0.1.0" = "sha256-dtAyQq6fgxvr1RXPQHGiCQesvitsKpVkis4c50uolLc="; + "fb303_core-0.0.0" = "sha256-j+4zPXxewRxJsPQaAfvcpSkGNKw3d+inVL45Ibo7Q4E="; + "fbthrift-0.0.1+unstable" = "sha256-fsIL07PFu645eJFttIJU4sRSjIVuA4BMJ6kYAA0BpwY="; + "serde_bser-0.3.1" = "sha256-h50EJL6twJwK90sBXu40Oap4SfiT4kQAK1+bA8XKdHw="; }; }; postPatch = '' cp ${./Cargo.lock} Cargo.lock + '' + lib.optionalString (!enableMinimal) '' + # If asked, we optionally patch in a hardcoded path to the + # 'nodejs' package, so that 'sl web' always works. Without the + # patch, 'sl web' will still work if 'nodejs' is in $PATH. + substituteInPlace lib/config/loader/src/builtin_static/core.rs \ + --replace '"#);' $'[web]\nnode-path=${nodejs}/bin/node\n"#);' ''; # Since the derivation builder doesn't have network access to remain pure, @@ -122,23 +138,8 @@ python3Packages.buildPythonApplication { sed -i "s|https://files.pythonhosted.org/packages/[[:alnum:]]*/[[:alnum:]]*/[[:alnum:]]*/|file://$NIX_BUILD_TOP/$sourceRoot/hack_pydeps/|g" $sourceRoot/setup.py ''; - # Now, copy the "sl web" (aka edenscm-isl) results into the output of this - # package, so that the command can actually work. NOTES: - # - # 1) This applies on all systems (so no conditional a la postFixup) - # 2) This doesn't require any kind of fixup itself, so we leave it out - # of postFixup for that reason, too - # 3) If asked, we optionally patch in a hardcoded path to the 'nodejs' package, - # so that 'sl web' always works - # 4) 'sl web' will still work if 'nodejs' is in $PATH, just not OOTB - preFixup = '' - sitepackages=$out/lib/${python3Packages.python.libPrefix}/site-packages - chmod +w $sitepackages - cp -r ${isl} $sitepackages/edenscm-isl - '' + lib.optionalString (!enableMinimal) '' - chmod +w $sitepackages/edenscm-isl/run-isl - substituteInPlace $sitepackages/edenscm-isl/run-isl \ - --replace 'NODE=node' 'NODE=${nodejs}/bin/node' + postInstall = '' + install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; postFixup = lib.optionalString stdenv.isLinux '' @@ -159,9 +160,12 @@ python3Packages.buildPythonApplication { ] ++ lib.optionals stdenv.isDarwin [ curl libiconv + Cocoa CoreFoundation + CoreGraphics CoreServices Security + WebKit ]; HGNAME = "sl"; @@ -183,6 +187,9 @@ python3Packages.buildPythonApplication { echo "OK!" ''; + # Expose isl to nix repl as sapling.isl. + passthru.isl = isl; + meta = with lib; { description = "A Scalable, User-Friendly Source Control System"; homepage = "https://sapling-scm.com"; diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 36d89f3cd1b36..7e7ca0b09dad8 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -1,78 +1,5 @@ { - "links": [ - { - "sha256": "0dgg5x4nvdpfiz552diy11xg72y14s38hjz9qxygafnfgybg6hab", - "url": "https://files.pythonhosted.org/packages/22/a6/858897256d0deac81a172289110f31629fc4cee19b6f01283303e18c8db3/ptyprocess-0.7.0-py2.py3-none-any.whl" - }, - { - "sha256": "0dq9f7irmml1nm9a2rx8dd6m2dqmzjj1x40mk0rg619wrdfsaj0b", - "url": "https://files.pythonhosted.org/packages/39/7b/88dbb785881c28a102619d46423cb853b46dbccc70d3ac362d99773a78ce/pexpect-4.8.0-py2.py3-none-any.whl" - }, - { - "sha256": "0r4xy2sqwyhwlwj81zvhzbnx7a7r4xdz9xyzzkjczlx7gk1cig1d", - "url": "https://files.pythonhosted.org/packages/23/6a/210816c943c9aeeb29e4e18a298f14bf0e118fe222a23e13bfcc2d41b0a4/ipython-7.16.1-py3-none-any.whl" - }, - { - "sha256": "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw", - "url": "https://files.pythonhosted.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b/simplegeneric-0.8.1.zip" - }, - { - "sha256": "16sgpg57kxx5jh467d9qwc2hwshfvdbl0xkafdp3qspvbfp46qc0", - "url": "https://files.pythonhosted.org/packages/44/6f/7120676b6d73228c96e17f1f794d8ab046fc910d781c8d151120c3f1569e/toml-0.10.2-py2.py3-none-any.whl" - }, - { - "sha256": "1qn3bnyd7gdwkyk8nvlhiy3c6zbwjd49fjxj0gp8xxi9faiysiwz", - "url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl" - }, - { - "sha256": "0mfj5d1bgpy1clfgwrkmjqm2pv70pm01jp4iyyhphc96kyifdg7v", - "url": "https://files.pythonhosted.org/packages/4c/1c/ff6546b6c12603d8dd1070aa3c3d273ad4c07f5771689a7b69a550e8c951/backcall-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "0yxz45fzjsq6zh5f9cjl0gf4vfg1l7rd79zyb3ih544layjg3ff8", - "url": "https://files.pythonhosted.org/packages/4e/78/56aa1b5f4d8ac548755ae767d84f0be54fdd9d404197a3d9e4659d272348/setuptools-57.0.0-py3-none-any.whl" - }, - { - "sha256": "1177pfa343r378020a85l3b16ak479qgyvh8k5719fgbkhm81d5y", - "url": "https://files.pythonhosted.org/packages/59/7c/e39aca596badaf1b78e8f547c807b04dae603a433d3e7a7e04d67f2ef3e5/wcwidth-0.2.5-py2.py3-none-any.whl" - }, - { - "sha256": "1r55ffffaq4q3dpvha7iipgxlqwvjg5cklf9izr42xj5rr226r26", - "url": "https://files.pythonhosted.org/packages/87/61/2dfea88583d5454e3a64f9308a686071d58d59a55db638268a6413e1eb6d/prompt_toolkit-2.0.10-py3-none-any.whl" - }, - { - "sha256": "08v36wa0kckc892bk4nypl6sszbysarm8jhslviz1agp2sf1jp3f", - "url": "https://files.pythonhosted.org/packages/6a/36/b1b9bfdf28690ae01d9ca0aa5b0d07cb4448ac65fb91dc7e2d094e3d992f/decorator-5.0.9-py3-none-any.whl" - }, - { - "sha256": "0mnzcb714ynl1qlv9dwnh50rv75mmj18ywaxbl8xzm3l9m0syjcn", - "url": "https://files.pythonhosted.org/packages/9a/41/220f49aaea88bc6fa6cba8d05ecf24676326156c23b991e80b3f2fc24c77/pickleshare-0.7.5-py2.py3-none-any.whl" - }, - { - "sha256": "13iv73575lilrm01ffhr8y8sxn8kxhvfqsgwckbr919725280vnn", - "url": "https://files.pythonhosted.org/packages/a6/c9/be11fce9810793676017f79ffab3c6cb18575844a6c7b8d4ed92f95de604/Pygments-2.9.0-py3-none-any.whl" - }, - { - "sha256": "0i7ycyjad9kq6lgq5ih7j8xsm639z24250s6d17pp781v6hwdd3h", - "url": "https://files.pythonhosted.org/packages/ca/ab/872a23e29cec3cf2594af7e857f18b687ad21039c1f9b922fac5b9b142d5/traitlets-4.3.3-py2.py3-none-any.whl" - }, - { - "sha256": "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa", - "url": "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" - }, - { - "sha256": "1f7sc4ydjj33gadcgfz8fcx02d1wm2frlqwzdik1krlr6wikgpbj", - "url": "https://files.pythonhosted.org/packages/fa/bc/9bd3b5c2b4774d5f33b2d544f1460be9df7df2fe42f352135381c347c69a/ipython_genutils-0.2.0-py2.py3-none-any.whl" - }, - { - "sha256": "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm", - "url": "https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57/ipdb-0.13.9.tar.gz" - }, - { - "sha256": "1xqsihpqnfal29nb5kmw8z71nd4jbsnbz7p3lkr094xpb13wycw7", - "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" - } - ], - "version": "0.2.20230523-092610+f12b7eee", - "versionHash": "11350811807294821405" + "links": [], + "version": "0.2.20231113-145254+995db0d6", + "versionHash": "214505116687308775" } diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 37840f486dc5d..8682057b78380 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,4 +1,6 @@ -{ python3 +{ lib +, stdenv +, python3 , callPackage , recurseIntoAttrs , nixosTests @@ -35,7 +37,9 @@ let hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; }; nativeCheckInputs = with super; [ pytestCheckHook mock ]; - disabledTestPaths = []; + disabledTestPaths = [] + # Disable incompatible tests on Darwin. + ++ lib.optionals stdenv.isDarwin [ "test/aaa_profiling" ]; }); flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 84ddb35415d8e..068e9cca20aa6 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -10,9 +10,9 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2090"; - aarch64sha256 = "96nJn+7bVoLM6D14pFujlj3JOQL5PwdU1+SWzEjoYhU="; - x64sha256 = "bu51gsu0XxZBF8/HncPttcKiIRpC7qsKTgR9cktKOnI="; + buildVersion = "2092"; + aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; + x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; dev = true; } {}; } diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index a4fe957099284..9a507e93ab655 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.12.1-2"; + version = "1.12.3-1"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-vYoVHVT/Deooxq/0WVzPebR68N9KBJfgLU30lJPB89M="; + hash = "sha256-F2y5daIdNJZGNjOctN9iA6kHSRVSMWK8s80X+kXxzb4="; }; unpackPhase = '' diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 9e8e88ecfbf3b..954ea58b4554d 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -17,6 +17,7 @@ , gjs , gtk4 , gst_all_1 +, libGL , libadwaita , appstream-glib , libsoup @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk4 + libGL libadwaita libsoup wayland diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 2c168912253f9..99694efda1d31 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -62,7 +62,7 @@ let SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 42d5b281bbea2..5414193640f0e 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -5,7 +5,6 @@ , fetchurl , fetchpatch , frigate -, opencv4 , nixosTests }: @@ -26,28 +25,6 @@ let python = python3.override { packageOverrides = self: super: { - # https://github.com/blakeblackshear/frigate/blob/v0.12.0/requirements-wheels.txt#L7 - opencv = super.toPythonModule ((opencv4.override { - enablePython = true; - pythonPackages = self; - }).overrideAttrs (oldAttrs: rec { - version = "4.5.5"; - src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv"; - rev = "refs/tags/${version}"; - hash = "sha256-TJfzEAMh4JSshZ7oEZPgB59+NBACsj6Z5TCzVOBaEP4="; - }; - contribSrc = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_contrib"; - rev = "refs/tags/${version}"; - hash = "sha256-skuH9GYg0mivGaJjxbggXk4x/0bbQISrAawA3ZUGfCk="; - }; - postUnpack = '' - cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" - ''; - })); }; }; @@ -129,7 +106,7 @@ python.pkgs.buildPythonApplication rec { imutils matplotlib numpy - opencv + opencv4 openvino paho-mqtt peewee diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 0878c2f1ed597..4ab5222c54ba5 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -37,19 +37,20 @@ let in stdenv.mkDerivation rec { pname = "glaxnimate"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitLab { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake wrapQtAppsHook + qttools ]; buildInputs = [ @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { python3WithLibs ]; + # Translation needs to be separately compiled + # https://gitlab.com/mattbas/glaxnimate/-/issues/648 + buildFlags = [ "translations" ]; + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix index be02bb5c690ee..052548f32f272 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -1,15 +1,28 @@ -{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11 -, libXcomposite, glfw, libpulseaudio, ffmpeg }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, makeWrapper +, pkg-config +, libXcomposite +, libpulseaudio +, ffmpeg +, wayland +, libdrm +, libva +, libglvnd +, libXrandr +}: + +stdenv.mkDerivation { pname = "gpu-screen-recorder"; - version = "1.0.0"; + version = "unstable-2023-11-18"; - src = fetchgit { - url = "https://repo.dec05eba.com/gpu-screen-recorder"; - rev = "36fd4516db06bcb192e49055319d1778bbed0322"; - sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w="; + # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + src = fetchurl { + url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r418.5a8900e.tar.gz"; + hash = "sha256-Dal6KxQOTqoNH6e8lYk5XEXGFG/vzbguNFZ9yk9nKe0="; }; + sourceRoot = "."; nativeBuildInputs = [ pkg-config @@ -17,27 +30,26 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glew - libX11 libXcomposite - glfw libpulseaudio ffmpeg + wayland + libdrm + libva + libXrandr ]; - postPatch = '' - substituteInPlace ./build.sh \ - --replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \ - --replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so' - ''; - buildPhase = '' ./build.sh ''; - installPhase = '' - install -Dt $out/bin/ gpu-screen-recorder - wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib + postInstall = '' + install -Dt $out/bin gpu-screen-recorder gsr-kms-server + mkdir $out/bin/.wrapped + mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ + makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ + --prefix LD_LIBRARY_PATH : ${libglvnd}/lib \ + --prefix PATH : $out/bin ''; meta = with lib; { diff --git a/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch b/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch deleted file mode 100644 index bd0d7111c80a3..0000000000000 --- a/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/build.sh b/build.sh -index 05603db..8c38b31 100755 ---- a/build.sh -+++ b/build.sh -@@ -2,5 +2,5 @@ - - dependencies="gtk+-3.0 x11 xrandr libpulse" - includes="$(pkg-config --cflags $dependencies)" --libs="$(pkg-config --libs $dependencies)" -+libs="$(pkg-config --libs $dependencies) -ldl" - g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs -diff --git a/src/main.cpp b/src/main.cpp -index ae2078f..9dcdce1 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -15,6 +15,7 @@ - #include <pwd.h> - #include <libgen.h> - #include <functional> -+#include <dlfcn.h> - - typedef struct { - Display *display; -@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata) - } - - static bool is_nv_fbc_installed() { -- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0; -+ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY); -+ if (handle) { -+ dlclose(handle); -+ return true; -+ } else { -+ return false; -+ } - } - - static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) { diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 6bfb425f0af9b..cc3a5033bd11c 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -1,28 +1,36 @@ -{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr -, libpulseaudio, gpu-screen-recorder }: - -stdenv.mkDerivation rec { +{ stdenv +, lib +, fetchurl +, pkg-config +, makeWrapper +, gtk3 +, libpulseaudio +, libdrm +, gpu-screen-recorder +, libglvnd +, wrapGAppsHook +}: + +stdenv.mkDerivation { pname = "gpu-screen-recorder-gtk"; - version = "0.1.0"; + version = "3.2.5"; - src = fetchgit { - url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; - rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead"; - sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4="; + src = fetchurl { + url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r175.cfd18af.tar.gz"; + hash = "sha256-HhZe22Hm9yGoy5WoyuP2+Wj8E3nMs4uf96mzmP6CMqU="; }; - - patches = [ ./fix-nvfbc-check.patch ]; + sourceRoot = "."; nativeBuildInputs = [ pkg-config makeWrapper + wrapGAppsHook ]; buildInputs = [ gtk3 - libX11 - libXrandr libpulseaudio + libdrm ]; buildPhase = '' @@ -33,7 +41,9 @@ stdenv.mkDerivation rec { install -Dt $out/bin/ gpu-screen-recorder-gtk install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop - wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]} + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}) + # we also append /run/opengl-driver/lib as it otherwise fails to find libcuda. + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) ''; meta = with lib; { diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index bb2c340835153..0f0008bd7a1c2 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -116,7 +116,7 @@ in stdenv.mkDerivation { # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453 (fetchpatch { name = "Fix fmt10 compat"; - url = "https://github.com/xbmc/xbmc/pull/23453.patch"; + url = "https://github.com/xbmc/xbmc/compare/acca69baa2eae65123e78ee2f77249181725ef5d...26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c.patch"; hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0="; }) ]; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index ddec8efb6a412..372ace9ffa3a5 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "sha256-3TmmLAU/muiI90hrYrctzgVbWS4rXjxzAa0ctVYKSSY="; + sha256 = "sha256-f23glk91HWSEW/Glq/DdEikTQeg1eELEg4XG9zTsU78="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 4d7bb155f5cc8..2deb0e9b976e1 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; changelog = "https://github.com/hoyon/mpv-mpris/releases/tag/${version}"; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index ec9885fc7e7c8..622ba7d66e289 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = " Audio device and application capture for OBS Studio using PipeWire "; + description = "Audio device and application capture for OBS Studio using PipeWire"; homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; maintainers = with maintainers; [ Elinvention ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 48ee9ee639497..9b7ec4090dd55 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-AbSI6HBdOEI54bUVqqF+b4LcCyzW30XlS9SXX2ajkas="; + hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 8335e01e2db3c..38366782f3bef 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt + '' + lib.optionalString stdenv.isDarwin '' + # Darwin requires both Magick++ and MagickCore or it will fail to link. + substituteInPlace src/CMakeLists.txt \ + --replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)' ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index 6a403e25c644c..cd61cfc9d0d44 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -7,19 +7,20 @@ , json-glib , libinput , gtk4 +, libadwaita , wrapGAppsHook4 , libxkbcommon , pkg-config }: stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.8.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = pname; rev = "v${version}"; - hash = "sha256-IfegYHHFbZbMTA8JWXAun9Gl3BpykH/5RqUIrlYlLhk="; + hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 + libadwaita libevdev libinput libxkbcommon diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index 7ab14d8c1e678..88018e5a5612a 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -1,26 +1,28 @@ { lib , stdenv -, copyDesktopItems +, fetchzip , makeDesktopItem +, nix-update-script + +, copyDesktopItems +, icoutils , makeWrapper -, fetchzip + , ffmpeg , gtk2 , hunspell -, icoutils , mono , mpv , tesseract4 -, nix-update-script }: stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.1"; + version = "4.0.2"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-Z7NVn4F19Hx55YWPNmbpWZ8yQulXd50bcy2A/8pCqJ4="; + hash = "sha256-kcs2h6HeWniJhGDNsy+EBauXbiDIlLCOJkVOCIzLBzM="; stripRoot = false; }; @@ -80,16 +82,16 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A subtitle editor"; - homepage = "https://nikse.dk/subtitleedit"; - license = licenses.gpl3Plus; longDescription = '' With Subtitle Edit you can easily adjust a subtitle if it is out of sync with the video in several different ways. You can also use it for making new subtitles from scratch (using the time-line /waveform/spectrogram) or for translating subtitles. ''; - maintainers = with maintainers; [ paveloom ]; + homepage = "https://nikse.dk/subtitleedit"; + license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ paveloom ]; }; } diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 777a1ce0c7f19..04c1296b0e34c 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.42"; + version = "5.45"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-V4ScXzZwh3fWCWmeGeb1hce+INYBmf3wtemwNch5FjY="; + hash = "sha256-2WJXOv15oZRk2doecd+xOURygbX4oGyeMAJiiuiRBi4="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 5d7dc52409272..437c8d16cfd87 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.12.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-T+jmsHZA7poxwLSFi9N8ALa0te735HQer9ByH2Wub60="; + sha256 = "sha256-eE2cxqV/XpGyxneVzpP7f215IReH1nwGEkfCHbxUgVs="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index f5b90bb2c8844..925fa38a199aa 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, electron_22, buildNpmPackage, fetchFromGitHub }: +{ lib, stdenv, electron, buildNpmPackage, fetchFromGitHub, fetchpatch }: buildNpmPackage { pname = "webtorrent-desktop"; - version = "0.25-pre"; + version = "0.25-pre-1eb612"; src = fetchFromGitHub { owner = "webtorrent"; repo = "webtorrent-desktop"; - rev = "fce078defefd575cb35a5c79d3d9f96affc8a08f"; - sha256 = "sha256-gXFiG36qqR0QHTqhaxgQKDO0UCHkJLnVwUTQB/Nct/c="; + rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c"; + sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg="; }; - npmDepsHash = "sha256-pEuvstrZ9oMdJ/iU6XwEQ1BYOyQp/ce6sYBTrMCjGMc="; + patches = [ + # electron 27 fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch"; + hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM="; + }) + # startup fix + (fetchpatch { + url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch"; + hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI="; + }) + ]; + npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE="; makeCacheWritable = true; npmRebuildFlags = [ "--ignore-scripts" ]; installPhase = '' @@ -31,7 +43,7 @@ buildNpmPackage { cat > $out/bin/WebTorrent <<EOF #! ${stdenv.shell} set -eu - exec ${electron_22}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@" + exec ${electron}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@" EOF chmod +x $out/bin/WebTorrent cp -r static/linux/share/icons $out/share/ @@ -44,7 +56,7 @@ buildNpmPackage { description = "Streaming torrent app for Mac, Windows, and Linux"; homepage = "https://webtorrent.io/desktop"; license = licenses.mit; - maintainers = [ maintainers.flokli maintainers.bendlas ]; + maintainers = [ maintainers.bendlas ]; }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3ff03781732bb..82e814610dcef 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM="; + hash = "sha256-/kCnzOL8CJuJJglHzmev3alt8cMwTUbIiZhNft9zwps="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 23d6f35cabf43..1d90b428023ba 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A secure virtual machine monitor for KVM"; - homepage = "https://chromium.googlesource.com/crosvm/crosvm/"; + homepage = "https://crosvm.dev/"; mainProgram = "crosvm"; maintainers = with maintainers; [ qyliss ]; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 1864d167978a0..bd8dbab4cfcaa 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.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-17TlUQNv/L+LZYF8vub2nI5TVF66OqTA8PrjEYjkz5o="; + hash = "sha256-g8XaMvKt3tR7a7kq+n4ueDXx9iWuAu02ONb73W23ZGY="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-zBogjMaVkLum1rQVEd+Rw8lRCNC/Dhi7cuz4YH3eCcg="; + vendorHash = "sha256-BeW39XN1CvPCCq4otX+Il2dGGcjGrTMzc4iSXmQZFmw="; 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 e987396164112..a8c7d77da670d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -179,7 +179,7 @@ rec { makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23") [ + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.isLinux) [ glibc glibc.static ]; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 34cb0cc757cba..8a0161476863c 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.78.0"; + version = "1.78.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-/FppBl25AgwZhNcwWmUc0ThaTm1U4lhaoCTTJ/R/srI="; + hash = "sha256-8/hHv5veTQXNg8c5oew+5FWLAQkytTD2+Gdb30sY9lo="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 9c19818b2f660..e35a5d16a49df 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.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GmIrz23z/vV6Ut31pajUmPfT9V37Ajs5JaIMD1Ociu8="; + sha256 = "sha256-yeZGhE+ImWXW3HPpAo+E1GOSEwPr7yK78XVmCocGqH4="; }; - cargoHash = "sha256-AwDaIHuD/0H/SkhxT/V0/4K/5yp+s5DI34e8JQgajgc="; + cargoHash = "sha256-xqKYd80PCM7Rnj+9dV2XjigE4sweOnL4HfOQiOYzCEQ="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index ce1a439b73cec..e5d5eb9309820 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-XaZgvy8b/3XUjO/GAQV6fxfqlR+eSMeosC7ugoYsEJM="; + hash = "sha256-l6jbc/+Fi5xx7yhK0e5/iqcm7i8JnU37Qr4niVG4OvU="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index ddb06a97f162e..67ea1e07b9088 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,14 +1,13 @@ { lib , fetchFromGitHub , hostPlatform -, targetPlatform , cargo , rustc , lld }: let - arch = targetPlatform.qemuArch; + arch = hostPlatform.qemuArch; target = ./. + "/${arch}-unknown-none.json"; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index b52608875f337..8a86f06785b4d 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -7,14 +7,14 @@ let apptainer = callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.2.2"; + version = "1.2.4"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; - rev = "v${version}"; - hash = "sha256-CpNuoG+QykP+HDCyFuIbZKYez5XnYrE75SWFoWu34rg="; + rev = "refs/tags/v${version}"; + hash = "sha256-VaVOepfjMBf8F56S1Clpn8HPw65MNQMoZsQguKQ4Sg0="; }; # Update by running @@ -38,25 +38,26 @@ let singularity = callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "3.11.4"; + version = "4.0.2"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; - rev = "v${version}"; - hash = "sha256-v8iHbn2OzK/egP2Go76BI74iX8izfy2PM4Uo8LsE8FY="; + rev = "refs/tags/v${version}"; + hash = "sha256-R+vAKYR4lJmC7PIITYyg4UeGYjGXoPqqUai3HmPzwG0="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-24Hnpq6LRh3JgaiJWCmHfJKoWLxsbceCdJutjPqZsX8="; + vendorHash = "sha256-z3VozeMpaqh4ddZxB3xqo25Gm+8JYeIwASOq+Mmerr4="; - # Do not build conmon from the Git submodule source, + # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version extraConfigureFlags = [ "--without-conmon" + "--without-squashfuse" ]; extraDescription = " (Sylabs Inc's fork of Singularity, a.k.a. SingularityCE)"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 4e4d7e7d0a92e..b322563328944 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio +, gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null @@ -21,10 +21,12 @@ python3.pkgs.buildPythonApplication rec { intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils + wrapGAppsHook ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ - wrapGAppsHook + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 ] ++ lib.optional spiceSupport spice-gtk; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 63a5e8613e189..1f07da0a7bc4c 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -6,6 +6,7 @@ , libevdev , libinput , libxkbcommon +, xcbutilwm , makeWrapper , mesa , meson @@ -24,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.9.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic="; + hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon + xcbutilwm mesa # for libEGL headers pango pixman @@ -69,6 +71,8 @@ stdenv.mkDerivation rec { # Patch cagebreak to read its default configuration from $out/share/cagebreak sed -i "s|/etc/xdg/cagebreak|$out/share/cagebreak|" meson.build cagebreak.c + substituteInPlace meson.build \ + --replace "/usr/share/licenses" "$out/share/licenses" ''; postFixup = lib.optionalString withXwayland '' diff --git a/pkgs/applications/window-managers/cosmic/applets/default.nix b/pkgs/applications/window-managers/cosmic/applets/default.nix deleted file mode 100644 index f64f6b31247c2..0000000000000 --- a/pkgs/applications/window-managers/cosmic/applets/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rust, rustPlatform -, cargo, just, pkg-config, util-linuxMinimal -, dbus, glib, libxkbcommon, pulseaudio, wayland -}: - -rustPlatform.buildRustPackage { - pname = "cosmic-applets"; - version = "unstable-2023-10-04"; - - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-applets"; - rev = "fefaea9b63548b1baa5e64521b860234ee46339a"; - hash = "sha256-I+18NCKLH/3QajYpZRPYmCUxkbptAjuEHfKtnZVOlH4="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; - "cosmic-client-toolkit-0.1.0" = "sha256-pVWK+dODQxNej5jWyb5wX/insoiXkX8NFBDkDEejVV0="; - "cosmic-config-0.1.0" = "sha256-pUDuRHX46fbcPw19s5DEsPyJdb/Bem/lJg+3NEO/WX0="; - "cosmic-dbus-networkmanager-0.1.0" = "sha256-eWqB+zRCfJYdrcPE8Ey+WgzPBJltN0zRiutzgdtWsDA="; - "cosmic-notifications-config-0.1.0" = "sha256-KnPQdrMpzA05v4bt0Fz9fbcKdC0cSU60Hv7wqrthIaw="; - "cosmic-panel-config-0.1.0" = "sha256-H3QuiP7Og69wm9yCX/uoSG0aQ3B/61q9Sdj+rW4KZMU="; - "cosmic-time-0.3.0" = "sha256-JiTwbJSml8azelBr6b3cBvJsuAL1hmHtuHx2TJupEzE="; - "smithay-client-toolkit-0.17.0" = "sha256-v3FxzDypxSfbEU50+oDoqrGWPm+S+kDZQq//3Q4DDRU="; - "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; - "xdg-shell-wrapper-config-0.1.0" = "sha256-Otxp8D5dNZl70K1ZIBswGj6K5soGVbVim7gutUHkBvw="; - }; - }; - - postPatch = '' - substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" - ''; - - nativeBuildInputs = [ just pkg-config util-linuxMinimal ]; - buildInputs = [ dbus glib libxkbcommon pulseaudio wayland ]; - - dontUseJustBuild = true; - - justFlags = [ - "--set" "prefix" (placeholder "out") - "--set" "target" "${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release" - ]; - - # Force linking to libwayland-client, which is always dlopen()ed. - "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lwayland-client" - "-Wl,--pop-state" - ]; - - meta = with lib; { - homepage = "https://github.com/pop-os/cosmic-applets"; - description = "Applets for the COSMIC Desktop Environment"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/cosmic/panel/default.nix b/pkgs/applications/window-managers/cosmic/panel/default.nix deleted file mode 100644 index 7908eeb305771..0000000000000 --- a/pkgs/applications/window-managers/cosmic/panel/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cargo, just, pkg-config, rust, rustPlatform -, libglvnd, libxkbcommon, wayland -}: - -rustPlatform.buildRustPackage { - pname = "cosmic-panel"; - version = "unstable-2023-09-22"; - - src = fetchFromGitHub { - owner = "pop-os"; - repo = "cosmic-panel"; - rev = "df55f44f504c1cee9377cb331c1fb9d95ca83967"; - hash = "sha256-qf1ITvP6PPATZ6jvlc0UuCes1UYMseY4Wr57/5xRZPE="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "cosmic-client-toolkit-0.1.0" = "sha256-pVWK+dODQxNej5jWyb5wX/insoiXkX8NFBDkDEejVV0="; - "cosmic-config-0.1.0" = "sha256-XsFfQzR1gn8Je5lbd6PmSgz/T7XAFTVnR1G6pUY+eX4="; - "cosmic-notifications-util-0.1.0" = "sha256-wRUPovWJucsrKGhjHXku/4UoZf9ih9+Wpbs0sLN+oCI="; - "launch-pad-0.1.0" = "sha256-gFtUtrD/cUVpLxPvg6iLxxAK97LTlvI4uLxo06UYIU4="; - "smithay-0.3.0" = "sha256-hulj6zr4h8A9RElQyrJBy3lvYMd7COe3uDaFMMaWNrM="; - "smithay-client-toolkit-0.17.0" = "sha256-13fXDYqO/701tzoOk8ujHtzgzzz1N6GGbcHUrsNhQ0U="; - "xdg-shell-wrapper-0.1.0" = "sha256-VCiDjvcCsb02LMo7UpEROV6lzX2DYf4Ix9zfEDO2pUg="; - }; - }; - - nativeBuildInputs = [ just pkg-config ]; - buildInputs = [ libglvnd libxkbcommon wayland ]; - - dontUseJustBuild = true; - - justFlags = [ - "--set" "prefix" (placeholder "out") - "--set" "bin-src" "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-panel" - ]; - - # Force linking to libEGL, which is always dlopen()ed. - "CARGO_TARGET_${rust.toRustTargetForUseInEnvVars stdenv.hostPlatform}_RUSTFLAGS" = - map (a: "-C link-arg=${a}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-Wl,--pop-state" - ]; - - meta = with lib; { - homepage = "https://github.com/pop-os/cosmic-panel"; - description = "Panel for the COSMIC Desktop Environment"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix index dcb454b3f82c3..0e3550037135a 100644 --- a/pkgs/applications/window-managers/cosmic/settings/default.nix +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { (placeholder "out") "--set" "bin-src" - "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-settings" ]; postInstall = '' diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 2f9475054c35c..d47b63dda4d04 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-k3W2IoBc75DNQ2QSjChsC/yVRO/aZT3E31Tl/njgH30="; + hash = "sha256-LvLiw6+hduAl8dNBTtBwqvgKBRwojBUd5tNm1hZl5Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 09577f37b2d63..402b358474465 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -10,6 +10,7 @@ , git , hyprland-protocols , jq +, libGL , libdrm , libexecinfo , libinput @@ -40,13 +41,13 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renam 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.32.0"; + version = "0.32.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-HrnlCdZBqqE37gFORapfSGEGcqhCyhX2aSMRnDEmR0k="; + hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4="; }; patches = [ @@ -88,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { cairo git hyprland-protocols + libGL libdrm libinput libxkbcommon diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 484cda3328d22..8191582dfb3a8 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -42,8 +42,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "47bf87ade2bd32395615a385ebde1fefbcdf79a2"; - hash = "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY="; + rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1"; + hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I="; }; pname = diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 32c2a8085d13e..80308ee138f86 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , file +, libGL , libjpeg , mesa , pango @@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ file + libGL libjpeg mesa pango diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 1dab92609d047..a4a747fba3f99 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -6,6 +6,7 @@ , ninja , cairo , fribidi +, libGL , libdatrie , libjpeg , libselinux @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo fribidi + libGL libdatrie libjpeg libselinux diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index 47875ec47c320..f9f6de9212706 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -1,4 +1,4 @@ -{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch }: +{ i3lock-color, lib, stdenv, fetchFromGitHub, fetchpatch, libGL }: i3lock-color.overrideAttrs (oldAttrs : rec { pname = "i3lock-blur"; @@ -21,6 +21,8 @@ i3lock-color.overrideAttrs (oldAttrs : rec { }) ]; + buildInputs = oldAttrs.buildInputs ++ [ libGL ]; + meta = with lib; { description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; homepage = "https://github.com/karulont/i3lock-blur/"; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 8656db60c4eea..596aa8ceea124 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, - libxkbfile, libjpeg_turbo, xcbutilxrm + libxkbfile, libjpeg_turbo, xcbutilxrm, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; + libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm xorg.xcbutil ]; makeFlags = [ "all" ]; preInstall = '' diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b8dffa259d76f..b7cca2b66376b 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, - xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: + xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile, xorg }: stdenv.mkDerivation rec { pname = "i3lock"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage xcbutilxrm - pam libX11 libev cairo libxkbcommon libxkbfile ]; + pam libX11 libev cairo libxkbcommon libxkbfile xorg.xcbutil ]; meta = with lib; { description = "A simple screen locker like slock"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 1c06fc2ae28d2..43a1c13ee0e59 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform -, xorg, python3, pkg-config, cairo, libxkbcommon }: +, xorg, python3, pkg-config, cairo, expat, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "wmfocus"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; - buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; + buildInputs = [ cairo expat libxkbcommon xorg.xcbutilkeysyms ]; # For now, this is the only available featureset. This is also why the file is # in the i3 folder, even though it might be useful for more than just i3 diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 0e233dd86ac4b..1b58fa0f2c89b 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, libGL , libinput , libxkbcommon , mesa @@ -22,6 +23,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; buildInputs = [ + libGL libxkbcommon mesa pango diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 91a13df5c21eb..bbf1cefacd4ca 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }: +{ lib +, fetchFromGitHub +, rustPlatform +, libX11 +, libXinerama +}: let rpathLibs = [ libXinerama libX11 ]; @@ -6,16 +11,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; - rev = version; - sha256 = "sha256-SjEp0gQHwq3Omhx/EPnyLeQJ50Ov0rHDxmYVWBwIDBs="; + rev = "refs/tags/${version}"; + hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y="; }; - cargoSha256 = "sha256-kdGqnfzO+Ev9QeZcZqISPTehEXZzCWT5S8p6JbTBreE="; + cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk="; buildInputs = rpathLibs; @@ -23,16 +28,18 @@ rustPlatform.buildRustPackage rec { for p in $out/bin/left*; do patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p done + + install -D -m 0555 leftwm/doc/leftwm.1 $out/share/man/man1/leftwm.1 ''; dontPatchELF = true; - meta = with lib; { + meta = { description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ yanganto ]; - changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ yanganto ]; + changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md"; }; } diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 8f553eb4b5540..0d8436dcb3ed2 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight xcb based bar"; homepage = "https://github.com/LemonBoy/bar"; - maintainers = with maintainers; [ meisternu fortuneteller2k ]; + maintainers = with maintainers; [ meisternu moni ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 54e7820ec4c29..8d009a3458b3c 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = "https://github.com/drscream/lemonbar-xft"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index e878f4f088e86..36e6322462da1 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DelusionalLogic/NeoComp"; license = licenses.gpl3Only; - maintainers = with maintainers; [ twey fortuneteller2k ]; + maintainers = with maintainers; [ twey moni ]; platforms = platforms.linux; description = "A fork of Compton, a compositor for X11"; longDescription = '' diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 453dcf14d82e1..e149bdd652186 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ adamcstephens - fortuneteller2k + moni rodrgz ]; mainProgram = "river"; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 6e11d842fe926..38fa09e86f706 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre2, json_c, libevdev +, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wayland libxkbcommon pcre2 json_c libevdev + libGL wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit (finalAttrs) enableXWayland; }) diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 21a7daa1fa34b..7510e1e9582b3 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -17,22 +17,22 @@ with lib; let sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); - baseWrapper = writeShellScriptBin "sway" '' + baseWrapper = writeShellScriptBin sway.meta.mainProgram '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export XDG_CURRENT_DESKTOP=sway + export XDG_CURRENT_DESKTOP=${sway.meta.mainProgram} ${extraSessionCommands} export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${sway}/bin/sway "$@" + exec ${lib.getExe sway} "$@" else - exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" + exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" fi ''; in symlinkJoin { - name = "sway-${sway.version}"; + name = "${sway.meta.mainProgram}-${sway.version}"; paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; @@ -49,14 +49,14 @@ in symlinkJoin { postBuild = '' ${optionalString withGtkWrapper "gappsWrapperArgsHook"} - wrapProgram $out/bin/sway \ + wrapProgram $out/bin/${sway.meta.mainProgram} \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ ${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"} ''; passthru = { inherit (sway.passthru) tests; - providedSessions = [ "sway" ]; + providedSessions = [ sway.meta.mainProgram ]; }; inherit (sway) meta; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 8311c3690afb5..c633b19abc709 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -8,6 +8,7 @@ , wf-config , cairo , doctest +, libGL , libdrm , libexecinfo , libevdev @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wf-config + libGL libdrm libexecinfo libevdev diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 467396a6d8ae8..3d2c720e137cb 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch2 , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland +, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland , wayland-protocols, xcbutilcursor , demoSupport ? true @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libdrm libevdev libinput libxkbcommon mesa seatd wayland + cairo libGL libdrm libevdev libinput libxkbcommon mesa seatd wayland wayland-protocols ] ++ lib.optional hdrSupport libdisplay-info ++ lib.optional jpegSupport libjpeg diff --git a/pkgs/build-support/binary-cache/default.nix b/pkgs/build-support/binary-cache/default.nix index 27f9ad9628998..8c610c512276e 100644 --- a/pkgs/build-support/binary-cache/default.nix +++ b/pkgs/build-support/binary-cache/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages }: +{ lib, stdenv, coreutils, jq, python3, nix, xz }: # This function is for creating a flat-file binary cache, i.e. the kind created by # nix copy --to file:///some/path and usable as a substituter (with the file:// prefix). @@ -19,15 +19,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = lib.makeBinPath (with buildPackages; [ coreutils jq python3 nix xz ]); + nativeBuildInputs = [ coreutils jq python3 nix xz ]; - builder = builtins.toFile "builder" '' - . .attrs.sh - - export out=''${outputs[out]} - - mkdir $out - mkdir $out/nar + buildCommand = '' + mkdir -p $out/nar python ${./make-binary-cache.py} diff --git a/pkgs/build-support/binary-cache/make-binary-cache.py b/pkgs/build-support/binary-cache/make-binary-cache.py index 16dd8a7e96bcf..589d005562b1f 100644 --- a/pkgs/build-support/binary-cache/make-binary-cache.py +++ b/pkgs/build-support/binary-cache/make-binary-cache.py @@ -3,7 +3,7 @@ import json import os import subprocess -with open(".attrs.json", "r") as f: +with open(os.environ["NIX_ATTRS_JSON_FILE"], "r") as f: closures = json.load(f)["closure"] os.chdir(os.environ["out"]) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index e25a714050895..6a5e82427f7b0 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -3,7 +3,6 @@ , glibcLocales # The GraalVM derivation to use , graalvmDrv -, name ? "${args.pname}-${args.version}" , executable ? args.pname # JAR used as input for GraalVM derivation, defaults to src , jar ? args.src @@ -15,13 +14,13 @@ "-H:Name=${executable}" "-march=compatibility" "--verbose" + "-J-Dsun.stdout.encoding=UTF-8" + "-J-Dsun.stderr.encoding=UTF-8" ] # Extra arguments to be passed to the native-image , extraNativeImageBuildArgs ? [ ] # XMX size of GraalVM during build , graalvmXmx ? "-J-Xmx6g" - # Locale to be used by GraalVM compiler -, LC_ALL ? "en_US.UTF-8" , meta ? { } , ... } @ args: @@ -41,7 +40,7 @@ let ]; in stdenv.mkDerivation ({ - inherit dontUnpack LC_ALL jar; + inherit dontUnpack jar; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ graalvmDrv glibcLocales ]; diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 8d02b4e5124d8..8cd63e4609518 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -10,6 +10,13 @@ for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do hardeningEnableMap["$flag"]=1 done +# fortify3 implies fortify enablement - make explicit before +# we filter unsupported flags because unsupporting fortify3 +# doesn't mean we should unsupport fortify too +if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then + hardeningEnableMap["fortify"]=1 +fi + # Remove unsupported flags. for flag in @hardening_unsupported_flags@; do unset -v "hardeningEnableMap[$flag]" @@ -19,7 +26,7 @@ for flag in @hardening_unsupported_flags@; do fi done -# make fortify and fortify3 mutually exclusive +# now make fortify and fortify3 mutually exclusive if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then unset -v "hardeningEnableMap['fortify']" fi diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 6c43f8cbfa6d2..b8d170df01b73 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -246,7 +246,7 @@ if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then fi if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp --tmpdir cc-params.XXXXXX) + responseFile=$(mktemp "${TMPDIR:-/tmp}/cc-params.XXXXXX") trap 'rm -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 6b3ff6fd62b05..f2aa4964d9a1d 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,7 +4,7 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, buildPackages }: +{ stdenv, coreutils, jq }: { rootPaths }: @@ -19,18 +19,24 @@ stdenv.mkDerivation { preferLocalBuild = true; - PATH = "${buildPackages.coreutils}/bin:${buildPackages.jq}/bin"; + nativeBuildInputs = [ coreutils jq ]; - builder = builtins.toFile "builder" - '' - . .attrs.sh + empty = rootPaths == []; + buildCommand = + '' out=''${outputs[out]} mkdir $out - jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths + if [[ -n "$empty" ]]; then + echo 0 > $out/total-nar-size + touch $out/registration $out/store-paths + else + jq -r ".closure | map(.narSize) | add" < "$NIX_ATTRS_JSON_FILE" > $out/total-nar-size + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < "$NIX_ATTRS_JSON_FILE" | head -n -1 > $out/registration + jq -r '.closure[].path' < "$NIX_ATTRS_JSON_FILE" > $out/store-paths + fi + ''; } diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index 76328e5645f6b..1a98f98fb8e61 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: +{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: { sdkSetupScript ? "" , pubGetScript ? "dart pub get" @@ -36,11 +36,15 @@ let dartDeps = (fetchDartDeps.override { - dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p "$out/bin" - makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + dart = symlinkJoin { + name = "dart-fod"; + paths = [ dart ]; + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + }; }) { buildDrvArgs = args; inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 70fd3635b7454..7218d67062e78 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -914,17 +914,30 @@ rec { (cd old_out; eval "$extraCommands" ) mkdir $out - ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' - source $stdenv/setup - ${optionalString (!enableFakechroot) ''cd old_out''} - eval "$fakeRootCommands" - tar \ - --sort name \ - --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ - --hard-dereference \ - -cf $out/layer.tar . - ' - + ${if enableFakechroot then '' + proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + source $stdenv/setup + eval "$fakeRootCommands" + tar \ + --sort name \ + --exclude=./proc \ + --exclude=./sys \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + '' else '' + fakeroot bash -c ' + source $stdenv/setup + cd old_out + eval "$fakeRootCommands" + tar \ + --sort name \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + ''} sha256sum $out/layer.tar \ | cut -f 1 -d ' ' \ > $out/checksum diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 686d89f8c11cb..f8ed3a38890c3 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -158,6 +158,22 @@ stdenvNoCC.mkDerivation (args // { dotnet-sdk ]; + # Parse the version attr into a format acceptable for the Version msbuild property + # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string + versionForDotnet = if !(lib.hasAttr "version" args) || args.version == null + then null else let + components = lib.pipe args.version [ + lib.splitVersion + (lib.filter (x: (lib.strings.match "[0-9]+" x) != null)) + (lib.filter (x: (lib.toInt x) < 65535)) # one version component in dotnet has to fit in 16 bits + ]; + in if (lib.length components) == 0 + then null + else lib.concatStringsSep "." ((lib.take 4 components) + ++ (if (lib.length components) < 4 + then lib.replicate (4 - (lib.length components)) "0" + else [ ])); + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" ]; @@ -172,7 +188,7 @@ stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; - } // lib.optionalAttrs (nugetDepsFile != null) { + } // lib.optionalAttrs (!lib.isDerivation nugetDeps) { fetch-deps = let flags = dotnetFlags ++ dotnetRestoreFlags; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index e9567b64cf2c9..0acfeced9b169 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -24,8 +24,13 @@ dotnetBuildHook() { dotnetBuildFlags+=("-p:UseAppHost=true") fi + local versionFlags=() if [ "${version-}" ]; then - local -r versionFlag="-p:Version=${version-}" + versionFlags+=("-p:InformationalVersion=${version-}") + fi + + if [ "${versionForDotnet-}" ]; then + versionFlags+=("-p:Version=${versionForDotnet-}") fi dotnetBuild() { @@ -43,7 +48,7 @@ dotnetBuildHook() { -p:Deterministic=true \ --configuration "@buildType@" \ --no-restore \ - ${versionFlag-} \ + ${versionFlags[@]} \ ${runtimeIdFlags[@]} \ ${dotnetBuildFlags[@]} \ ${dotnetFlags[@]} diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 991864719a073..4515e0e82f497 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "$stdenv/setup" echo "exporting \`$url' (revision $rev) into \`$out'" diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 4b49e9676ec02..7e4dde4a64c8b 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup (echo "#!$SHELL"; \ diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index 75b9066dba6f4..39838db255a6e 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tagtext="" diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index 4eb70f672d488..489914a2a8b43 100644 --- a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source "${stdenv}/setup" echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" diff --git a/pkgs/build-support/fetchfossil/builder.sh b/pkgs/build-support/fetchfossil/builder.sh index 36b758ab574e4..fe828d0ada9d0 100644 --- a/pkgs/build-support/fetchfossil/builder.sh +++ b/pkgs/build-support/fetchfossil/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "Cloning Fossil $url [$rev] into $out" diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index 77f6381b09ab2..95176beea8c13 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -3,7 +3,7 @@ # - revision specified and remote has a HEAD # - revision specified and remote without HEAD # -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (rev $rev) into $out" diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh index 1ce294757713c..20dfde4b10d44 100644 --- a/pkgs/build-support/fetchhg/builder.sh +++ b/pkgs/build-support/fetchhg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "getting $url${rev:+ ($rev)} into $out" diff --git a/pkgs/build-support/fetchipfs/builder.sh b/pkgs/build-support/fetchipfs/builder.sh index ca77962b53847..1ddd111b15182 100644 --- a/pkgs/build-support/fetchipfs/builder.sh +++ b/pkgs/build-support/fetchipfs/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Curl flags to handle redirects, not use EPSV, handle cookies for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 1aabd7949ee1d..de929fad55a92 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup set -x diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index aa4d049aba431..e187747f14e6a 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchsvnssh/builder.sh b/pkgs/build-support/fetchsvnssh/builder.sh index 5782151524f7a..e553446346de3 100644 --- a/pkgs/build-support/fetchsvnssh/builder.sh +++ b/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting $url (r$rev) into $out" diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index e8eaba934858e..a82728ef1025c 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup source $mirrorsFile diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 09b43063fb96a..d0fd8928c91ab 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -297,6 +297,7 @@ let } // meta; }); in +lib.warnIf (args' ? vendorSha256) "`vendorSha256` is deprecated. Use `vendorHash` instead" lib.warnIf (buildFlags != "" || buildFlagsArray != "") "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 9babc7ae62871..eecea8b767584 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchNpmDeps, buildPackages, nodejs } @ topLevelArgs: +{ lib +, stdenv +, fetchNpmDeps +, buildPackages +, nodejs +, darwin +} @ topLevelArgs: { name ? "${args.pname}-${args.version}" , src ? null @@ -35,16 +41,15 @@ # Value for npm `--workspace` flag and directory in which the files to be installed are found. , npmWorkspace ? null , nodejs ? topLevelArgs.nodejs +, npmDeps ? fetchNpmDeps { + inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch; + name = "${name}-npm-deps"; + hash = npmDepsHash; +} , ... } @ args: let - npmDeps = fetchNpmDeps { - inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch; - name = "${name}-npm-deps"; - hash = npmDepsHash; - }; - # .override {} negates splicing, so we need to use buildPackages explicitly npmHooks = buildPackages.npmHooks.override { inherit nodejs; @@ -55,7 +60,9 @@ in stdenv.mkDerivation (args // { inherit npmDeps npmBuildScript; - nativeBuildInputs = nativeBuildInputs ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook ]; + nativeBuildInputs = nativeBuildInputs + ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook nodejs.python ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = buildInputs ++ [ nodejs ]; strictDeps = true; diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh index 79e2c4b26860d..a2f77bdc6d430 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh @@ -14,7 +14,7 @@ npmInstallHook() { local dest="$packageOut/$(dirname "$file")" mkdir -p "$dest" cp "${npmWorkspace-.}/$file" "$dest" - done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm pack --json --dry-run ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") + done < <(@jq@ --raw-output '.[0].files | map(.path) | join("\n")' <<< "$(npm pack --json --dry-run --loglevel=warn --no-foreground-scripts ${npmWorkspace+--workspace=$npmWorkspace} $npmPackFlags "${npmPackFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}")") # Based on code from Python's buildPythonPackage wrap.sh script, for # supporting both the case when makeWrapperArgs is an array and a diff --git a/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/pkgs/build-support/node/fetch-yarn-deps/fixup.js index 8b91e7efa63fd..732e569aba7bd 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/fixup.js +++ b/pkgs/build-support/node/fetch-yarn-deps/fixup.js @@ -21,6 +21,8 @@ const fixupYarnLock = async (lockContents, verbose) => { if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) pkg.resolved = urlToName(url) + if (hash) + pkg.resolved += `#${hash}` return [dep, pkg] }) diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix index dfc25275f34c5..2171c622f000a 100644 --- a/pkgs/build-support/references-by-popularity/default.nix +++ b/pkgs/build-support/references-by-popularity/default.nix @@ -6,11 +6,8 @@ path: runCommand "closure-paths" exportReferencesGraph.graph = path; __structuredAttrs = true; preferLocalBuild = true; - PATH = "${coreutils}/bin:${python3}/bin"; - builder = builtins.toFile "builder" - '' - . .attrs.sh - python3 ${./closure-graph.py} .attrs.json graph > ''${outputs[out]} - ''; - } - "" + nativeBuildInputs = [ coreutils python3 ]; +} +'' + python3 ${./closure-graph.py} "$NIX_ATTRS_JSON_FILE" graph > ''${outputs[out]} +'' diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 944434472b0b8..e842b6a3f501e 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,6 +1,5 @@ { lib, stdenv , mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI -, rust }: { crateName, @@ -21,7 +20,7 @@ (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--target" (rust.toRustTargetSpec stdenv.hostPlatform) + "--target" stdenv.hostPlatform.rust.rustcTargetSpec ] ++ lib.optionals (needUnstableCLI dependencies) [ "-Z" "unstable-options" ] ++ extraRustcOpts diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 60310f178747e..d837d0012590c 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: { build , buildDependencies @@ -7,6 +7,7 @@ , completeBuildDeps , completeDeps , crateAuthors +, crateLinks , crateDescription , crateHomepage , crateFeatures @@ -124,8 +125,8 @@ in '' export CARGO_PKG_AUTHORS="${authors}" export CARGO_PKG_DESCRIPTION="${crateDescription}" - export CARGO_CFG_TARGET_ARCH=${rust.toTargetArch stdenv.hostPlatform} - export CARGO_CFG_TARGET_OS=${rust.toTargetOs stdenv.hostPlatform} + export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.rust.platform.arch} + export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" @@ -134,10 +135,11 @@ in '' export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name} export CARGO_MANIFEST_DIR=$(pwd) + export CARGO_MANIFEST_LINKS=${crateLinks} export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" - export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" + export TARGET="${stdenv.hostPlatform.rust.rustcTargetSpec}" + export HOST="${stdenv.buildPlatform.rust.rustcTargetSpec}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index d977fb9f7c27e..1760ab6e99a68 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -10,7 +10,6 @@ , fetchCrate , pkgsBuildBuild , rustc -, rust , cargo , jq , libiconv @@ -71,18 +70,14 @@ let inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv rust echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; }; installCrate = import ./install-crate.nix { inherit stdenv; }; - - # Allow access to the rust attribute set from inside buildRustCrate, which - # has a parameter that shadows the name. - rustAttrs = rust; in /* The overridable pkgs.buildRustCrate function. @@ -240,6 +235,7 @@ crate_: lib.makeOverridable "edition" "buildTests" "codegenUnits" + "links" ]; extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; nativeBuildInputs_ = nativeBuildInputs; @@ -310,7 +306,7 @@ crate_: lib.makeOverridable depsMetadata = lib.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); hashedMetadata = builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString (mkRustcFeatureArgs crateFeatures) + - "___" + depsMetadata + "___" + rustAttrs.toRustTarget stdenv.hostPlatform); + "___" + depsMetadata + "___" + stdenv.hostPlatform.rust.rustcTarget); in lib.substring 0 10 hashedMetadata; @@ -322,6 +318,7 @@ crate_: lib.makeOverridable crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ]; crateHomepage = crate.homepage or ""; + crateLinks = crate.links or ""; crateType = if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else @@ -342,7 +339,7 @@ crate_: lib.makeOverridable configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription - crateFeatures crateRenames libName build workspace_member release libPath crateVersion + crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks extraLinkFlags extraRustcOptsForBuildRs crateAuthors crateHomepage verbose colors codegenUnits; }; diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 18d8ca56fd1fc..cf2ddbd084b8f 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -1,7 +1,6 @@ { lib , importCargoLock , fetchCargoTarball -, rust , stdenv , callPackage , cargoBuildHook @@ -78,13 +77,13 @@ let sha256 = args.cargoSha256; } // depsExtraArgs); - target = rust.toRustTargetSpec stdenv.hostPlatform; + target = stdenv.hostPlatform.rust.rustcTargetSpec; targetIsJSON = lib.hasSuffix ".json" target; useSysroot = targetIsJSON && !__internal_dontAddSysroot; sysroot = callPackage ./sysroot { } { inherit target; - shortTarget = rust.lib.toRustTargetSpecShort stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.cargoShortTarget; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted }; @@ -156,7 +155,8 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg # Platforms without host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html "armv7a-darwin" - "armv5tel-linux" "armv7a-linux" "m68k-linux" "riscv32-linux" + "armv5tel-linux" "armv7a-linux" "m68k-linux" "mipsel-linux" + "mips64el-linux" "riscv32-linux" "armv6l-netbsd" "x86_64-redox" "wasm32-wasi" diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index a6d53056d9c7c..bb95b7bdc35cd 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rust, rustPlatform, buildPackages }: +{ lib, stdenv, rustPlatform, buildPackages }: { shortTarget, originalCargoToml, target, RUSTFLAGS }: @@ -26,7 +26,7 @@ in rustPlatform.buildRustPackage { done export RUST_SYSROOT=$(rustc --print=sysroot) - host=${rust.toRustTarget stdenv.buildPlatform} + host=${stdenv.buildPlatform.rust.rustcTarget} cp -r $RUST_SYSROOT/lib/rustlib/$host $out ''; diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 205d085d3507c..7703ff4abad49 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -13,7 +13,7 @@ # This confusingly-named parameter indicates the *subdirectory of # `target/` from which to copy the build artifacts. It is derived # from a stdenv platform (or a JSON file). -, target ? rust.lib.toRustTargetSpecShort stdenv.hostPlatform +, target ? stdenv.hostPlatform.rust.cargoShortTarget }: { @@ -65,10 +65,10 @@ diff = "${lib.getBin buildPackages.diffutils}/bin/diff"; cargoConfig = '' - [target."${rust.toRustTarget stdenv.buildPlatform}"] + [target."${stdenv.buildPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForBuild}" ${lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rust.toRustTarget stdenv.hostPlatform}"] + [target."${stdenv.hostPlatform.rust.rustcTarget}"] "linker" = "${rust.envVars.ccForHost}" ''} "rustflags" = [ "-C", "target-feature=${if stdenv.hostPlatform.isStatic then "+" else "-"}crt-static" ] diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index ceca7323176cd..dad8ab5282357 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -5,89 +5,6 @@ }: rec { - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch - toTargetArch = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.arch - else if platform.isAarch32 then "arm" - else if platform.isMips64 then "mips64" # never add "el" suffix - else if platform.isPower64 then "powerpc64" # never add "le" suffix - else platform.parsed.cpu.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os - toTargetOs = platform: - /**/ if platform ? rustc.platform then platform.rustc.platform.os or "none" - else if platform.isDarwin then "macos" - else platform.parsed.kernel.name; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_family - toTargetFamily = platform: - if platform ? rustc.platform.target-family - then - ( - # Since https://github.com/rust-lang/rust/pull/84072 - # `target-family` is a list instead of single value. - let - f = platform.rustc.platform.target-family; - in - if builtins.isList f then f else [ f ] - ) - else lib.optional platform.isUnix "unix" - ++ lib.optional platform.isWindows "windows"; - - # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor - toTargetVendor = platform: let - inherit (platform.parsed) vendor; - in platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; - - # Returns the name of the rust target, even if it is custom. Adjustments are - # because rust has slightly different naming conventions than we do. - toRustTarget = platform: let - inherit (platform.parsed) cpu kernel abi; - cpu_ = platform.rustc.platform.arch or { - "armv7a" = "armv7"; - "armv7l" = "armv7"; - "armv6l" = "arm"; - "armv5tel" = "armv5te"; - "riscv64" = "riscv64gc"; - }.${cpu.name} or cpu.name; - vendor_ = toTargetVendor platform; - in platform.rustc.config - or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - - # Returns the name of the rust target if it is standard, or the json file - # containing the custom target spec. - toRustTargetSpec = platform: - if platform ? rustc.platform - then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) - else toRustTarget platform; - - # Returns the name of the rust target if it is standard, or the - # basename of the file containing the custom target spec, without - # the .json extension. - # - # This is the name used by Cargo for target subdirectories. - toRustTargetSpecShort = platform: - lib.removeSuffix ".json" - (baseNameOf "${toRustTargetSpec platform}"); - - # When used as part of an environment variable name, triples are - # uppercased and have all hyphens replaced by underscores: - # - # https://github.com/rust-lang/cargo/pull/9169 - # https://github.com/rust-lang/cargo/issues/8285#issuecomment-634202431 - # - toRustTargetForUseInEnvVars = platform: - lib.strings.replaceStrings ["-"] ["_"] - (lib.strings.toUpper - (toRustTargetSpecShort platform)); - - # Returns true if the target is no_std - # https://github.com/rust-lang/rust/blob/2e44c17c12cec45b6a682b1e53a04ac5b5fcc9d2/src/bootstrap/config.rs#L415-L421 - IsNoStdTarget = platform: let rustTarget = toRustTarget platform; in - builtins.any (t: lib.hasInfix t rustTarget) ["-none" "nvptx" "switch" "-uefi"]; - # These environment variables must be set when using `cargo-c` and # several other tools which do not deal well with cross # compilation. The symptom of the problem they fix is errors due @@ -107,12 +24,12 @@ rec { ccForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"; cxxForTarget = "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"; - rustBuildPlatform = toRustTarget stdenv.buildPlatform; - rustBuildPlatformSpec = toRustTargetSpec stdenv.buildPlatform; - rustHostPlatform = toRustTarget stdenv.hostPlatform; - rustHostPlatformSpec = toRustTargetSpec stdenv.hostPlatform; - rustTargetPlatform = toRustTarget stdenv.targetPlatform; - rustTargetPlatformSpec = toRustTargetSpec stdenv.targetPlatform; + rustBuildPlatform = stdenv.buildPlatform.rust.rustcTarget; + rustBuildPlatformSpec = stdenv.buildPlatform.rust.rustcTargetSpec; + rustHostPlatform = stdenv.hostPlatform.rust.rustcTarget; + rustHostPlatformSpec = stdenv.hostPlatform.rust.rustcTargetSpec; + rustTargetPlatform = stdenv.targetPlatform.rust.rustcTarget; + rustTargetPlatformSpec = stdenv.targetPlatform.rust.rustcTargetSpec; in { inherit ccForBuild cxxForBuild rustBuildPlatform rustBuildPlatformSpec @@ -131,20 +48,34 @@ rec { # the following lines when rustTargetPlatform collides with # rustHostPlatform. + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' - "CC_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${ccForTarget}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.targetPlatform}=${cxxForTarget}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.targetPlatform}_LINKER=${ccForTarget}" \ + "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ + "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ '' + '' - "CC_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${ccForHost}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.hostPlatform}=${cxxForHost}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.hostPlatform}_LINKER=${ccForHost}" \ + "CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \ + "CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \ + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \ '' + '' - "CC_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${ccForBuild}" \ - "CXX_${toRustTargetForUseInEnvVars stdenv.buildPlatform}=${cxxForBuild}" \ - "CARGO_TARGET_${toRustTargetForUseInEnvVars stdenv.buildPlatform}_LINKER=${ccForBuild}" \ + "CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \ + "CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \ + "CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \ "CARGO_BUILD_TARGET=${rustBuildPlatform}" \ "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" \ "HOST_CXX=${buildPackages.stdenv.cc}/bin/c++" \ ''; }; +} // lib.mapAttrs (old: new: platform: + # TODO: enable warning after 23.05 is EOL. + # lib.warn "`rust.${old} platform` is deprecated. Use `platform.rust.${new}` instead." + lib.getAttrFromPath new platform.rust) +{ + toTargetArch = [ "platform" "arch" ]; + toTargetOs = [ "platform" "os" ]; + toTargetFamily = [ "platform" "target-family" ]; + toTargetVendor = [ "platform" "vendor" ]; + toRustTarget = [ "rustcTarget" ]; + toRustTargetSpec = [ "rustcTargetSpec" ]; + toRustTargetSpecShort = [ "cargoShortTarget" ]; + toRustTargetForUseInEnvVars = [ "cargoEnvVarTarget" ]; + IsNoStdTarget = [ "isNoStdTarget" ]; } diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.py b/pkgs/build-support/setup-hooks/auto-patchelf.py index 965384b876fcd..261f55854808e 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -174,7 +174,7 @@ class Dependency: found: bool = False # Whether it was found somewhere -def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = []) -> list[Dependency]: +def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = [], extra_args: List[str] = []) -> list[Dependency]: try: with open_elf(path) as elf: @@ -213,7 +213,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if file_is_dynamic_executable: print("setting interpreter of", path) subprocess.run( - ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()], + ["patchelf", "--set-interpreter", interpreter_path.as_posix(), path.as_posix()] + extra_args, check=True) rpath += runtime_deps @@ -250,7 +250,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List if rpath: print("setting RPATH to:", rpath_str) subprocess.run( - ["patchelf", "--set-rpath", rpath_str, path.as_posix()], + ["patchelf", "--set-rpath", rpath_str, path.as_posix()] + extra_args, check=True) return dependencies @@ -262,7 +262,8 @@ def auto_patchelf( runtime_deps: List[Path], recursive: bool = True, ignore_missing: List[str] = [], - append_rpaths: List[Path] = []) -> None: + append_rpaths: List[Path] = [], + extra_args: List[str] = []) -> None: if not paths_to_patch: sys.exit("No paths to patch, stopping.") @@ -275,7 +276,7 @@ def auto_patchelf( dependencies = [] for path in chain.from_iterable(glob(p, '*', recursive) for p in paths_to_patch): if not path.is_symlink() and path.is_file(): - dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths) + dependencies += auto_patchelf_file(path, runtime_deps, append_rpaths, extra_args) missing = [dep for dep in dependencies if not dep.found] @@ -333,6 +334,12 @@ def main() -> None: type=Path, help="Paths to append to all runtime paths unconditionally", ) + parser.add_argument( + "--extra-args", + nargs="*", + type=str, + help="Extra arguments to pass to patchelf" + ) print("automatically fixing dependencies for ELF files") args = parser.parse_args() @@ -344,7 +351,8 @@ def main() -> None: args.runtime_dependencies, args.recursive, args.ignore_missing, - append_rpaths=args.append_rpaths) + append_rpaths=args.append_rpaths, + extra_args=args.extra_args) interpreter_path: Path = None # type: ignore diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 0625565606f3c..371389df427bc 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -63,6 +63,7 @@ autoPatchelf() { local appendRunpathsArray=($appendRunpaths) local runtimeDependenciesArray=($runtimeDependencies) + local patchelfFlagsArray=($patchelfFlags) @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \ --ignore-missing "${ignoreMissingDepsArray[@]}" \ @@ -70,7 +71,8 @@ autoPatchelf() { --libs "${autoPatchelfLibs[@]}" \ "${extraAutoPatchelfLibs[@]}" \ --runtime-dependencies "${runtimeDependenciesArray[@]/%//lib}" \ - --append-rpaths "${appendRunpathsArray[@]}" + --append-rpaths "${appendRunpathsArray[@]}" \ + --extra-args "${patchelfFlagsArray[@]}" } # XXX: This should ultimately use fixupOutputHooks but we currently don't have diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh index 55e196e654dff..e103fe77d9be7 100644 --- a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh +++ b/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh @@ -36,5 +36,5 @@ fixDarwinDylibNames() { fixDarwinDylibNamesIn() { local dir="$1" - fixDarwinDylibNames $(find "$dir" -name "*.dylib") + fixDarwinDylibNames $(find "$dir" -name "*.dylib" -o -name "*.so" -o -name "*.so.*") } diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix index 0197bf21927fd..a521154aa253a 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -1,27 +1,19 @@ { lib -, buildPythonPackage +, python3Packages , fetchFromGitHub , fetchpatch -, pythonOlder -, pyserial -, click -, ecdsa -, behave -, nose }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "adafruit-nrfutil"; - version = "1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.5.3.post17"; + pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = "refs/tags/appveyor-test-release-${version}"; - hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; + rev = "refs/tags/${version}"; + hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; }; patches = [ @@ -30,19 +22,24 @@ buildPythonPackage rec { (fetchpatch { name = "fix-tests.patch"; url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; + sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; }) ]; - propagatedBuildInputs = [ - pyserial + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ click ecdsa + pyserial ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ behave nose + pytestCheckHook ]; preCheck = '' diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 06b6ef47d4303..06b6ef47d4303 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch index b17df9a492e5b..b17df9a492e5b 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch +++ b/pkgs/by-name/al/alsa-lib/alsa-plugin-conf-multilib.patch diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/by-name/al/alsa-lib/package.nix index f0eb349060735..f0eb349060735 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/by-name/al/alsa-lib/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix b/pkgs/by-name/al/alsa-oss/package.nix index f600b52c5f3aa..f600b52c5f3aa 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix +++ b/pkgs/by-name/al/alsa-oss/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/by-name/al/alsa-plugins-wrapper/package.nix index 992f4886e262c..992f4886e262c 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix +++ b/pkgs/by-name/al/alsa-plugins-wrapper/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix b/pkgs/by-name/al/alsa-plugins/package.nix index ababb767955bb..ababb767955bb 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/by-name/al/alsa-tools/package.nix index b52e152009678..b52e152009678 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/pkgs/by-name/al/alsa-tools/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix b/pkgs/by-name/al/alsa-topology-conf/package.nix index e0dfc879fbc94..e0dfc879fbc94 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix +++ b/pkgs/by-name/al/alsa-topology-conf/package.nix diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 75ec2932c8904..b7203a7376387 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-N09oM7/XfQpGdeSqK/t53v6FDlpGpdRUKkWWL0ueJyo="; + hash = "sha256-nCHj8B/wC6p1jfF+hnzTbiTrtBpr7ElzfpkQXhbyrpc="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/by-name/al/alsa-utils/package.nix index da559b5fcc1c5..401c66beb703f 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -1,5 +1,33 @@ -{lib, stdenv, fetchurl, fetchpatch, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}: +{ lib +, stdenv +, fetchurl +, fetchpatch +, alsa-lib +, alsa-plugins +, gettext +, makeWrapper +, ncurses +, libsamplerate +, pciutils +, which +, fftw +, pipewire +, withPipewireLib ? true +, symlinkJoin +}: +let + plugin-packages = [ alsa-plugins ] ++ lib.optional withPipewireLib pipewire; + + # Create a directory containing symlinks of all ALSA plugins. + # This is necessary because ALSA_PLUGIN_DIR must reference only one directory. + plugin-dir = symlinkJoin { + name = "all-plugins"; + paths = map + (path: "${path}/lib/alsa-lib") + plugin-packages; + }; +in stdenv.mkDerivation rec { pname = "alsa-utils"; version = "1.2.10"; @@ -30,6 +58,7 @@ stdenv.mkDerivation rec { postFixup = '' mv $out/bin/alsa-info.sh $out/bin/alsa-info wrapProgram $out/bin/alsa-info --prefix PATH : "${lib.makeBinPath [ which pciutils ]}" + wrapProgram $out/bin/aplay --set-default ALSA_PLUGIN_DIR ${plugin-dir} ''; meta = with lib; { diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 7a0efbdab6234..5ad319042bf70 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -2,6 +2,7 @@ , writeShellScriptBin , buildGoModule , makeWrapper +, darwin , fetchFromGitHub , coreutils , nettools @@ -10,6 +11,7 @@ , dmidecode , bashInteractive , nix-update-script +, nixosTests , testers , amazon-ssm-agent , overrideEtc ? true @@ -40,13 +42,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.1705.0"; + version = "3.2.1798.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-4KhDD5G/fS1rHitQdbYqIz6RSQ3PTMZsUENC202a/Do="; + hash = "sha256-A7M8UbOJT9zvbcwlARMwA7a+LGk8KYmo9j31yzh5FDQ="; }; vendorHash = null; @@ -60,7 +62,11 @@ buildGoModule rec { ./0002-version-gen-don-t-use-unnecessary-constants.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ + darwin.DarwinTools + ]; # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138 # The updater is not built because it cannot work on NixOS @@ -137,17 +143,23 @@ buildGoModule rec { ]; postFixup = '' - wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin + wrapProgram $out/bin/amazon-ssm-agent \ + --prefix PATH : "${lib.makeBinPath [ bashInteractive ]}" ''; passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = amazon-ssm-agent; - command = "amazon-ssm-agent --version"; + tests = { + inherit (nixosTests) amazon-ssm-agent; + version = testers.testVersion { + package = amazon-ssm-agent; + command = "amazon-ssm-agent --version"; + }; }; + updateScript = nix-update-script { }; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; @@ -155,8 +167,5 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; - - # Darwin support is broken - broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/ap/apache-users/optional-args.patch b/pkgs/by-name/ap/apache-users/optional-args.patch new file mode 100644 index 0000000000000..7b921a21ce0c4 --- /dev/null +++ b/pkgs/by-name/ap/apache-users/optional-args.patch @@ -0,0 +1,24 @@ +--- a/apache2.1.pl ++++ b/apache2.1.pl +@@ -63,10 +63,10 @@ getopt ("h: l: p: e: s: t:" ,\%opts); + use LWP; + + +-if (!(exists $opts{h})||!(exists $opts{p})||!(exists $opts{l})||!(exists $opts{e})){ &usage;} ++if (!(exists $opts{h})){ &usage;} + + sub usage{ +-print "\nUSAGE: apache.pl [-h 1.2.3.4] [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n "; ++print "\nUSAGE: apache-users -h 1.2.3.4 [-l names] [-p 80] [-s (SSL Support 1=true 0=false)] [-e 403 (http code)] [-t threads]\n\n "; + exit 1; + }; + +@@ -75,7 +75,7 @@ if (exists $opts{h}){ + } + if (exists $opts{l}){ + $list=$opts{l}; +-}else {$list="names";} ++}else {$list="@out@/share/apache-users/names";} + if (exists $opts{p}){ + $port=$opts{p}; + }else{$port=80;} diff --git a/pkgs/by-name/ap/apache-users/package.nix b/pkgs/by-name/ap/apache-users/package.nix new file mode 100644 index 0000000000000..8780a13a3f8a3 --- /dev/null +++ b/pkgs/by-name/ap/apache-users/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, perl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apache-users"; + version = "2.1"; + + src = fetchurl { + url = "https://labs.portcullis.co.uk/download/apache_users-${finalAttrs.version}.tar.gz"; + hash = "sha256-rylW4F8Si6KKYxaxEJlVFnbLqfqS6ytMPfHpc8MgriA="; + }; + + # Allow optional arguments where defaults are provided + patches = [ ./optional-args.patch ]; + + postPatch = '' + substituteAllInPlace apache${finalAttrs.version}.pl + ''; + + buildInputs = [ + (perl.withPackages (p: [ p.ParallelForkManager p.LWP ])) + ]; + + installPhase = '' + runHook preInstall + + install -D apache${finalAttrs.version}.pl $out/bin/apache-users + install -Dm444 names $out/share/apache-users/names + + runHook postInstall + ''; + + meta = with lib; { + description = "Username Enumeration through Apache UserDir"; + homepage = "https://labs.portcullis.co.uk/downloads/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ emilytrau ]; + mainProgram = "apache-users"; + }; +}) diff --git a/pkgs/by-name/ar/arrpc/package.nix b/pkgs/by-name/ar/arrpc/package.nix index 15ad34b39d7ff..eeb4dd4fef250 100644 --- a/pkgs/by-name/ar/arrpc/package.nix +++ b/pkgs/by-name/ar/arrpc/package.nix @@ -21,7 +21,8 @@ buildNpmPackage { # Remove after next release patches = [ (fetchpatch { - url = "https://github.com/OpenAsar/arrpc/pull/50.patch"; + # https://github.com/OpenAsar/arrpc/pull/50 + url = "https://github.com/OpenAsar/arrpc/commit/7fa6c90204450eb3952ce9cddfecb0a5ba5e4313.patch"; hash = "sha256-qFlrbe2a4x811wpmWUcGDe2CPlt9x3HI+/t0P2v4kPc="; }) ]; diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 68e9ebd5f4d0b..226174fd85c4e 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.12.5"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-oFe3AbMpBVBAm/W4IowXAKcEN7CDrrAXhx4dzMXppUM="; + hash = "sha256-Wee+npgL0+7pv9ph3S93fIXr8z/FWp/TBthJhVSx3zI="; }; - cargoHash = "sha256-f4tcJqT3l9G6FimBb0D4PATgQYUkSG5uIQ9BbsbgC/U="; + cargoHash = "sha256-OFNqBkPAKaSqDQUWisupj6FlDbm3kw0xq5nbvj04H5U="; + + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/bl/bluetility/package.nix b/pkgs/by-name/bl/bluetility/package.nix new file mode 100644 index 0000000000000..1188ffd2b40dd --- /dev/null +++ b/pkgs/by-name/bl/bluetility/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "bluetility"; + version = "1.5.1"; + + src = fetchurl { + url = "https://github.com/jnross/Bluetility/releases/download/${finalAttrs.version}/Bluetility.app.zip"; + hash = "sha256-Batnv06nXXxvUz+DlrH1MpeL4f5kNSPDH6Iqd/UiFbw="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Bluetooth Low Energy browse"; + homepage = "https://github.com/jnross/Bluetility"; + license = licenses.mit; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 2626c45f0215e..1272e1d0173a0 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ]; platforms = lib.platforms.unix; # ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't - broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64; + broken = stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isAarch64; }; }) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix new file mode 100644 index 0000000000000..380a829f8119b --- /dev/null +++ b/pkgs/by-name/br/braa/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchzip, + zlib, +}: +stdenv.mkDerivation rec { + pname = "braa"; + version = "0.82"; + + src = fetchzip { + url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA="; + }; + + buildInputs = [zlib]; + + installPhase = '' + runHook preInstall + install -Dm755 braa $out/bin/braa + runHook postInstall + ''; + + meta = with lib; { + description = "A mass snmp scanner"; + homepage = "http://s-tech.elsat.net.pl"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [bycEEE]; + mainProgram = "braa"; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index e8667bc468aba..23a78dd122207 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bruno"; - version = "0.27.2"; + version = "1.1.1"; src = fetchurl { url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb"; - hash = "sha256-FhlwwdX845Say6I/g9HYRTexh94DXhc/K9jmqFiHwVY="; + hash = "sha256-lG5OMxDS7I2jmI6syWzTsHm/NEoGanilW8IPebs+/10="; }; nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; diff --git a/pkgs/by-name/ce/celluloid/package.nix b/pkgs/by-name/ce/celluloid/package.nix index c0ada66edc605..64ee44b1ad166 100644 --- a/pkgs/by-name/ce/celluloid/package.nix +++ b/pkgs/by-name/ce/celluloid/package.nix @@ -5,6 +5,7 @@ , desktop-file-utils , glib , gtk4 +, libGL , libepoxy , libadwaita , meson @@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib gtk4 + libGL libadwaita libepoxy mpv diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix new file mode 100644 index 0000000000000..6cdfa9bb3510a --- /dev/null +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -0,0 +1,60 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, nixosTests +, testers +, centrifugo +}: +let + # Inspect build flags with `go version -m centrifugo`. + statsEndpoint = "https://graphite-prod-01-eu-west-0.grafana.net/graphite/metrics,https://stats.centrifugal.dev/usage"; + statsToken = "425599:eyJrIjoi" + + "OWJhMTcyZGNjN2FkYjEzM2E1OTQwZjIyMTU3MTBjMjUyYzAyZWE2MSIsIm4iOiJVc2FnZSBTdGF0cyIsImlkIjo2NDUzOTN9"; +in +buildGoModule rec { + pname = "centrifugo"; + version = "5.1.1"; + + src = fetchFromGitHub { + owner = "centrifugal"; + repo = "centrifugo"; + rev = "v${version}"; + hash = "sha256-g496cXjgliDi2XLkdE+dERrUl5hBGLICJx5JundeOfo="; + }; + + vendorHash = "sha256-VuxnP9Dryo0L7sGvtvAIicYGkHoQ2iGVBtAdkmiqL7E="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/centrifugal/centrifugo/v5/internal/build.Version=${version}" + "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsEndpoint=${statsEndpoint}" + "-X=github.com/centrifugal/centrifugo/v5/internal/build.UsageStatsToken=${statsToken}" + ]; + + excludedPackages = [ + "./internal/gen/api" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) centrifugo; + version = testers.testVersion { + package = centrifugo; + command = "${pname} version"; + version = "v${version}"; + }; + }; + }; + + meta = { + description = "Scalable real-time messaging server"; + homepage = "https://centrifugal.dev"; + changelog = "https://github.com/centrifugal/centrifugo/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.tie ]; + mainProgram = "centrifugo"; + }; +} diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix index 53909d61786fa..e40c580618494 100644 --- a/pkgs/by-name/ce/certspotter/package.nix +++ b/pkgs/by-name/ce/certspotter/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "certspotter"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "SSLMate"; repo = "certspotter"; rev = "v${version}"; - hash = "sha256-6ghS+9b8FZiYdiTk54XRHP46lOq98sN1RDYvRYTt6eU="; + hash = "sha256-nyeqpDMRZRuHjfl3cI/I00KpVg3udjr0B8MEBZcF7nY="; }; vendorHash = "sha256-6dV9FoPV8UfS0z5RuuopE99fHcT3RAWCdDi7jpHzVRE="; diff --git a/pkgs/by-name/ch/changelog-d/package.nix b/pkgs/by-name/ch/changelog-d/package.nix new file mode 100644 index 0000000000000..10d4ad1ae3558 --- /dev/null +++ b/pkgs/by-name/ch/changelog-d/package.nix @@ -0,0 +1,38 @@ +{ + callPackage, + lib, + haskell, + haskellPackages, +}: + +let + hsPkg = haskellPackages.changelog-d; + + addCompletions = haskellPackages.generateOptparseApplicativeCompletions ["changelog-d"]; + + haskellModifications = + lib.flip lib.pipe [ + addCompletions + haskell.lib.justStaticExecutables + ]; + + mkDerivationOverrides = finalAttrs: oldAttrs: { + + version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; + + # nix-shell ./maintainers/scripts/update.nix --argstr package changelog-d + passthru.updateScript = lib.getExe (callPackage ./updateScript.nix { }); + + # nix-build -A changelog-d.tests + passthru.tests = { + basic = callPackage ./tests/basic.nix { changelog-d = finalAttrs.finalPackage; }; + }; + + meta = oldAttrs.meta // { + homepage = "https://codeberg.org/fgaz/changelog-d"; + maintainers = [ lib.maintainers.roberth ]; + }; + + }; +in + (haskellModifications hsPkg).overrideAttrs mkDerivationOverrides diff --git a/pkgs/by-name/ch/changelog-d/tests/basic.nix b/pkgs/by-name/ch/changelog-d/tests/basic.nix new file mode 100644 index 0000000000000..25d434f0729fc --- /dev/null +++ b/pkgs/by-name/ch/changelog-d/tests/basic.nix @@ -0,0 +1,25 @@ +{ runCommand, changelog-d }: + +runCommand "changelog-d-basic-test" { + nativeBuildInputs = [ changelog-d ]; +} '' + mkdir changelogs + cat > changelogs/config <<EOF + organization: NixOS + repository: boondoggle + EOF + cat > changelogs/a <<EOF + synopsis: Support numbers with incrementing base-10 digits + issues: #1234 + description: { + This didn't work before. + } + EOF + changelog-d changelogs >$out + cat -n $out + echo Checking the generated output + set -x + grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null + grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null + set +x +'' diff --git a/pkgs/by-name/ch/changelog-d/updateScript.nix b/pkgs/by-name/ch/changelog-d/updateScript.nix new file mode 100644 index 0000000000000..fae22a161b6df --- /dev/null +++ b/pkgs/by-name/ch/changelog-d/updateScript.nix @@ -0,0 +1,12 @@ +{ writeShellApplication, cabal2nix }: + +writeShellApplication { + name = "update-changelog-d"; + runtimeInputs = [ + cabal2nix + ]; + text = '' + cd pkgs/development/misc/haskell/changelog-d + cabal2nix https://codeberg.org/fgaz/changelog-d >default.nix + ''; +} diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix index 5abe53ddb8c09..c0a62923d224a 100644 --- a/pkgs/by-name/cl/clamtk/package.nix +++ b/pkgs/by-name/cl/clamtk/package.nix @@ -1,7 +1,7 @@ { lib , perlPackages , fetchFromGitHub -, makeWrapper +, wrapGAppsHook , gobject-introspection , perl , clamav @@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-o6OaXOXLykTUuF/taKnEhZRV04/3nlU5aNY05ANr1Ko="; }; - nativeBuildInputs = [ makeWrapper gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ perl clamav ]; propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ]; @@ -51,11 +51,17 @@ perlPackages.buildPerlPackage rec { install -D images/* -t $out/share/pixmaps install -D clamtk.1.gz -t $out/share/man/man1 install -D -m755 clamtk -t $out/bin - wrapProgram $out/bin/clamtk --prefix PERL5LIB : $PERL5LIB --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" runHook postInstall ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PERL5LIB : $PERL5LIB + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" + ) + ''; + meta = with lib; { description = '' Easy to use, lightweight front-end for ClamAV (Clam Antivirus). @@ -63,7 +69,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl1Plus; homepage = "https://github.com/dave-theunsub/clamtk"; platforms = platforms.linux; - maintainers = with maintainers; [ jgarcia ]; + maintainers = with maintainers; [ jgarcia ShamrockLee ]; }; } diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix new file mode 100644 index 0000000000000..1c6f30cc9d76c --- /dev/null +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildGraalvmNativeImage +, fetchurl +, nix-update-script +, testers +, cljfmt +}: + +buildGraalvmNativeImage rec { + pname = "cljfmt"; + version = "0.11.2"; + + src = fetchurl { + url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-vEldQ7qV375mHMn3OUdn0FaPd+f/v9g+C+PuzbSTWtk="; + }; + + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "-H:Log=registerResource:" + "--initialize-at-build-time" + "--diagnostics-mode" + "--report-unsupported-elements-at-runtime" + "--no-fallback" + ]; + + passthru.updateScript = nix-update-script { }; + + passthru.tests.version = testers.testVersion { + inherit version; + package = cljfmt; + command = "cljfmt --version"; + }; + + meta = with lib; { + mainProgram = "cljfmt"; + description = "A tool for formatting Clojure code"; + homepage = "https://github.com/weavejester/cljfmt"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.epl10; + changelog = "https://github.com/weavejester/cljfmt/blob/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ sg-qwt ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/pkgs/by-name/cm/cmake/001-search-path.diff index 04ab0847a7074..04ab0847a7074 100644 --- a/pkgs/development/tools/build-managers/cmake/001-search-path.diff +++ b/pkgs/by-name/cm/cmake/001-search-path.diff diff --git a/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/pkgs/by-name/cm/cmake/002-application-services.diff index 56f7cd266b7af..56f7cd266b7af 100644 --- a/pkgs/development/tools/build-managers/cmake/002-application-services.diff +++ b/pkgs/by-name/cm/cmake/002-application-services.diff diff --git a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff index 6607a9c6ed1f3..6607a9c6ed1f3 100644 --- a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff +++ b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff diff --git a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff b/pkgs/by-name/cm/cmake/004-cygwin.diff index 982aba17e874d..982aba17e874d 100644 --- a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff +++ b/pkgs/by-name/cm/cmake/004-cygwin.diff diff --git a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index 76aa91cff92c4..ffd3077d301e6 100644 --- a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff +++ b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,6 +1,7 @@ ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -391,13 +391,6 @@ if(ENABLE_IPV6 AND NOT WIN32) +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 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) set(use_core_foundation ON) @@ -14,9 +15,10 @@ endif() endif() ---- a/Utilities/cmcurl/lib/curl_setup.h -+++ b/Utilities/cmcurl/lib/curl_setup.h -@@ -257,11 +257,7 @@ +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 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) @@ -28,9 +30,10 @@ #endif #ifdef USE_LWIPSOCK ---- a/Utilities/cmcurl/lib/hostip.c -+++ b/Utilities/cmcurl/lib/hostip.c -@@ -68,10 +68,6 @@ +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" @@ -38,10 +41,10 @@ -#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> -#endif - - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) - /* alarm-based timeouts can only be used with all the dependencies satisfied */ -@@ -661,23 +657,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && \ + defined(SIGALRM) && \ +@@ -743,23 +739,6 @@ return CURLRESOLV_ERROR; } diff --git a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff index dc10e6b342311..dc10e6b342311 100644 --- a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff +++ b/pkgs/by-name/cm/cmake/006-darwin-always-set-runtime-c-flag.diff diff --git a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/pkgs/by-name/cm/cmake/check-pc-files-hook.sh index 94d1b7b53556e..94d1b7b53556e 100644 --- a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh +++ b/pkgs/by-name/cm/cmake/check-pc-files-hook.sh diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/by-name/cm/cmake/package.nix index 00715130a000d..a573147915012 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -16,11 +16,17 @@ , texinfo , xz , zlib -, isBootstrap ? false -, useOpenSSL ? !isBootstrap -, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, isBootstrap ? null +, isMinimalBuild ? ( + if isBootstrap != null + then lib.warn + "isBootstrap argument is deprecated and will be removed; use isMinimalBuild instead" + isBootstrap + else false) +, useOpenSSL ? !isMinimalBuild +, useSharedLibraries ? (!isMinimalBuild && !stdenv.isCygwin) , uiToolkits ? [] # can contain "ncurses" and/or "qt5" -, buildDocs ? !(isBootstrap || (uiToolkits == [])) +, buildDocs ? !(isMinimalBuild || (uiToolkits == [])) , darwin , libsForQt5 }: @@ -34,17 +40,17 @@ in # Accepts only "ncurses" and "qt5" as possible uiToolkits assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; # Minimal, bootstrap cmake does not have toolkits -assert isBootstrap -> (uiToolkits == []); +assert isMinimalBuild -> (uiToolkits == []); stdenv.mkDerivation (finalAttrs: { pname = "cmake" - + lib.optionalString isBootstrap "-boot" + + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.26.4"; + version = "3.27.7"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg="; + hash = "sha256-CPcaEGA2vwUfaSdg75VYwFd8Qqw56Wugl+dmK9QVjY4="; }; patches = [ @@ -57,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.isCygwin ./004-cygwin.diff # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff + ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; @@ -90,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase - ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; + ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; @@ -104,12 +110,23 @@ stdenv.mkDerivation (finalAttrs: { configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; + # The configuration script is not autoconf-based, although being similar; + # triples and other interesting info are passed via CMAKE_* environment + # variables and commandline switches + configurePlatforms = [ ]; + configureFlags = [ "CXXFLAGS=-Wno-elaborated-enum-base" "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" ] ++ (if useSharedLibraries - then [ "--no-system-jsoncpp" "--system-libs" ] - else [ "--no-system-libs" ]) # FIXME: cleanup + then [ + "--no-system-cppdap" + "--no-system-jsoncpp" + "--system-libs" + ] + else [ + "--no-system-libs" + ]) # FIXME: cleanup ++ lib.optional qt5UI "--qt-gui" ++ lib.optionals buildDocs [ "--sphinx-build=${sphinx}/bin/sphinx-build" @@ -129,15 +146,17 @@ stdenv.mkDerivation (finalAttrs: { # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and # strip. Otherwise they are taken to be relative to the source root of the # package being built. - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" - # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}" + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${stdenv.cc.targetPrefix}c++") + (lib.cmakeFeature "CMAKE_C_COMPILER" "${stdenv.cc.targetPrefix}cc") + (lib.cmakeFeature "CMAKE_AR" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar") + (lib.cmakeFeature "CMAKE_RANLIB" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib") + (lib.cmakeFeature "CMAKE_STRIP" + "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip") + + (lib.cmakeBool "CMAKE_USE_OPENSSL" useOpenSSL) + (lib.cmakeBool "BUILD_CursesDialog" cursesUI) ]; # make install attempts to use the just-built cmake @@ -148,10 +167,6 @@ stdenv.mkDerivation (finalAttrs: { dontUseCmakeConfigure = true; enableParallelBuilding = true; - # This isn't an autoconf configure script; triples are passed via - # CMAKE_SYSTEM_NAME, etc. - configurePlatforms = [ ]; - doCheck = false; # fails meta = { diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh index b28ed42b6896b..b28ed42b6896b 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/by-name/cm/cmake/setup-hook.sh diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 48bcff3f32a92..87858931d8064 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "303"; + version = "305"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-1VPnmb4VDSwzdXtk2YZVHH4qFJSe2OPzsmzVD/NkbYg="; + hash = "sha256-fCVnggso/wAvci9sLRVvwEsvZ+CeEfLBDnPPcAy/wGo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/cosmic/applets/Cargo.lock b/pkgs/by-name/co/cosmic-applets/Cargo.lock index 6d478ac6a0af1..367af6f2b4ba0 100644 --- a/pkgs/applications/window-managers/cosmic/applets/Cargo.lock +++ b/pkgs/by-name/co/cosmic-applets/Cargo.lock @@ -5,12 +5,12 @@ version = 3 [[package]] name = "accesskit" version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" [[package]] name = "accesskit_consumer" version = "0.15.0" -source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" dependencies = [ "accesskit", ] @@ -18,13 +18,13 @@ dependencies = [ [[package]] name = "accesskit_unix" version = "0.4.0" -source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +source = "git+https://github.com/wash2/accesskit.git?tag=winit-0.28#db6f2587f663eafd8f7888e8507baa3a092599b0" dependencies = [ "accesskit", "accesskit_consumer", - "async-channel", + "async-channel 1.9.0", "atspi", - "futures-lite", + "futures-lite 1.13.0", "log", "serde", "zbus", @@ -47,9 +47,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", @@ -58,20 +58,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "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", ] @@ -172,7 +173,7 @@ dependencies = [ "serde_repr", "tokio", "url", - "wayland-backend", + "wayland-backend 0.1.2", "wayland-client 0.30.2", "wayland-protocols 0.30.1", "zbus", @@ -184,7 +185,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -195,21 +196,34 @@ 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-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 1.13.0", "slab", ] @@ -219,10 +233,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -231,88 +245,136 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2 0.4.9", + "socket2 0.4.10", "waker-fn", ] [[package]] +name = "async-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +dependencies = [ + "async-lock 3.1.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.0.1", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.0", +] + +[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "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.0", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.21", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atomicwrites" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.21", "tempfile", "windows-sys 0.48.0", ] @@ -327,7 +389,7 @@ dependencies = [ "async-trait", "atspi-macros", "enumflags2", - "futures-lite", + "futures-lite 1.13.0", "serde", "tracing", "zbus", @@ -378,9 +440,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bit-set" @@ -411,9 +473,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" dependencies = [ "serde", ] @@ -435,17 +497,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", + "async-channel 2.1.0", + "async-lock 3.1.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.0.1", + "piper", + "tracing", ] [[package]] @@ -465,7 +528,7 @@ dependencies = [ "libc", "log", "macaddr", - "nix 0.26.2", + "nix 0.26.4", "num-derive", "num-traits", "pin-project", @@ -479,70 +542,82 @@ 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[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 = "calloop" -version = "0.10.6" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "log", - "nix 0.25.1", - "slotmap", + "polling 3.3.0", + "rustix 0.38.21", + "slab", "thiserror", - "vec_map", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.21", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" dependencies = [ "libc", ] [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -562,17 +637,16 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -593,15 +667,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", ] @@ -630,9 +703,9 @@ checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -688,18 +761,18 @@ dependencies = [ "freedesktop-icons", "futures", "futures-util", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "itertools 0.11.0", "libcosmic", "log", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "pretty_env_logger 0.5.0", "rand", "ron", - "rust-embed", - "rust-embed-utils", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", "serde", "shlex", "tokio", @@ -712,17 +785,21 @@ name = "cosmic-applet-audio" version = "0.1.0" dependencies = [ "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "icon-loader", "libcosmic", "libpulse-binding", "libpulse-glib-binding", - "log", + "mpris2-zbus", "pretty_env_logger 0.4.0", - "rust-embed", - "rust-embed-utils", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", + "serde", "tokio", + "tracing", + "url", + "zbus", ] [[package]] @@ -731,13 +808,13 @@ version = "0.1.0" dependencies = [ "cosmic-time", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "libcosmic", "log", "once_cell", "pretty_env_logger 0.5.0", - "rust-embed", + "rust-embed 6.8.1", "tokio", "zbus", ] @@ -750,15 +827,15 @@ dependencies = [ "bluer", "futures", "futures-util", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "itertools 0.10.5", "libcosmic", "log", "once_cell", "pretty_env_logger 0.5.0", "rand", - "rust-embed", + "rust-embed 6.8.1", "slotmap", "tokio", ] @@ -767,11 +844,11 @@ dependencies = [ name = "cosmic-applet-graphics" version = "0.1.0" dependencies = [ - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "libcosmic", "once_cell", - "rust-embed", + "rust-embed 6.8.1", "tracing", "zbus", ] @@ -785,14 +862,14 @@ dependencies = [ "cosmic-time", "futures", "futures-util", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "itertools 0.10.5", "libcosmic", "log", "pretty_env_logger 0.5.0", - "rust-embed", - "rust-embed-utils", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", "slotmap", "tokio", "zbus", @@ -807,13 +884,13 @@ dependencies = [ "cosmic-notifications-config", "cosmic-notifications-util", "cosmic-time", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "libcosmic", - "nix 0.26.2", + "nix 0.26.4", "ron", - "rust-embed", - "rust-embed-utils", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", "sendfd", "tokio", "tracing", @@ -826,17 +903,17 @@ dependencies = [ name = "cosmic-applet-power" version = "0.1.0" dependencies = [ - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "icon-loader", "libcosmic", "libpulse-binding", "libpulse-glib-binding", "logind-zbus", - "nix 0.26.2", + "nix 0.26.4", "once_cell", - "rust-embed", - "rust-embed-utils", + "rust-embed 6.8.1", + "rust-embed-utils 7.8.1", "tokio", "zbus", ] @@ -853,13 +930,30 @@ dependencies = [ ] [[package]] +name = "cosmic-applet-tiling" +version = "0.1.0" +dependencies = [ + "cosmic-time", + "i18n-embed 0.14.1", + "i18n-embed-fl 0.7.0", + "libcosmic", + "once_cell", + "rust-embed 8.0.0", + "tracing", +] + +[[package]] name = "cosmic-applet-time" version = "0.1.0" dependencies = [ "chrono", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "icon-loader", "libcosmic", - "nix 0.26.2", + "nix 0.26.4", + "once_cell", + "rust-embed 6.8.1", ] [[package]] @@ -870,31 +964,31 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-protocols", "futures", - "i18n-embed", - "i18n-embed-fl", + "i18n-embed 0.13.9", + "i18n-embed-fl 0.6.7", "libcosmic", "log", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "pretty_env_logger 0.5.0", - "rust-embed", + "rust-embed 6.8.1", "xdg", ] [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ "cosmic-protocols", - "smithay-client-toolkit 0.17.0", - "wayland-client 0.30.2", + "smithay-client-toolkit 0.18.0", + "wayland-client 0.31.1", ] [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -908,7 +1002,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "quote", "syn 1.0.109", @@ -917,12 +1011,13 @@ dependencies = [ [[package]] name = "cosmic-dbus-networkmanager" version = "0.1.0" -source = "git+https://github.com/pop-os/dbus-settings-bindings?branch=main#dd3d4935a9e10eac592a974b561c71030ac40c3b" +source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "derive_builder", "procfs", - "time 0.3.27", + "thiserror", + "time", "zbus", "zvariant", ] @@ -930,7 +1025,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#35fd49d2b8147859d8b08d68b346096c356a8d15" +source = "git+https://github.com/pop-os/cosmic-notifications#886042bec827ba40257a31a567d7124904dd6a29" dependencies = [ "cosmic-config", "serde", @@ -939,7 +1034,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#35fd49d2b8147859d8b08d68b346096c356a8d15" +source = "git+https://github.com/pop-os/cosmic-notifications#886042bec827ba40257a31a567d7124904dd6a29" dependencies = [ "bytemuck", "fast_image_resize", @@ -960,7 +1055,7 @@ dependencies = [ [[package]] name = "cosmic-panel-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-panel#edfd24ed3b712de397057906924e4f7e8b6252c4" +source = "git+https://github.com/pop-os/cosmic-panel#f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c" dependencies = [ "anyhow", "cosmic-config", @@ -974,13 +1069,13 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=5faec87#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ - "bitflags 1.3.2", - "wayland-backend", - "wayland-client 0.30.2", - "wayland-protocols 0.30.1", - "wayland-scanner 0.30.1", + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", "wayland-server", ] @@ -1007,7 +1102,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "almost", "cosmic-config", @@ -1021,7 +1116,7 @@ dependencies = [ [[package]] name = "cosmic-time" version = "0.3.0" -source = "git+https://github.com/pop-os/cosmic-time#4013946f9bd9d2e53bf44310b7db783fc8105b79" +source = "git+https://github.com/pop-os/cosmic-time#71116b2eefb536bedbd3438e70cba49d54c3a5d5" dependencies = [ "float-cmp", "libcosmic", @@ -1030,9 +1125,9 @@ dependencies = [ [[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", ] @@ -1106,6 +1201,12 @@ dependencies = [ ] [[package]] +name = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] name = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1117,9 +1218,9 @@ dependencies = [ [[package]] name = "cursor-icon" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "custom_debug" @@ -1197,7 +1298,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1219,20 +1320,20 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[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.2", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -1276,9 +1377,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -1331,7 +1435,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1402,7 +1506,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1411,7 +1515,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.8.1", ] [[package]] @@ -1445,9 +1549,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -1455,13 +1559,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -1479,9 +1583,9 @@ dependencies = [ [[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 2.1.0", "is-terminal", @@ -1498,26 +1602,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" 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 = "etagere" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1543,6 +1636,27 @@ 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-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] name = "exr" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1585,15 +1699,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.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1621,9 +1735,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", @@ -1639,6 +1753,12 @@ dependencies = [ ] [[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] name = "fluent" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1659,7 +1779,7 @@ dependencies = [ "intl-memoizer", "intl_pluralrules", "rustc-hash", - "self_cell", + "self_cell 0.10.3", "smallvec", "unic-langid", ] @@ -1721,7 +1841,7 @@ dependencies = [ "memmap2 0.6.2", "slotmap", "tinyvec", - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", ] [[package]] @@ -1795,9 +1915,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1810,9 +1930,9 @@ 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", "futures-sink", @@ -1820,15 +1940,15 @@ dependencies = [ [[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", @@ -1838,9 +1958,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -1858,33 +1978,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "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.29", + "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-channel", "futures-core", @@ -1920,14 +2050,14 @@ 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", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1969,17 +2099,17 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" [[package]] name = "glib" -version = "0.18.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -1997,16 +2127,16 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.18.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -2083,30 +2213,36 @@ dependencies = [ "log", "thiserror", "winapi", - "windows 0.44.0", + "windows", ] [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "gpu-descriptor-types", - "hashbrown 0.12.3", + "hashbrown 0.14.2", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", ] [[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] name = "guillotiere" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2132,16 +2268,16 @@ 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.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -2177,9 +2313,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" @@ -2210,15 +2346,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "i18n-config" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" dependencies = [ "log", "serde", "serde_derive", "thiserror", - "toml 0.7.6", + "toml 0.8.8", "unic-langid", ] @@ -2238,7 +2374,29 @@ dependencies = [ "locale_config", "log", "parking_lot 0.12.1", - "rust-embed", + "rust-embed 6.8.1", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed 8.0.0", "thiserror", "unic-langid", "walkdir", @@ -2255,41 +2413,62 @@ dependencies = [ "fluent", "fluent-syntax", "i18n-config", - "i18n-embed", + "i18n-embed 0.13.9", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.39", + "unic-langid", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed 0.14.1", "lazy_static", "proc-macro-error", "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.39", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -2304,7 +2483,7 @@ dependencies = [ [[package]] name = "iced" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "iced_accessibility", "iced_core", @@ -2319,7 +2498,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "accesskit", "accesskit_unix", @@ -2328,14 +2507,14 @@ dependencies = [ [[package]] name = "iced_core" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "bitflags 1.3.2", "iced_accessibility", "instant", "log", "palette", - "smithay-client-toolkit 0.17.0", + "smithay-client-toolkit 0.18.0", "thiserror", "twox-hash", ] @@ -2343,7 +2522,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "futures", "iced_core", @@ -2356,7 +2535,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2366,6 +2545,7 @@ dependencies = [ "image", "kamadak-exif", "log", + "lyon_path", "raw-window-handle", "thiserror", ] @@ -2373,7 +2553,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2386,19 +2566,19 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.1" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.17.0", + "smithay-client-toolkit 0.18.0", "thiserror", ] [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "enum-repr", "float-cmp", @@ -2408,19 +2588,21 @@ dependencies = [ "iced_runtime", "iced_style", "itertools 0.10.5", + "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.17.0", + "smithay-client-toolkit 0.18.0", "smithay-clipboard", "thiserror", "tracing", - "wayland-backend", - "wayland-protocols 0.30.1", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", ] [[package]] name = "iced_style" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "iced_core", "once_cell", @@ -2430,7 +2612,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "bytemuck", "cosmic-text", @@ -2448,7 +2630,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.11.1" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2458,6 +2640,7 @@ dependencies = [ "guillotiere", "iced_graphics", "log", + "lyon", "once_cell", "raw-window-handle", "resvg", @@ -2469,14 +2652,14 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.3" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "iced_renderer", "iced_runtime", "iced_style", "num-traits", "ouroboros", - "smithay-client-toolkit 0.17.0", + "smithay-client-toolkit 0.18.0", "thiserror", "unicode-segmentation", ] @@ -2545,12 +2728,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.2", ] [[package]] @@ -2607,19 +2790,25 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] [[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.8", + "hermit-abi 0.3.3", + "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -2658,9 +2847,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2728,20 +2917,21 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#fcdefcd8fbca53705ba761b97e25453bc35e40c0" +source = "git+https://github.com/pop-os/libcosmic#405aaf134d00a6aef223aef3799b3904b1050b0c" dependencies = [ "apply", "ashpd", "cosmic-config", "cosmic-panel-config", "cosmic-theme", + "css-color", "derive_setters", "fraction", "freedesktop-icons", @@ -2758,7 +2948,8 @@ dependencies = [ "palette", "ron", "slotmap", - "smithay-client-toolkit 0.17.0", + "smithay-client-toolkit 0.18.0", + "taffy", "thiserror", "tokio", "tracing", @@ -2787,9 +2978,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -2797,9 +2988,9 @@ dependencies = [ [[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 = "libpulse-binding" @@ -2852,10 +3043,15 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "linux-raw-sys" @@ -2865,9 +3061,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "locale_config" @@ -2884,9 +3080,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", @@ -2910,11 +3106,63 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.0" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" dependencies = [ - "hashbrown 0.14.0", + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", ] [[package]] @@ -2934,9 +3182,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" @@ -2958,9 +3206,18 @@ dependencies = [ [[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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -3024,17 +3281,29 @@ 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", + "wasi", "windows-sys 0.48.0", ] [[package]] +name = "mpris2-zbus" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#c9cb2c256eb956e0c09cb5c4409b0bb59e455b7f" +dependencies = [ + "serde", + "thiserror", + "time", + "zbus", + "zvariant", +] + +[[package]] name = "mutate_once" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3096,16 +3365,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -3124,7 +3392,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3227,11 +3495,12 @@ 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", ] [[package]] @@ -3240,7 +3509,7 @@ 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", ] @@ -3285,9 +3554,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3345,7 +3614,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -3375,14 +3644,14 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[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" @@ -3402,7 +3671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -3421,13 +3690,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 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -3468,7 +3737,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -3503,14 +3772,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[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" @@ -3519,6 +3788,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.1", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3554,6 +3834,26 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.48.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" @@ -3575,7 +3875,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.1", "log", ] @@ -3586,7 +3886,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -3615,31 +3924,41 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "procfs" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 1.3.2", - "byteorder", + "bitflags 2.4.1", "hex", "lazy_static", - "rustix 0.36.15", + "procfs-core", + "rustix 0.38.21", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.4.1", + "hex", ] [[package]] name = "profiling" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" [[package]] name = "qoi" @@ -3666,6 +3985,15 @@ dependencies = [ ] [[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" @@ -3712,9 +4040,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rangemap" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" [[package]] name = "raw-window-handle" @@ -3724,9 +4052,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3734,14 +4062,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3769,21 +4095,30 @@ 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 = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -3793,9 +4128,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -3804,9 +4139,9 @@ dependencies = [ [[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 = "renderdoc-sys" @@ -3833,9 +4168,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", ] @@ -3847,16 +4182,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.0", + "bitflags 2.4.1", "serde", "serde_derive", ] [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -3867,8 +4202,19 @@ version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" dependencies = [ - "rust-embed-impl", - "rust-embed-utils", + "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", "walkdir", ] @@ -3880,8 +4226,21 @@ checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils", - "syn 2.0.29", + "rust-embed-utils 7.8.1", + "syn 2.0.39", + "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.39", "walkdir", ] @@ -3896,6 +4255,16 @@ dependencies = [ ] [[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-ini" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3919,27 +4288,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.15" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", + "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", "windows-sys 0.48.0", @@ -3947,14 +4302,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] @@ -3990,7 +4345,7 @@ dependencies = [ "bytemuck", "libm", "smallvec", - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", "unicode-bidi-mirroring", "unicode-ccc", "unicode-general-category", @@ -4026,9 +4381,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "self_cell" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.2", +] + +[[package]] +name = "self_cell" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "sendfd" @@ -4042,29 +4406,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4073,29 +4437,29 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[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", @@ -4104,9 +4468,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", @@ -4115,28 +4479,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 = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -4164,9 +4518,9 @@ dependencies = [ [[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" @@ -4188,15 +4542,15 @@ 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 = "smithay-client-toolkit" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" dependencies = [ "bitflags 1.3.2", "dlib", @@ -4212,26 +4566,29 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.17.0" -source = "git+https://github.com/smithay/client-toolkit?rev=c9940f4#c9940f4167f0d81cc26f77b7eeef6a34068a90a5" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit//?rev=e63ab5f#e63ab5f01964bc48766fc4c3bf79cc05dc59874c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", + "bytemuck", "calloop", + "calloop-wayland-source", "cursor-icon", - "dlib", + "libc", "log", - "memmap2 0.5.10", - "nix 0.26.2", + "memmap2 0.9.0", "pkg-config", + "rustix 0.38.21", "thiserror", - "wayland-backend", - "wayland-client 0.30.2", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", "wayland-csd-frame", - "wayland-cursor 0.30.0", - "wayland-protocols 0.30.1", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", "wayland-protocols-wlr", - "wayland-scanner 0.30.1", + "wayland-scanner 0.31.0", "xkbcommon", + "xkeysym", ] [[package]] @@ -4240,15 +4597,15 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" dependencies = [ - "smithay-client-toolkit 0.16.0", + "smithay-client-toolkit 0.16.1", "wayland-client 0.29.5", ] [[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", @@ -4256,9 +4613,9 @@ dependencies = [ [[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", @@ -4276,13 +4633,13 @@ dependencies = [ "fastrand 1.9.0", "foreign-types", "log", - "nix 0.26.2", + "nix 0.26.4", "objc", "raw-window-handle", "redox_syscall 0.3.5", "thiserror", "wasm-bindgen", - "wayland-backend", + "wayland-backend 0.1.2", "wayland-client 0.30.2", "wayland-sys 0.30.1", "web-sys", @@ -4392,9 +4749,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4415,32 +4772,42 @@ dependencies = [ [[package]] name = "sys-locale" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ "libc", - "windows-sys 0.45.0", ] [[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 0.7.6", + "toml 0.8.8", "version-compare", ] [[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "temp-dir" @@ -4450,44 +4817,44 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", - "rustix 0.38.8", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.21", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -4513,31 +4880,31 @@ 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.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", + "powerfmt", "serde", "time-core", + "time-macros", ] [[package]] name = "time-core" -version = "0.1.1" +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 = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] [[package]] name = "tiny-skia" @@ -4567,9 +4934,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", ] @@ -4591,9 +4958,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -4603,7 +4970,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -4611,13 +4978,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", ] [[package]] @@ -4642,32 +5009,54 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +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", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "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", @@ -4676,11 +5065,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", @@ -4688,20 +5076,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.39", ] [[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", @@ -4709,12 +5097,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -4740,9 +5128,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "twox-hash" @@ -4766,9 +5154,9 @@ 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 = "uds_windows" @@ -4825,9 +5213,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -4864,9 +5252,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[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" @@ -4876,9 +5264,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4949,9 +5337,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", ] @@ -4963,12 +5351,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[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" @@ -4982,15 +5364,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4998,21 +5380,15 @@ dependencies = [ [[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.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5020,24 +5396,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -5047,9 +5423,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5057,22 +5433,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-timer" @@ -5097,14 +5473,28 @@ checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" dependencies = [ "cc", "downcast-rs", - "io-lifetimes", - "nix 0.26.2", + "io-lifetimes 1.0.11", + "nix 0.26.4", "scoped-tls", "smallvec", "wayland-sys 0.30.1", ] [[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] name = "wayland-client" version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5127,13 +5517,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" dependencies = [ "bitflags 1.3.2", - "calloop", - "nix 0.26.2", - "wayland-backend", + "nix 0.26.4", + "wayland-backend 0.1.2", "wayland-scanner 0.30.1", ] [[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 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] name = "wayland-commons" version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5147,13 +5548,13 @@ dependencies = [ [[package]] name = "wayland-csd-frame" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72191e30290b83491325d32c1327be7f45459c97263d9d48494c81efc9328116" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cursor-icon", - "wayland-backend", + "wayland-backend 0.3.2", ] [[package]] @@ -5169,12 +5570,12 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ - "nix 0.26.2", - "wayland-client 0.30.2", + "nix 0.26.4", + "wayland-client 0.31.1", "xcursor", ] @@ -5197,23 +5598,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" dependencies = [ "bitflags 1.3.2", - "wayland-backend", + "wayland-backend 0.1.2", "wayland-client 0.30.2", "wayland-scanner 0.30.1", +] + +[[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 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", "wayland-server", ] [[package]] name = "wayland-protocols-wlr" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 1.3.2", - "wayland-backend", - "wayland-client 0.30.2", - "wayland-protocols 0.30.1", - "wayland-scanner 0.30.1", + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", "wayland-server", ] @@ -5235,22 +5648,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", "quote", ] [[package]] name = "wayland-server" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "downcast-rs", - "io-lifetimes", - "nix 0.26.2", - "wayland-backend", - "wayland-scanner 0.30.1", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", ] [[package]] @@ -5277,10 +5701,21 @@ dependencies = [ ] [[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 = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -5324,7 +5759,7 @@ checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.4.1", "codespan-reporting", "log", "naga", @@ -5349,7 +5784,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.4.0", + "bitflags 2.4.1", "block", "core-graphics-types", "d3d12", @@ -5362,7 +5797,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.0", + "libloading 0.8.1", "log", "metal", "naga", @@ -5387,7 +5822,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "js-sys", "web-sys", ] @@ -5416,9 +5851,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", ] @@ -5448,10 +5883,10 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -5473,15 +5908,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" @@ -5605,9 +6031,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -5669,14 +6095,14 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix 0.26.2", + "nix 0.26.4", "winapi", ] [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/xdg-shell-wrapper#9ae1c4c838fe58e887b62d2a990d73ab2f6cb629" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#f2ca1c3dee8f66c40bdc91cb39de69a62aaaf22f" dependencies = [ "serde", "wayland-protocols-wlr", @@ -5684,25 +6110,35 @@ dependencies = [ [[package]] name = "xkbcommon" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" dependencies = [ "libc", - "memmap2 0.7.1", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", ] [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[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 = "xmlwriter" @@ -5725,8 +6161,8 @@ dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", @@ -5735,12 +6171,12 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand", @@ -5764,7 +6200,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -5785,9 +6221,29 @@ dependencies = [ [[package]] name = "zeno" -version = "0.2.2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "zune-inflate" @@ -5819,7 +6275,7 @@ version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix new file mode 100644 index 0000000000000..b71f6d1996893 --- /dev/null +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, just +, pkg-config +, util-linuxMinimal +, dbus +, glib +, libxkbcommon +, pulseaudio +, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-applets"; + version = "unstable-2023-11-13"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-applets"; + rev = "21fc43e5781a7fbe7e7f39a0b68963dc8c2d486d"; + hash = "sha256-WOUlYIh4a8qQhga4weKcuJYxNL5fa4FzNFuRB1T32oU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE="; + "cosmic-client-toolkit-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "cosmic-config-0.1.0" = "sha256-6g/Om3SFLa+3fu2dkifbXbFP3ksXTbsjb6Xu7tDB570="; + "cosmic-dbus-networkmanager-0.1.0" = "sha256-eSUyDME39UhoimO/gd2mJDaunCrLNXesO9C69IwtjgM="; + "cosmic-notifications-config-0.1.0" = "sha256-QsLlm+jxsmc90Jc73qKgi52PVZoSwuGXDXw+iSJTALw="; + "cosmic-panel-config-0.1.0" = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + "cosmic-time-0.3.0" = "sha256-Vx9MrdnAwqDCnA6WgT/cXxs4NDWvAVZ6hv0FXi2A8t4="; + "smithay-client-toolkit-0.18.0" = "sha256-9NwNrEC+csTVtmXrNQFvOgohTGUO2VCvqOME7SnDCOg="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; + "xdg-shell-wrapper-config-0.1.0" = "sha256-3Dc2fU8xBVUmAs0Q1zEdcdG7vlxpBO+UIlyM/kzGcC4="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ just pkg-config util-linuxMinimal ]; + buildInputs = [ dbus glib libxkbcommon pulseaudio wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "target" "${stdenv.hostPlatform.rust.cargoShortTarget}/release" + ]; + + # Force linking to libwayland-client, which is always dlopen()ed. + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lwayland-client" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-applets"; + description = "Applets for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cosmic/comp/Cargo.lock b/pkgs/by-name/co/cosmic-comp/Cargo.lock index a7b36a1de449f..10627f9f08e5e 100644 --- a/pkgs/applications/window-managers/cosmic/comp/Cargo.lock +++ b/pkgs/by-name/co/cosmic-comp/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -45,9 +45,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", @@ -56,21 +56,23 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", + "getrandom", "once_cell", "serde", "version_check", + "zerocopy", ] [[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", ] @@ -95,20 +97,23 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" dependencies = [ "android-properties", - "bitflags 1.3.2", + "bitflags 2.4.1", "cc", + "cesu8", + "jni", "jni-sys", "libc", "log", "ndk", "ndk-context", "ndk-sys", - "num_enum 0.6.1", + "num_enum", + "thiserror", ] [[package]] @@ -184,6 +189,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "as-raw-xcb-connection" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" + +[[package]] name = "ash" version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -194,17 +205,23 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.1" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atomicwrites" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" dependencies = [ - "rustix 0.37.24", + "rustix", "tempfile", "windows-sys 0.48.0", ] @@ -238,9 +255,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bincode" @@ -280,9 +297,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" dependencies = [ "serde", ] @@ -304,21 +321,21 @@ dependencies = [ [[package]] name = "block-sys" -version = "0.1.0-beta.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +checksum = "2dd7cf50912cddc06dc5ea7c08c5e81c1b2c842a70d19def1848d54c586fed92" dependencies = [ "objc-sys", ] [[package]] name = "block2" -version = "0.2.0-alpha.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ "block-sys", - "objc2-encode", + "objc2", ] [[package]] @@ -344,44 +361,49 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[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 = "calloop" -version = "0.10.6" +name = "bytes" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" -dependencies = [ - "bitflags 1.3.2", - "log", - "nix 0.25.1", - "slotmap", - "thiserror", - "vec_map", -] +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "calloop" -version = "0.12.2" -source = "git+https://github.com/Smithay/calloop?branch=zombies#9a4fd9d85b35e03213983f727e6fe49367abab51" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ "async-task", - "bitflags 2.4.0", + "bitflags 2.4.1", "log", "polling", - "rustix 0.38.17", + "rustix", "slab", "thiserror", ] [[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -392,6 +414,12 @@ dependencies = [ ] [[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -423,8 +451,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", "libc", "objc", ] @@ -466,6 +494,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" [[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.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -499,7 +537,20 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[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 0.5.0", "libc", ] @@ -519,9 +570,9 @@ name = "cosmic-comp" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", - "calloop 0.12.2", + "calloop", "cosmic-comp-config", "cosmic-config", "cosmic-protocols", @@ -533,9 +584,10 @@ dependencies = [ "i18n-embed-fl", "iced_tiny_skia", "id_tree", - "indexmap 2.0.2", + "indexmap 2.1.0", "keyframe", "lazy_static", + "libc", "libcosmic", "libsystemd", "log-panics", @@ -562,7 +614,7 @@ dependencies = [ "wayland-scanner 0.31.0", "xcursor", "xdg", - "xkbcommon 0.7.0", + "xkbcommon", ] [[package]] @@ -576,10 +628,10 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "atomicwrites", - "calloop 0.12.2", + "calloop", "cosmic-config-derive", "dirs 5.0.1", "iced_futures", @@ -591,7 +643,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "quote", "syn 1.0.109", @@ -600,11 +652,11 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#5c03417a08ef04755ad7bc2285d07968d89d69f8" +source = "git+https://github.com/pop-os/cosmic-protocols?branch=main#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "wayland-backend 0.3.2", - "wayland-protocols 0.31.0", + "wayland-protocols", "wayland-scanner 0.31.0", "wayland-server", ] @@ -632,7 +684,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "almost", "cosmic-config", @@ -645,9 +697,9 @@ dependencies = [ [[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", ] @@ -737,6 +789,12 @@ dependencies = [ ] [[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] name = "d3d12" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -768,7 +826,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -779,7 +837,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -789,10 +847,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -803,9 +861,12 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_setters" @@ -816,7 +877,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -885,7 +946,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -915,7 +976,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", "drm-ffi", "drm-fourcc", @@ -967,7 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" dependencies = [ "accesskit", - "ahash 0.8.3", + "ahash 0.8.6", "epaint", "nohash-hasher", "serde", @@ -1030,74 +1091,19 @@ dependencies = [ ] [[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" +name = "encoding_rs" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", + "cfg-if", ] [[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] name = "enum-map" -version = "2.6.3" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" +checksum = "53337c2dbf26a3c31eccc73a37b10c1614e8d4ae99b6a50d553e8936423c1f16" dependencies = [ "enum-map-derive", "serde", @@ -1111,7 +1117,7 @@ checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -1122,7 +1128,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -1132,7 +1138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" dependencies = [ "ab_glyph", - "ahash 0.8.3", + "ahash 0.8.6", "bytemuck", "ecolor", "emath", @@ -1149,30 +1155,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "etagere" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +checksum = "5bf70b9ea3a235a7432b4f481854815e2d4fb2fe824c1f5fb09b8985dd06b3e9" dependencies = [ "euclid", "svg_fmt", @@ -1226,9 +1221,9 @@ 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", ] @@ -1256,9 +1251,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", @@ -1275,12 +1270,9 @@ dependencies = [ [[package]] name = "float_next_after" -version = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" -dependencies = [ - "num-traits", -] +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "fluent" @@ -1374,7 +1366,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[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 0.3.1", +] + +[[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.39", ] [[package]] @@ -1384,6 +1397,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[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.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1426,9 +1445,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1441,9 +1460,9 @@ 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", "futures-sink", @@ -1451,15 +1470,15 @@ dependencies = [ [[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", @@ -1469,38 +1488,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[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.37", + "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-channel", "futures-core", @@ -1676,9 +1695,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "gpu-descriptor-types", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -1687,7 +1706,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", ] [[package]] @@ -1722,16 +1741,16 @@ 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.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -1787,7 +1806,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.2", + "toml 0.8.6", "unic-langid", ] @@ -1830,7 +1849,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.37", + "syn 2.0.39", "unic-langid", ] @@ -1844,13 +1863,13 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "iced" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "iced_core", "iced_futures", @@ -1863,7 +1882,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "bitflags 1.3.2", "instant", @@ -1876,7 +1895,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "futures", "iced_core", @@ -1888,7 +1907,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1899,27 +1918,27 @@ dependencies = [ "kamadak-exif", "log", "lyon_path", - "raw-window-handle", + "raw-window-handle 0.5.2", "thiserror", ] [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "iced_graphics", "iced_tiny_skia", "iced_wgpu", "log", - "raw-window-handle", + "raw-window-handle 0.5.2", "thiserror", ] [[package]] name = "iced_runtime" version = "0.1.1" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "iced_core", "iced_futures", @@ -1929,7 +1948,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "iced_core", "once_cell", @@ -1939,14 +1958,14 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", "kurbo 0.9.5", "log", - "raw-window-handle", + "raw-window-handle 0.5.2", "resvg 0.35.0", "rustc-hash", "softbuffer", @@ -1957,7 +1976,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.11.1" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1969,7 +1988,7 @@ dependencies = [ "log", "lyon", "once_cell", - "raw-window-handle", + "raw-window-handle 0.5.2", "resvg 0.35.0", "rustc-hash", "twox-hash", @@ -1979,7 +1998,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.3" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "iced_renderer", "iced_runtime", @@ -1991,6 +2010,17 @@ dependencies = [ ] [[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 = "id_tree" version = "1.8.0" source = "git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone#632a57d6d49160e18d7300fa7edae52281ec5482" @@ -2058,12 +2088,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -2116,9 +2146,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -2164,6 +2191,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[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" @@ -2171,9 +2214,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2189,9 +2232,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2284,14 +2327,14 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/?rev=f91287d#f91287dec2297df41a339c1106850c4cf179f67f" +source = "git+https://github.com/pop-os/libcosmic/#42f24b7ee2cb5f715d137e61c6b7c4af3e27196a" dependencies = [ "apply", "cosmic-config", @@ -2340,9 +2383,31 @@ dependencies = [ [[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 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.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "libseat" @@ -2394,15 +2459,9 @@ dependencies = [ [[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.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "locale_config" @@ -2419,9 +2478,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", @@ -2449,7 +2508,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -2495,9 +2554,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +checksum = "23bcac20d47825850fabf1e869bf7c2bbe2daefa0776c3cd2eb7cb74635f6e4a" dependencies = [ "float_next_after", "lyon_path", @@ -2536,15 +2595,6 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[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.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" @@ -2554,18 +2604,18 @@ dependencies = [ [[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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ "libc", ] @@ -2606,7 +2656,7 @@ dependencies = [ "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "log", "objc", ] @@ -2651,9 +2701,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" [[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", @@ -2704,15 +2754,16 @@ checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "jni-sys", + "log", "ndk-sys", - "num_enum 0.5.11", - "raw-window-handle", + "num_enum", + "raw-window-handle 0.6.0", "thiserror", ] @@ -2724,27 +2775,15 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] [[package]] name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" @@ -2775,10 +2814,9 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "libc", - "memoffset 0.9.0", ] [[package]] @@ -2803,7 +2841,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2895,9 +2933,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", @@ -2915,44 +2953,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -2978,29 +2995,25 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.2.0-beta.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" [[package]] name = "objc2" -version = "0.3.0-beta.3.patch-leaks.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ - "block2", "objc-sys", "objc2-encode", ] [[package]] name = "objc2-encode" -version = "2.0.0-pre.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" -dependencies = [ - "objc-sys", -] +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] name = "objc_exception" @@ -3043,18 +3056,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "redox_syscall 0.3.5", + "libredox 0.0.2", ] [[package]] name = "ordered-float" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" dependencies = [ "num-traits", ] @@ -3090,7 +3103,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3101,11 +3114,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" dependencies = [ - "ttf-parser 0.19.2", + "ttf-parser 0.20.0", ] [[package]] @@ -3129,7 +3142,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3150,7 +3163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -3169,13 +3182,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 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -3216,7 +3229,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3251,7 +3264,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3287,19 +3300,25 @@ dependencies = [ [[package]] name = "polling" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.17", + "rustix", "tracing", "windows-sys 0.48.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" @@ -3307,12 +3326,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "toml_edit", ] [[package]] @@ -3341,9 +3359,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3364,7 +3382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" dependencies = [ "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -3484,6 +3502,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] name = "rayon" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3528,26 +3552,35 @@ 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 = "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 0.0.1", "thiserror", ] [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3561,13 +3594,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3578,9 +3611,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[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 = "renderdoc" @@ -3636,9 +3669,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", ] @@ -3649,8 +3682,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.21.4", - "bitflags 2.4.0", + "base64 0.21.5", + "bitflags 2.4.1", "serde", "serde_derive", ] @@ -3693,7 +3726,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.37", + "syn 2.0.39", "walkdir", ] @@ -3731,28 +3764,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" -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.17" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.8", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -3839,29 +3858,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -3870,9 +3889,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -3890,9 +3909,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -3945,23 +3964,25 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=74ef59a3f#74ef59a3f8b6a1f86a74388590f2f852040354e4" +source = "git+https://github.com/smithay//smithay?rev=d5b352b#d5b352b33525d21b38ad8d7ebd54c99d39246464" dependencies = [ "appendlist", "ash", - "bitflags 2.4.0", - "calloop 0.12.2", + "bitflags 2.4.1", + "calloop", "cc", "cgmath", + "cursor-icon", "downcast-rs", "drm", "drm-ffi", "drm-fourcc", - "encoding", + "encoding_rs", + "errno", "gbm", "gl_generator", "glow", - "indexmap 2.0.2", + "indexmap 2.1.0", "input", "lazy_static", "libc", @@ -3972,6 +3993,7 @@ dependencies = [ "pkg-config", "profiling", "rand", + "rustix", "scan_fmt", "scopeguard", "smallvec", @@ -3981,33 +4003,39 @@ dependencies = [ "udev 0.8.0", "wayland-backend 0.3.2", "wayland-egl", - "wayland-protocols 0.31.0", + "wayland-protocols", "wayland-protocols-misc", "wayland-protocols-wlr", "wayland-server", "wayland-sys 0.31.1", "winit", "x11rb 0.12.0", - "xkbcommon 0.6.0", + "xkbcommon", ] [[package]] name = "smithay-client-toolkit" -version = "0.16.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" dependencies = [ - "bitflags 1.3.2", - "calloop 0.10.6", - "dlib", - "lazy_static", + "bitflags 2.4.1", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client 0.29.5", + "memmap2 0.9.0", + "rustix", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.29.5", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkeysym", ] [[package]] @@ -4023,7 +4051,16 @@ dependencies = [ "log", "memoffset 0.9.0", "smithay", - "xkbcommon 0.7.0", + "xkbcommon", +] + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", ] [[package]] @@ -4040,13 +4077,13 @@ dependencies = [ "bytemuck", "cfg_aliases", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "fastrand 1.9.0", - "foreign-types", + "foreign-types 0.3.2", "log", "nix 0.26.4", "objc", - "raw-window-handle", + "raw-window-handle 0.5.2", "redox_syscall 0.3.5", "thiserror", "wasm-bindgen", @@ -4153,9 +4190,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4174,7 +4211,7 @@ dependencies = [ [[package]] name = "taffy" version = "0.3.11" -source = "git+https://github.com/DioxusLabs/taffy#120bb7a2e501822b324fd48de955450ebbba1c1a" +source = "git+https://github.com/DioxusLabs/taffy#1876f72bee5e376023eaa518aa7b8a34c769bd1b" dependencies = [ "arrayvec", "grid", @@ -4184,14 +4221,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.17", + "redox_syscall 0.4.1", + "rustix", "windows-sys 0.48.0", ] @@ -4206,22 +4243,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", ] [[package]] @@ -4247,12 +4284,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -4359,43 +4397,32 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit", ] [[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.15" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.2", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -4404,11 +4431,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", @@ -4416,20 +4442,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.37", + "syn 2.0.39", ] [[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", @@ -4448,12 +4474,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -4488,6 +4514,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4676,7 +4708,7 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "log", "pico-args", "usvg-parser", @@ -4733,9 +4765,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "serde", ] @@ -4753,12 +4785,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4782,9 +4808,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4792,24 +4818,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -4819,9 +4845,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4829,22 +4855,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-timer" @@ -4892,52 +4918,47 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.29.5" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" dependencies = [ "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", ] [[package]] name = "wayland-client" -version = "0.30.2" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "nix 0.26.4", - "wayland-backend 0.1.2", - "wayland-scanner 0.30.1", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", ] [[package]] -name = "wayland-commons" -version = "0.29.5" +name = "wayland-csd-frame" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", ] [[package]] name = "wayland-cursor" -version = "0.29.5" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ - "nix 0.24.3", - "wayland-client 0.29.5", + "nix 0.26.4", + "wayland-client 0.31.1", "xcursor", ] @@ -4953,24 +4974,13 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-scanner 0.29.5", -] - -[[package]] -name = "wayland-protocols" version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "wayland-backend 0.3.2", + "wayland-client 0.31.1", "wayland-scanner 0.31.0", "wayland-server", ] @@ -4981,35 +4991,38 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "wayland-backend 0.3.2", - "wayland-protocols 0.31.0", + "wayland-protocols", "wayland-scanner 0.31.0", "wayland-server", ] [[package]] -name = "wayland-protocols-wlr" +name = "wayland-protocols-plasma" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "wayland-backend 0.3.2", - "wayland-protocols 0.31.0", + "wayland-client 0.31.1", + "wayland-protocols", "wayland-scanner 0.31.0", - "wayland-server", ] [[package]] -name = "wayland-scanner" -version = "0.29.5" +name = "wayland-protocols-wlr" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-scanner 0.31.0", + "wayland-server", ] [[package]] @@ -5040,7 +5053,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "downcast-rs", "io-lifetimes 2.0.2", "nix 0.26.4", @@ -5050,17 +5063,6 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "wayland-sys" version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" @@ -5081,14 +5083,15 @@ dependencies = [ "libc", "log", "memoffset 0.9.0", + "once_cell", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -5096,12 +5099,11 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" dependencies = [ "js-sys", - "once_cell", "wasm-bindgen", ] @@ -5124,7 +5126,7 @@ dependencies = [ "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.5.2", "smallvec", "static_assertions", "wasm-bindgen", @@ -5143,13 +5145,13 @@ checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.4.1", "codespan-reporting", "log", "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.5.2", "rustc-hash", "smallvec", "thiserror", @@ -5168,11 +5170,11 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.4.0", + "bitflags 2.4.1", "block", "core-graphics-types", "d3d12", - "foreign-types", + "foreign-types 0.3.2", "glow", "gpu-alloc", "gpu-allocator", @@ -5189,7 +5191,7 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle", + "raw-window-handle 0.5.2", "renderdoc-sys", "rustc-hash", "smallvec", @@ -5206,7 +5208,7 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "js-sys", "web-sys", ] @@ -5415,43 +5417,56 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" -version = "0.28.7" +version = "0.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +checksum = "161598019a9da35ab6c34dc46cd13546cba9dbf9816475d4dd9a639455016563" dependencies = [ + "ahash 0.8.6", "android-activity", - "bitflags 1.3.2", + "atomic-waker", + "bitflags 2.4.1", + "bytemuck", + "calloop", "cfg_aliases", "core-foundation", - "core-graphics", - "dispatch", - "instant", + "core-graphics 0.23.1", + "cursor-icon", + "icrate", + "js-sys", "libc", "log", - "mio", + "memmap2 0.9.0", "ndk", + "ndk-sys", "objc2", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.6.0", "redox_syscall 0.3.5", + "rustix", "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", "wasm-bindgen", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-protocols 0.29.5", - "wayland-scanner 0.29.5", + "wasm-bindgen-futures", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols", + "wayland-protocols-plasma", "web-sys", - "windows-sys 0.45.0", + "web-time", + "windows-sys 0.48.0", "x11-dl", + "x11rb 0.12.0", + "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -5498,8 +5513,12 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ + "as-raw-xcb-connection", "gethostname 0.3.0", + "libc", + "libloading 0.7.4", "nix 0.26.4", + "once_cell", "winapi", "winapi-wsapoll", "x11rb-protocol 0.12.0", @@ -5540,23 +5559,25 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xkbcommon" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c286371c44b3572d19b09196c129a8fff47d7704d6494daefb44fec10f0278ab" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" dependencies = [ "libc", - "memmap2 0.7.1", + "memmap2 0.8.0", "xkeysym", ] [[package]] -name = "xkbcommon" -version = "0.7.0" +name = "xkbcommon-dl" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" dependencies = [ - "libc", - "memmap2 0.8.0", + "bitflags 2.4.1", + "dlib", + "log", + "once_cell", "xkeysym", ] @@ -5597,6 +5618,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] +name = "zerocopy" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/window-managers/cosmic/comp/default.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 5a483649701f6..29864f1cd8d08 100644 --- a/pkgs/applications/window-managers/cosmic/comp/default.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -1,29 +1,40 @@ -{ lib, rustPlatform, fetchFromGitHub, makeBinaryWrapper, pkg-config -, libinput, libglvnd, libxkbcommon, mesa, seatd, udev, wayland, xorg +{ lib +, rustPlatform +, fetchFromGitHub +, makeBinaryWrapper +, pkg-config +, libinput +, libglvnd +, libxkbcommon +, mesa +, seatd +, udev +, xwayland +, wayland +, xorg }: rustPlatform.buildRustPackage { pname = "cosmic-comp"; - version = "unstable-2023-10-04"; + version = "unstable-2023-11-13"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "a3ac6c42b6913193b76e481d9a60f775f67aa858"; - hash = "sha256-nPQx3Pkd9WAq9ooLs8K8UI1rCHYwJlu88SP2PbC/avU="; + rev = "d051d141979820f50b75bd686c745fb7f84fcd05"; + hash = "sha256-8okRiVVPzmuPJjnv1YoQPQFI8g0j1DQhwUoO51dHgGA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "calloop-0.12.2" = "sha256-d/LB65l1DEC/5Kk8yvenTQYfIFBs99XqXn4tAM2mfHI="; - "cosmic-config-0.1.0" = "sha256-0HKv0/UHZMpSGF54aCip9PbwfWiWMSMHZpiipM6Qrf0="; - "cosmic-protocols-0.1.0" = "sha256-oBE/69A4haCN6Etih6B8SlbSnKg1bEocI6Rvf9IegLE="; + "cosmic-config-0.1.0" = "sha256-5WajbfcfCc0ZRpJfysqEydthOsF04ipb35QVWuWKrEs="; + "cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0="; - "smithay-0.3.0" = "sha256-7oOVAoEl+X09e0+V1eR5GviodntMbineEO8Igk2+BM0="; + "smithay-0.3.0" = "sha256-e6BSrsrVSBcOuF8m21m74h7DWZnYHGIYs/4D4ABvqNM="; "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; - "taffy-0.3.11" = "sha256-Py9D8+L9G+sBkHPtlenOdugH5nQKTXa+XdKArOg5+qU="; + "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; }; }; @@ -48,14 +59,15 @@ rustPlatform.buildRustPackage { wrapProgram $out/bin/cosmic-comp \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr - ]} + ]} \ + --prefix PATH : ${lib.makeBinPath [ xwayland ]} ''; meta = with lib; { homepage = "https://github.com/pop-os/cosmic-comp"; description = "Compositor for the COSMIC Desktop Environment"; license = licenses.gpl3Only; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ qyliss nyanbinary ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/cosmic/panel/Cargo.lock b/pkgs/by-name/co/cosmic-panel/Cargo.lock index 168aa6b6f062f..b1c6a41f5c441 100644 --- a/pkgs/applications/window-managers/cosmic/panel/Cargo.lock +++ b/pkgs/by-name/co/cosmic-panel/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -68,7 +68,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -79,20 +79,20 @@ 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.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -122,8 +122,8 @@ dependencies = [ "futures-lite", "log", "parking", - "polling", - "rustix 0.37.23", + "polling 2.8.0", + "rustix 0.37.24", "slab", "socket2 0.4.9", "waker-fn", @@ -135,24 +135,23 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", "async-lock", - "autocfg", + "async-signal", "blocking", "cfg-if", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "rustix 0.37.23", - "signal-hook", + "rustix 0.38.18", "windows-sys", ] @@ -164,14 +163,32 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.18", + "signal-hook-registry", + "slab", + "windows-sys", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" @@ -181,22 +198,22 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atomicwrites" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.18", "tempfile", "windows-sys", ] @@ -266,17 +283,18 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand 1.9.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[package]] @@ -302,14 +320,14 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[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" @@ -319,16 +337,28 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "calloop" -version = "0.10.6" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "log", - "nix 0.25.1", - "slotmap", + "polling 3.2.0", + "rustix 0.38.18", + "slab", "thiserror", - "vec_map", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.18", + "wayland-backend", + "wayland-client", ] [[package]] @@ -364,9 +394,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -374,7 +404,7 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols#e39748e1312d74ab8b4c26f4813b858413500b59" +source = "git+https://github.com/pop-os/cosmic-protocols#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ "cosmic-protocols", "smithay-client-toolkit", @@ -384,7 +414,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -398,7 +428,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ "quote", "syn 1.0.109", @@ -407,7 +437,7 @@ dependencies = [ [[package]] name = "cosmic-notifications-util" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-notifications#e42d4a0e3ef00dbe2d1478d7563cbe326f6b8311" +source = "git+https://github.com/pop-os/cosmic-notifications#4021beac8b95e2915eba08b29b9ceb6b72309462" dependencies = [ "bytemuck", "serde", @@ -471,9 +501,9 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols#e39748e1312d74ab8b4c26f4813b858413500b59" +source = "git+https://github.com/pop-os/cosmic-protocols#5faec87be0a1fd1d72e99431ac8e6647ff1dfd41" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -484,7 +514,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ "almost", "cosmic-config", @@ -667,25 +697,25 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drm" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf9159ef4bcecd0c5e4cbeb573b8d0037493403d542780dba5d840bbf9df56f" +checksum = "97fb1b703ffbc7ebd216eba7900008049a56ace55580ecb2ee7fa801e8d8be87" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bytemuck", "drm-ffi", "drm-fourcc", - "nix 0.26.4", + "nix 0.27.1", ] [[package]] name = "drm-ffi" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1352481b7b90e27a8a1bf8ef6b33cf18b98dba7c410e75c24bb3eef2f0d8d525" +checksum = "ba7d1c19c4b6270e89d59fb27dc6d02a317c658a8a54e54781e1db9b5947595d" dependencies = [ "drm-sys", - "nix 0.26.4", + "nix 0.27.1", ] [[package]] @@ -696,12 +726,9 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" [[package]] name = "drm-sys" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1369f1679d6b706d234c4c1e0613c415c2c74b598a09ad28080ba2474b72e42d" -dependencies = [ - "libc", -] +checksum = "3a4f1c0468062a56cd5705f1e3b5409eb286d5596a2028ec8e947595d7e715ae" [[package]] name = "either" @@ -727,7 +754,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -738,30 +765,30 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] [[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 = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] name = "exr" @@ -796,9 +823,9 @@ 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" @@ -942,7 +969,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -977,9 +1004,9 @@ dependencies = [ [[package]] name = "gbm" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ec389cda876966cf824111bf6e533fb934c711d473498279964a990853b3c6" +checksum = "57c97c1672f2d951da311cd20b148794c4157a8879c7650e65f76c7826e2b1c1" dependencies = [ "bitflags 1.3.2", "drm", @@ -1078,21 +1105,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[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" @@ -1103,7 +1124,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "iced_core" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ "bitflags 1.3.2", "instant", @@ -1115,7 +1136,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic#5454a01461bf5e394b6e0dcf6a4cc206c1156141" +source = "git+https://github.com/pop-os/libcosmic#7cc791a3f5c0e54e091cce800a638aa5567055ef" dependencies = [ "futures", "iced_core", @@ -1155,22 +1176,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown", ] [[package]] @@ -1214,6 +1225,12 @@ dependencies = [ ] [[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[package]] name = "itertools" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1269,7 +1286,7 @@ dependencies = [ [[package]] name = "launch-pad" version = "0.1.0" -source = "git+https://github.com/pop-os/launch-pad.git#13e3b6931c9759acdf58b45eb85379d1e8b43da9" +source = "git+https://github.com/pop-os/launch-pad.git#699fd1801260cd4425dfd472d0e36fdf17bb7f36" dependencies = [ "log", "nix 0.26.4", @@ -1294,15 +1311,15 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", "windows-sys", @@ -1316,9 +1333,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "locale_config" @@ -1379,26 +1396,26 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[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 = "memoffset" -version = "0.6.5" +name = "memmap2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" dependencies = [ - "autocfg", + "libc", ] [[package]] @@ -1449,28 +1466,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "autocfg", "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] @@ -1535,24 +1550,14 @@ 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", ] [[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 = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1639,14 +1644,14 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -1709,7 +1714,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1738,7 +1743,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1754,6 +1759,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.1", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1789,6 +1805,20 @@ dependencies = [ ] [[package]] +name = "polling" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.18", + "tracing", + "windows-sys", +] + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1806,9 +1836,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1829,7 +1859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb156a45b6b9fe8027497422179fb65afc84d36707a7ca98297bf06bccb8d43f" dependencies = [ "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1843,9 +1873,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -1891,9 +1921,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1901,14 +1931,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1942,14 +1970,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.0", ] [[package]] @@ -1963,13 +1991,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.0", ] [[package]] @@ -1980,9 +2008,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "ron" @@ -2004,13 +2032,13 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", - "io-lifetimes", + "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.3.8", "windows-sys", @@ -2018,14 +2046,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys 0.4.10", "windows-sys", ] @@ -2082,7 +2110,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2093,14 +2121,14 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[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", @@ -2109,9 +2137,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", ] @@ -2123,16 +2151,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[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-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2173,34 +2191,38 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay/smithay#d8600f204907e622d8dd002c3c8a4892282d2454" +source = "git+https://github.com/smithay/smithay#a8f3c46f0bd0153160a3ba117502ba47c38ab0dc" dependencies = [ "appendlist", "bitflags 2.4.0", "calloop", "cgmath", + "cursor-icon", "downcast-rs", "drm", "drm-ffi", "drm-fourcc", + "errno", "gbm", "gl_generator", - "indexmap 1.9.3", + "indexmap", "lazy_static", "libc", "libloading", - "nix 0.26.4", + "nix 0.27.1", "once_cell", "profiling", "rand", + "rustix 0.38.18", "scan_fmt", + "smallvec", "tempfile", "thiserror", "tracing", @@ -2215,18 +2237,19 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.17.0" -source = "git+https://github.com/smithay/client-toolkit//#a85f9779fc5126e43bbd4d7fc86f177707157678" +version = "0.18.0" +source = "git+https://github.com/smithay/client-toolkit//#05e3f7f3d91f7953514b6fe04742dc57f5527819" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bytemuck", "calloop", + "calloop-wayland-source", "cursor-icon", - "dlib", + "libc", "log", - "memmap2", - "nix 0.26.4", + "memmap2 0.9.0", "pkg-config", + "rustix 0.38.18", "thiserror", "wayland-backend", "wayland-client", @@ -2293,9 +2316,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2315,30 +2338,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.13", + "rustix 0.38.18", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2379,9 +2402,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2403,14 +2426,14 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -2431,7 +2454,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap", "toml_datetime", "winnow", ] @@ -2456,7 +2479,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2594,12 +2617,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2607,9 +2624,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -2648,7 +2665,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2682,7 +2699,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2710,13 +2727,12 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.1.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" dependencies = [ "cc", "downcast-rs", - "io-lifetimes", "nix 0.26.4", "scoped-tls", "smallvec", @@ -2725,12 +2741,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.30.2" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 1.3.2", - "calloop", + "bitflags 2.4.0", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -2738,9 +2753,9 @@ dependencies = [ [[package]] name = "wayland-csd-frame" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7146581cd54ec2ef3a68e0d0e3501c9cefa8d4894da4007b715ecced5a289a1c" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ "bitflags 2.4.0", "cursor-icon", @@ -2749,9 +2764,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" dependencies = [ "nix 0.26.4", "wayland-client", @@ -2760,9 +2775,9 @@ dependencies = [ [[package]] name = "wayland-egl" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1187695fe81c3153c3163f9d2953149f638c5d7dbc6fe988914ca3f4961e28ed" +checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" dependencies = [ "wayland-backend", "wayland-sys", @@ -2770,11 +2785,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -2783,11 +2798,11 @@ dependencies = [ [[package]] name = "wayland-protocols-misc" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897d4e99645e1ed9245e9e6b5efa78828d2b23b661016d63d55251243d812f8b" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "wayland-backend", "wayland-protocols", "wayland-scanner", @@ -2796,11 +2811,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -2810,9 +2825,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" dependencies = [ "proc-macro2", "quick-xml", @@ -2821,13 +2836,13 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c43c28096fe1d49fff7d1079404fdd0f669cd1a5b00c615bdfe71bb1884d23a" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "downcast-rs", - "io-lifetimes", + "io-lifetimes 2.0.2", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -2835,14 +2850,14 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ "dlib", "libc", "log", - "memoffset 0.7.1", + "memoffset 0.9.0", "pkg-config", ] @@ -2880,9 +2895,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", ] @@ -2961,9 +2976,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -2996,14 +3011,16 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper" version = "0.1.0" -source = "git+https://github.com/pop-os/xdg-shell-wrapper#652888ce7a591fb6b03b4d9f215e5bf0a1c8e629" +source = "git+https://github.com/pop-os/xdg-shell-wrapper//?branch=feat-security-context#50a388c795e1fa06d80bb44166675a42fca05f07" dependencies = [ "anyhow", "cosmic-client-toolkit", "itertools", "libc", "once_cell", + "rand", "ron", + "rustix 0.38.18", "serde", "shlex", "smithay", @@ -3019,7 +3036,7 @@ dependencies = [ [[package]] name = "xdg-shell-wrapper-config" version = "0.1.0" -source = "git+https://github.com/pop-os/xdg-shell-wrapper#652888ce7a591fb6b03b4d9f215e5bf0a1c8e629" +source = "git+https://github.com/pop-os/xdg-shell-wrapper//?branch=feat-security-context#50a388c795e1fa06d80bb44166675a42fca05f07" dependencies = [ "serde", "wayland-protocols-wlr", @@ -3027,12 +3044,13 @@ dependencies = [ [[package]] name = "xkbcommon" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" dependencies = [ "libc", - "memmap2", + "memmap2 0.8.0", + "xkeysym", ] [[package]] @@ -3046,9 +3064,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zbus" @@ -3069,7 +3087,7 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix new file mode 100644 index 0000000000000..7c8c31f511d41 --- /dev/null +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, just +, pkg-config +, rust +, rustPlatform +, libglvnd +, libxkbcommon +, wayland +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-panel"; + version = "unstable-2023-11-13"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-panel"; + rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c"; + sha256 = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cosmic-client-toolkit-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8="; + "cosmic-config-0.1.0" = "sha256-eynEjV7eTRoOUA1v4Ac0FP2h9KQtIDx32WkY0hR4xig="; + "cosmic-notifications-util-0.1.0" = "sha256-F1+Y74JdpehRPTANzERwNVE6Q6n5f5HAFtawLQVMFrA="; + "launch-pad-0.1.0" = "sha256-tnbSJ/GP9GTnLnikJmvb9XrJSgnUnWjadABHF43L1zc="; + "smithay-0.3.0" = "sha256-OI+wtDeJ/2bJyiTxL+F53j1CWnZ0aH7XjUmM6oN45Ow="; + "smithay-client-toolkit-0.18.0" = "sha256-GhCZ7Eb6q7SwA+NeHSiHwx/Fnrw3R6Zm5N2meMOJ2/4="; + "xdg-shell-wrapper-0.1.0" = "sha256-8+RXbYiYeoIGUOsJ7yCc2iYtIGKIwDCzSdq9ISuWxIE="; + }; + }; + + nativeBuildInputs = [ just pkg-config ]; + buildInputs = [ libglvnd libxkbcommon wayland ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" "prefix" (placeholder "out") + "--set" "bin-src" "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-panel" + ]; + + # Force linking to libEGL, which is always dlopen()ed. + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = + map (a: "-C link-arg=${a}") [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-Wl,--pop-state" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-panel"; + description = "Panel for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ qyliss nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/co/cowsql/package.nix b/pkgs/by-name/co/cowsql/package.nix index e0ce266091240..e4e346f8c39f5 100644 --- a/pkgs/by-name/co/cowsql/package.nix +++ b/pkgs/by-name/co/cowsql/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cowsql"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "cowsql"; repo = "cowsql"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+za3pIcV4BhoImKvJlKatCK372wL4OyPbApQvGxGGGk="; + hash = "sha256-JbLiwWXOrEhqCdM8tWwxl68O5Sga4T7NYCXzqP9+Dh0="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { + changelog = "https://github.com/cowsql/cowsql/releases/tag/${version}"; description = "Embeddable, replicated and fault tolerant SQL engine"; homepage = "https://github.com/cowsql/cowsql"; license = licenses.lgpl3Only; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 3e32c22d2e418..bcb06b8ed208c 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-UXh97pHJ9wa/xSslHLB7WVDwLKJYvLPgmPX8RvKrsTI="; + hash = "sha256-Y5TcRcbqarcKRDWCI36YhbLJFU+yrpAE3vRGArbfr0U="; }; - cargoHash = "sha256-hSd53K50Y4K/fYGfsT2fHUaipVSpeYN6/EOFlv4ocuE="; + cargoHash = "sha256-ycFNNTZ7AU4WRnf1+RJB7KxQKVdJbubB28tS/GyU0bI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix new file mode 100644 index 0000000000000..210a016277f69 --- /dev/null +++ b/pkgs/by-name/de/devdash/package.nix @@ -0,0 +1,52 @@ +{ + lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, coreutils +}: + +buildGoModule rec { + pname = "devdash"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Phantas0s"; + repo = "devdash"; + rev = "refs/tags/v${version}"; + hash = "sha256-RUPpgMVl9Cm8uhztdfKnuQ6KdMn9m9PewlT59NnTSiY="; + }; + + vendorHash = "sha256-xuc8rAkyCInNFxs5itwabqBe4CPg/sAuhcTJsapx7Q8="; + + ldflags = [ + "-s -w" + "-X github.com/Phantas0s/devdash/cmd.current=${version}" + "-X github.com/Phantas0s/devdash/cmd.buildDate=1970-01-01-00:00:01" + ]; + + patchPhase = '' + runHook prePatch + + shopt -s globstar + substituteInPlace **/*.go --replace '"/bin/' '"/usr/bin/env ' + shopt -u globstar + + runHook postPatch + ''; + + runtimeDependencies = [ + coreutils + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Highly configurable terminal dashboard for developers and creators"; + homepage = "https://github.com/Phantas0s/devdash"; + changelog = "https://github.com/Phantas0s/devdash/blob/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ h7x4 ]; + license = lib.licenses.asl20; + mainProgram = "devdash"; + }; +} diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 6135efc73c5dc..048b29d3e0bb3 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.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-RKAIZNty+iXeMfsjDOlOyvngx4XU5CSEi0Wap21lFAI="; + hash = "sha256-W0WrI58RgAzxV9WiDAqmz800lcU67uk4IFetUR4Embg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix index 44a39eeaba255..a02680d77eecf 100644 --- a/pkgs/by-name/dx/dxvk_1/package.nix +++ b/pkgs/by-name/dx/dxvk_1/package.nix @@ -9,9 +9,6 @@ , enableMoltenVKCompat ? false }: -let - isCross = stdenv.hostPlatform != stdenv.targetPlatform; -in stdenv.mkDerivation (finalAttrs: { pname = "dxvk"; version = "1.10.3"; @@ -36,15 +33,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ glslang meson ninja ]; buildInputs = [ windows.pthreads ]; - mesonFlags = - let - arch = if stdenv.is32bit then "32" else "64"; - in - [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] - ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ]; + mesonFlags = [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ]; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; diff --git a/pkgs/by-name/dx/dxvk_2/package.nix b/pkgs/by-name/dx/dxvk_2/package.nix index e1fa64ffee05b..8c589fd725875 100644 --- a/pkgs/by-name/dx/dxvk_2/package.nix +++ b/pkgs/by-name/dx/dxvk_2/package.nix @@ -19,7 +19,6 @@ assert !sdl2Support || !glfwSupport; let - isCross = stdenv.hostPlatform != stdenv.targetPlatform; isWindows = stdenv.hostPlatform.uname.system == "Windows"; in stdenv.mkDerivation (finalAttrs: { @@ -51,18 +50,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p include/spirv/include include/vulkan/include ''; - mesonFlags = - let - arch = if stdenv.is32bit then "32" else "64"; - in - [ - "--buildtype" "release" - "--prefix" "${placeholder "out"}" - ] - ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] - ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + mesonFlags = [ + "--buildtype" "release" + "--prefix" "${placeholder "out"}" + ] ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; - doCheck = !isCross; + doCheck = true; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index a670490ef0adb..28ebab5239a64 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.163.0"; + version = "0.164.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk="; + hash = "sha256-ENlMcwk4bMbIzV353vt+EG776+/ajrg5la3JeA81QS4="; }; vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index e2e5443991dd0..96098d190bb3e 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.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-V0PuiF8N5ubNO4/EmGFx6qL0k1ziTVVKe+0rpMTMVlg="; + hash = "sha256-q72IIKUWZBroDcxMEa1ppTPda9lg/KtEpCNOqlg9ZhU="; }; - cargoHash = "sha256-kO4WxTDVmLlQpYuFbohih+4Hct2AmnO802Veuw2Wj2g="; + cargoHash = "sha256-UBayjaQX+bRkciookfQYUrCCewMXlIL3Z1I2ZJIbX6o="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 536710faee505..1378e40f52d80 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fortune-kind"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-8xXRIp6fNYo0Eylzz+i+YccEJZjqiT0TxguZheIblns="; + hash = "sha256-93BEy9FX3bZTYNewotBv1ejmMSnSdu9XnC4TgIvcYG0="; }; - cargoHash = "sha256-v1LmZRuknWFAwwuw4U7Y7jnhBi8UkglY0sege9nSKes="; + cargoHash = "sha256-xm6BOYnxUoCRuMAAFyWRcKEcqrs5FmnOgIO/Gj1bCoI="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/fr/framework-tool/Cargo.lock b/pkgs/by-name/fr/framework-tool/Cargo.lock new file mode 100644 index 0000000000000..f887187a7c75c --- /dev/null +++ b/pkgs/by-name/fr/framework-tool/Cargo.lock @@ -0,0 +1,1312 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[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 = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bit_field" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "built" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" +dependencies = [ + "cargo-lock", + "chrono", + "git2", +] + +[[package]] +name = "bumpalo" +version = "3.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" + +[[package]] +name = "cargo-lock" +version = "8.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +dependencies = [ + "semver", + "serde", + "toml", + "url", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[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.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "clap" +version = "4.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap-verbosity-flag" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eef05769009513df2eb1c3b4613e7fad873a14c600ff025b08f250f59fee7de" +dependencies = [ + "clap", + "log", +] + +[[package]] +name = "clap_derive" +version = "4.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + +[[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 = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +dependencies = [ + "core-foundation-sys 0.6.2", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.13", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[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.107", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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 = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "framework_lib" +version = "0.1.0" +dependencies = [ + "built", + "clap", + "clap-verbosity-flag", + "env_logger", + "guid_macros", + "hidapi", + "lazy_static", + "libc", + "log", + "nix", + "no-std-compat", + "num", + "num-derive", + "num-traits", + "plain", + "redox_hwio", + "regex", + "rusb", + "smbios-lib", + "spin 0.9.4", + "uefi", + "uefi-services", + "windows 0.42.0", +] + +[[package]] +name = "framework_tool" +version = "0.1.0" +dependencies = [ + "framework_lib", +] + +[[package]] +name = "framework_uefi" +version = "0.1.0" +dependencies = [ + "framework_lib", + "log", + "uefi", + "uefi-services", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "git2" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "guid_macros" +version = "0.11.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[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 = "hidapi" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a090a12b53564bcb2f6053b8be08d5f9e7b91f26953d6e8e08c9affd8aeb4ec9" +dependencies = [ + "cc", + "libc", + "pkg-config", + "winapi", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys 0.8.4", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[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 = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "io-kit-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" +dependencies = [ + "core-foundation-sys 0.6.2", + "mach 0.2.3", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys", +] + +[[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", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[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.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libgit2-sys" +version = "0.14.2+1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libusb1-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "libc", + "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 = "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 = "mach" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +dependencies = [ + "libc", +] + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[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 = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[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-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 = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[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 = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[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.107", + "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.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcada80daa06c42ed5f48c9a043865edea5dc44cbf9ac009fda3b89526e28607" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca9224df2e20e7c5548aeb5f110a0f3b77ef05f8585139b7148b59056168ed2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_hwio" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74" + +[[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 = "rusb" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703aa035c21c589b34fb5136b12e68fc8dcf7ea46486861381361dd8ebf5cee0" +dependencies = [ + "libc", + "libusb1-sys", +] + +[[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.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[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 = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smbios-lib" +version = "0.9.1" +source = "git+https://github.com/FrameworkComputer/smbios-lib.git?branch=no-std#b3e2fff8a6f4b8c2d729467cbbf0c8c41974cd1c" +dependencies = [ + "core-foundation", + "core-foundation-sys 0.6.2", + "getopts", + "io-kit-sys", + "libc", + "mach 0.3.2", + "no-std-compat", + "serde", + "serde_json", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +dependencies = [ + "lock_api", +] + +[[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.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +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 = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "ucs2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad643914094137d475641b6bab89462505316ec2ce70907ad20102d28a79ab8" +dependencies = [ + "bit_field", +] + +[[package]] +name = "uefi" +version = "0.20.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "bitflags", + "derive_more", + "log", + "ptr_meta", + "ucs2", + "uefi-macros", +] + +[[package]] +name = "uefi-macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0caeb0e7b31b9f1f347e541106be10aa8c66c76fa722a3298a4cd21433fabd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] +name = "uefi-services" +version = "0.17.0" +source = "git+https://github.com/FrameworkComputer/uefi-rs?branch=merged#76130a0f1c1585012e598b8c514526bac09c68e0" +dependencies = [ + "cfg-if", + "log", + "uefi", +] + +[[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.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-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", +] + +[[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 = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.107", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[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.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5" +dependencies = [ + "windows_aarch64_gnullvm 0.42.0", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[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.0", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm 0.42.0", + "windows_x86_64_msvc 0.42.0", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix new file mode 100644 index 0000000000000..d97b49fccf4b1 --- /dev/null +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: + +rustPlatform.buildRustPackage rec { + pname = "framework-tool"; + + # Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock, + # so use unstable for now + version = "unstable-2023-11-14"; + + src = fetchFromGitHub { + owner = "FrameworkComputer"; + repo = "framework-system"; + rev = "491a587342a5d79366a25d803b7065169314279c"; + hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "smbios-lib-0.9.1" = + "sha256-3L8JaA75j9Aaqg1z9lVs61m6CvXDeQprEFRq+UDCHQo="; + "uefi-0.20.0" = "sha256-/3WNHuc27N89M7s+WT64SHyFOp7YRyzz6B+neh1vejY="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + + meta = with lib; { + description = "Swiss army knife for Framework laptops"; + homepage = "https://github.com/FrameworkComputer/framework-system"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "framework_tool"; + }; +} diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/by-name/fr/free42/package.nix index dd8405772caff..d821bbf628f9c 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -1,22 +1,22 @@ { lib , stdenv , fetchFromGitHub -, makeDesktopItem +, alsa-lib , copyDesktopItems -, pkg-config , gtk3 -, alsa-lib +, makeDesktopItem +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "free42"; - version = "3.0.21"; + version = "3.1"; src = fetchFromGitHub { owner = "thomasokken"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s="; + repo = "free42"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v3nZMjV9KnoTefeu2jl3k1B7efnJnNVOAfDVLyce6QI="; }; nativeBuildInputs = [ @@ -35,6 +35,27 @@ stdenv.mkDerivation rec { dontConfigure = true; + desktopItems = [ + (makeDesktopItem { + name = "com.thomasokken.free42bin"; + desktopName = "Free42Bin"; + genericName = "Calculator"; + exec = "free42bin"; + type = "Application"; + comment = finalAttrs.meta.description; + categories = [ "Utility" "Calculator" ]; + }) + (makeDesktopItem { + name = "com.thomasokken.free42dec"; + desktopName = "Free42Dec"; + genericName = "Calculator"; + exec = "free42dec"; + type = "Application"; + comment = finalAttrs.meta.description; + categories = [ "Utility" "Calculator" ]; + }) + ]; + buildPhase = '' runHook preBuild @@ -50,48 +71,28 @@ stdenv.mkDerivation rec { runHook preInstall install --directory $out/bin \ - $out/share/doc/${pname} \ - $out/share/${pname}/skins \ + $out/share/doc/free42 \ + $out/share/free42/skins \ $out/share/icons/hicolor/48x48/apps \ $out/share/icons/hicolor/128x128/apps install -m755 gtk/free42dec gtk/free42bin $out/bin - install -m644 gtk/README $out/share/doc/${pname}/README-GTK - install -m644 README $out/share/doc/${pname}/README + install -m644 gtk/README $out/share/doc/free42/README-GTK + install -m644 README $out/share/doc/free42/README install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps install -m644 gtk/icon-128x128.xpm $out/share/icons/hicolor/128x128/apps - install -m644 skins/* $out/share/${pname}/skins + install -m644 skins/* $out/share/free42/skins runHook postInstall ''; - desktopItems = [ - (makeDesktopItem { - name = "com.thomasokken.free42bin"; - desktopName = "Free42Bin"; - genericName = "Calculator"; - exec = "free42bin"; - type = "Application"; - comment = meta.description; - categories = [ "Utility" "Calculator" ]; - }) - (makeDesktopItem { - name = "com.thomasokken.free42dec"; - desktopName = "Free42Dec"; - genericName = "Calculator"; - exec = "free42dec"; - type = "Application"; - comment = meta.description; - categories = [ "Utility" "Calculator" ]; - }) - ]; - - meta = with lib; { + meta = { homepage = "https://github.com/thomasokken/free42"; description = "A software clone of HP-42S Calculator"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ AndersonTorres plabadens ]; - platforms = with platforms; unix; + license = with lib.licenses; [ gpl2Only ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "free42dec"; + platforms = with lib.platforms; unix; }; -} +}) diff --git a/pkgs/by-name/gc/gcp-scanner/package.nix b/pkgs/by-name/gc/gcp-scanner/package.nix new file mode 100644 index 0000000000000..1782e0adb017d --- /dev/null +++ b/pkgs/by-name/gc/gcp-scanner/package.nix @@ -0,0 +1,54 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gcp-scanner"; + version = "1.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "google"; + repo = "gcp_scanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-mMvAoqwptCA73JiUl8HIhFBO198NnUmvCbf8Rk9dWxA="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-git-versioning + ]; + + propagatedBuildInputs = with python3.pkgs; [ + google-api-python-client + google-cloud-container + google-cloud-iam + httplib2 + pyu2f + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gcp_scanner" + ]; + + disabledTests = [ + # Tests require credentials + "TestCrawler" + "test_acceptance" + ]; + + meta = with lib; { + description = "A comprehensive scanner for Google Cloud"; + homepage = "https://github.com/google/gcp_scanner"; + changelog = "https://github.com/google/gcp_scanner/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "gcp-scanner"; + }; +} diff --git a/pkgs/by-name/ha/hachimarupop/package.nix b/pkgs/by-name/ha/hachimarupop/package.nix new file mode 100644 index 0000000000000..3ebf82409a1cc --- /dev/null +++ b/pkgs/by-name/ha/hachimarupop/package.nix @@ -0,0 +1,30 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "hachimarupop"; + version = "unstable-2022-07-11"; + + src = fetchFromGitHub { + owner = "noriokanisawa"; + repo = "HachiMaruPop"; + rev = "67d96c274032f5a2e1d33c1ec53498fde9110079"; + hash = "sha256-b1moyTVy0hHGu9/LrQ9k6Isd/LYTSxiuqz3BzrYVbXY="; + }; + + installPhase = '' + runHook preInstall + install -Dm444 fonts/ttf/*.ttf -t $out/share/fonts/truetype/ + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/noriokanisawa/HachiMaruPop"; + description = "A cute, Japanese font"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index bf2bda5100dcd..8c8f9707a7d3f 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "0.9.9.5"; + version = "0.9.9.6"; pname = "hifile"; src = fetchurl { url = "https://www.hifile.app/files/HiFile-${version}.AppImage"; - hash = "sha256-Ks/NLPm5loo9q8pT0LdtfcrC38203beNE74sbEpyuJM="; + hash = "sha256-qfBV4w4nChH2wUAHdcUFwVs+3OeqcKqMJ8WUucn31q4="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix new file mode 100644 index 0000000000000..d5ca54ea5beb2 --- /dev/null +++ b/pkgs/by-name/ho/hof/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "hof"; + version = "0.6.9-beta.1"; + + src = fetchFromGitHub { + owner = "hofstadter-io"; + repo = "hof"; + rev = "v${version}"; + hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI="; + + subPackages = [ "./cmd/hof/main.go" ]; + + postInstall = '' + mv $out/bin/main $out/bin/hof + local INSTALL="$out/bin/hof" + installShellCompletion --cmd hof \ + --bash <($out/bin/hof completion bash) \ + --fish <($out/bin/hof completion fish) \ + --zsh <($out/bin/hof completion zsh) + ''; + + meta = with lib; { + homepage = "https://github.com/hofstadter-io/hof"; + description = "Framework that joins data models, schemas, code generation, and a task engine. Language and technology agnostic"; + license = licenses.asl20; + maintainers = with maintainers; [ jfvillablanca ]; + mainProgram = "hof"; + }; +} diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index fbd8b9f1657de..bb059cde347fb 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ="; + hash = "sha256-u5380inzLmOT0v6emOtjU3pIEQqTmziAVz1R6QG77x0="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 3403edcaaccfc..d630bdf22b308 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf3_23, + protobuf_23, grpc, pandoc, python3, @@ -87,14 +87,14 @@ stdenv.mkDerivation rec { # For future updates: The currently used version can be found in the file # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json # under the key .repositories.protobuf - protobuf3_23 + protobuf_23 python3 ]; postPatch = '' sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf3_23}"' etc/repos.json > etc/repos.json.patched + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_23}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix new file mode 100644 index 0000000000000..e6d1279c74dca --- /dev/null +++ b/pkgs/by-name/ke/keedump/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "keedump"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "ynuwenhof"; + repo = "keedump"; + rev = "refs/tags/v${version}"; + hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI="; + }; + + cargoHash = "sha256-b5jRWmyCvKCDn1fIXTtLCI1Ckr+Ttt7erDbZs4U2TcE="; + + meta = with lib; { + description = "PoC KeePass master password dumper"; + homepage = "https://github.com/ynuwenhof/keedump"; + changelog = "https://github.com/ynuwenhof/keedump/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ fab ]; + mainProgram = "keedump"; + }; +} diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix new file mode 100644 index 0000000000000..45209545aa3d3 --- /dev/null +++ b/pkgs/by-name/ki/kikit/default.nix @@ -0,0 +1,87 @@ +{ bc +, zip +, lib +, fetchFromGitHub +, bats +, buildPythonApplication +, pythonOlder +, callPackage +, kicad +, numpy +, click +, markdown2 +, pytestCheckHook +, commentjson +, wxPython_4_2 +, pcbnew-transition +, pybars3 +, versioneer +}: +let + solidpython = callPackage ./solidpython { }; + + # https://github.com/yaqwsx/KiKit/issues/574 + # copy-pasted from nixpkgs#8d8e62e74f511160a599471549a98bc9e4f4818d + shapely = callPackage ./shapely { }; +in +buildPythonApplication rec { + pname = "kikit"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yaqwsx"; + repo = "KiKit"; + rev = "v${version}"; + hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo="; + }; + + propagatedBuildInputs = [ + kicad + numpy + click + markdown2 + commentjson + # https://github.com/yaqwsx/KiKit/issues/575 + wxPython_4_2 + pcbnew-transition + pybars3 + shapely + # https://github.com/yaqwsx/KiKit/issues/576 + solidpython + ]; + + nativeBuildInputs = [ + versioneer + bc + zip + ]; + + nativeCheckInputs = [ + pytestCheckHook + bats + ]; + + pythonImportsCheck = [ + "kikit" + ]; + + preCheck = '' + export PATH=$PATH:$out/bin + + make test-system + + # pytest needs to run in a subdir. See https://github.com/yaqwsx/KiKit/blob/v1.3.0/Makefile#L43 + cd test/units + ''; + + meta = with lib; { + description = "Automation for KiCAD boards"; + homepage = "https://github.com/yaqwsx/KiKit/"; + changelog = "https://github.com/yaqwsx/KiKit/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly matusf ]; + license = licenses.mit; + }; +} diff --git a/pkgs/by-name/ki/kikit/package.nix b/pkgs/by-name/ki/kikit/package.nix new file mode 100644 index 0000000000000..5f1daa8aa5cd2 --- /dev/null +++ b/pkgs/by-name/ki/kikit/package.nix @@ -0,0 +1,2 @@ +{ python3 }: +(python3.pkgs.callPackage ./default.nix { }) diff --git a/pkgs/by-name/ki/kikit/shapely/default.nix b/pkgs/by-name/ki/kikit/shapely/default.nix new file mode 100644 index 0000000000000..7f136a1338ade --- /dev/null +++ b/pkgs/by-name/ki/kikit/shapely/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, pythonOlder +, geos +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "Shapely"; + version = "1.8.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; + }; + + nativeBuildInputs = [ + geos # for geos-config + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Environment variable used in shapely/_buildcfg.py + GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; + + patches = [ + # Patch to search form GOES .so/.dylib files in a Nix-aware way + (substituteAll { + src = ./library-paths.patch; + libgeos_c = GEOS_LIBRARY_PATH; + libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; + }) + ]; + + preCheck = '' + rm -r shapely # prevent import of local shapely + ''; + + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # FIXME(lf-): these logging tests are broken, which is definitely our + # fault. I've tried figuring out the cause and failed. + # + # It is apparently some sandbox or no-sandbox related thing on macOS only + # though. + "test_error_handler_exception" + "test_error_handler" + "test_info_handler" + ]; + + pythonImportsCheck = [ "shapely" ]; + + meta = with lib; { + description = "Geometric objects, predicates, and operations"; + homepage = "https://pypi.python.org/pypi/Shapely/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/pkgs/by-name/ki/kikit/shapely/library-paths.patch b/pkgs/by-name/ki/kikit/shapely/library-paths.patch new file mode 100644 index 0000000000000..12f93e757f9aa --- /dev/null +++ b/pkgs/by-name/ki/kikit/shapely/library-paths.patch @@ -0,0 +1,31 @@ +diff --git a/shapely/geos.py b/shapely/geos.py +index 88c5f53..1ccd6e4 100644 +--- a/shapely/geos.py ++++ b/shapely/geos.py +@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): + alt_paths = [ + 'libgeos_c.so.1', + 'libgeos_c.so', ++ '@libgeos_c@', + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': + "/usr/local/lib/libgeos_c.dylib", + # homebrew Apple Silicon + "/opt/homebrew/lib/libgeos_c.dylib", ++ "@libgeos_c@", + ] + _lgeos = load_dll('geos_c', fallbacks=alt_paths) + +diff --git a/tests/test_dlls.py b/tests/test_dlls.py +index c71da8e..c36262c 100644 +--- a/tests/test_dlls.py ++++ b/tests/test_dlls.py +@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): + '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) + os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) + 'libgeos_c.so.1', +- 'libgeos_c.so']) ++ 'libgeos_c.so', ++ '@libgeos_c@']) diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix new file mode 100644 index 0000000000000..c03637907a362 --- /dev/null +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -0,0 +1,66 @@ +# SolidPython is an unmaintained library with old dependencies. +{ buildPythonPackage +, callPackage +, fetchFromGitHub +, fetchFromGitLab +, fetchpatch +, lib +, pythonRelaxDepsHook + +, poetry-core +, prettytable +, pypng +, ply +, setuptools +, euclid3 +}: +buildPythonPackage rec { + pname = "solidpython"; + version = "1.1.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "SolidCode"; + repo = "SolidPython"; + rev = "d962740d600c5dfd69458c4559fc416b9beab575"; + hash = "sha256-3fJta2a5c8hV9FPwKn5pj01aBtsCGSRCz3vvxR/5n0Q="; + }; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + ply + setuptools + euclid3 + + prettytable + ]; + + pythonRelaxDeps = [ + # SolidPython has PrettyTable pinned to a hyper-specific version due to + # some ancient bug with Poetry. They aren't interested in unpinning because + # SolidPython v1 seems to be deprecated in favor of v2: + # https://github.com/SolidCode/SolidPython/issues/207 + "PrettyTable" + ]; + + pythonRemoveDeps = [ + # The pypng dependency is only used in an example script. + "pypng" + ]; + + pythonImportsCheck = [ + "solid" + ]; + + meta = with lib; { + description = "Python interface to the OpenSCAD declarative geometry language"; + homepage = "https://github.com/SolidCode/SolidPython"; + changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}"; + maintainers = with maintainers; [ jfly ]; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/by-name/lc/lcab/package.nix b/pkgs/by-name/lc/lcab/package.nix new file mode 100644 index 0000000000000..54f6159ab15db --- /dev/null +++ b/pkgs/by-name/lc/lcab/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lcab"; + version = "1.0b12"; + + src = fetchurl { + # Original site is no longer available + url = "http://deb.debian.org/debian/pool/main/l/lcab/lcab_${finalAttrs.version}.orig.tar.gz"; + hash = "sha256-Bl8sF5O2XyhHHA9xt88SCnBk8o0cRLB8q/SewOl/H8g="; + }; + + patches = [ + # Fix version number + (fetchurl { + url = "https://salsa.debian.org/debian/lcab/-/raw/f72d6db6504123bd124b1a4be21ead8cc1535c9e/debian/patches/20-version.patch"; + hash = "sha256-Yb6E8nQVdicmjcGnxR7HHdsd7D+ThXk02UHiaB+PLvE="; + }) + ]; + + meta = with lib; { + description = "Create cabinet (.cab) archives"; + homepage = "http://ohnopub.net/~ohnobinki/lcab"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + mainProgram = "lcab"; + }; +}) diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix new file mode 100644 index 0000000000000..3c83cc83fb744 --- /dev/null +++ b/pkgs/by-name/le/legba/package.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "legba"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "evilsocket"; + repo = "legba"; + rev = "v${version}"; + hash = "sha256-zZQZuMjyQEuXNor3g4P0YLvvj2DaU3A3/FUzCRJxnZQ="; + }; + + cargoHash = "sha256-qFdV4s//CsLi8tjQ36z3+ECMQR8evtCUKbauf6XpJ04="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl.dev ]; + + # Paho C test fails due to permission issue + doCheck = false; + + meta = with lib; { + description = "A multiprotocol credentials bruteforcer / password sprayer and enumerator"; + homepage = "https://github.com/evilsocket/legba"; + changelog = "https://github.com/evilsocket/legba/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "legba"; + }; +} diff --git a/pkgs/by-name/li/libation/deps.nix b/pkgs/by-name/li/libation/deps.nix new file mode 100644 index 0000000000000..839af8c6ce9f9 --- /dev/null +++ b/pkgs/by-name/li/libation/deps.nix @@ -0,0 +1,218 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AAXClean"; version = "1.1.1"; sha256 = "025mwa4hlxi8mg4g5pqf2wpm3w6i2v6zv23s815cs0rbc259f1c2"; }) + (fetchNuGet { pname = "AAXClean.Codecs"; version = "1.1.1"; sha256 = "1hqyfxssjk5qz2ig4ldmzs9ji58vpmpyramzj191c75s9fylysgh"; }) + (fetchNuGet { pname = "AudibleApi"; version = "8.5.0.1"; sha256 = "0d0rdcsw8pfwym6rwrpyvlzciqxrq6gbb2csjg4zssca5mf0yz7h"; }) + (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.Controls.ItemsRepeater"; version = "11.0.5"; sha256 = "0k2p44bzp4qx6mvs5qp83vdw5c8vq4rgw4i67p2l9is9if6z5wvv"; }) + (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.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.5"; sha256 = "0dgycvkd53lnvx3g9s1w3yhgjg0hmph63za68issni0g1p48plgj"; }) + (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 = "BouncyCastle.Cryptography"; version = "2.2.1"; sha256 = "13fx7cg5hmk2y33438wjz0c74c0lvbmh8fa33gwldldmf72mwcr8"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; }) + (fetchNuGet { pname = "Dinah.Core"; version = "7.2.2.1"; sha256 = "1mh0jy9mdkv416lyg0b34wqacq9gjbp0gzy7p6dw0kdm5mcrrf4k"; }) + (fetchNuGet { pname = "Dinah.Core"; version = "7.3.0.1"; sha256 = "0zgbd40xn411hcl357pc93xilgs5ah91paqn0rmm5j93mbrcixlm"; }) + (fetchNuGet { pname = "Dinah.EntityFrameworkCore"; version = "7.3.0.1"; sha256 = "1gx1980sx9gjas44x6i3gbyxcfqbv16fy792dqly3y558pibv2zp"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) + (fetchNuGet { pname = "Enums.NET"; version = "4.0.1"; sha256 = "13r5dvs86v86mvq4lrv1nqs3841w623nn054miyz2fp5nacs0db5"; }) + (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 = "HtmlAgilityPack"; version = "1.11.46"; sha256 = "0yx0xgbbzd6fdyslf7pc37bxk4hfkj1c7359ibqwmapv9aby7lm2"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.50"; sha256 = "0r1zq7b1m20gpbippdc7q8hl3frdi8d4bsrcxbs6sxd5vqwl570h"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) + (fetchNuGet { pname = "LuceneNet303r2"; version = "3.0.3.5"; sha256 = "1ii1nla8yzmwmygj016iphpjchrgzl7p08fgfyadkz0529379z7g"; }) + (fetchNuGet { pname = "MathNet.Numerics.Signed"; version = "4.15.0"; sha256 = "06yvsy542hx1s0j0hmbhdxzh3784qpi8yg8a5h36hnqm4cdxi7sy"; }) + (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.Data.Sqlite.Core"; version = "7.0.12"; sha256 = "05ljbjqjipq5lhn5ydh1567wd5qgz9dbhlc9i5xjid8pdfn4zzs1"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.12"; sha256 = "077jimjjhl153s5952fmsb41rylhzrca1q77qvi0dfm6hpi5qs8v"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.9"; sha256 = "0r4dzy84z60mvyhhh6q3idsx9rn4h4q95s1bssfb381bylnl8p2b"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.12"; sha256 = "12azk36lz7nb2ixvc61af5zbz5ilgjy3z5wzk7ljpjnrlpdsjmzh"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.9"; sha256 = "13h1i4j9zl2pc8dy9cx50nh84pzmfqrhf1bz7sdrb4ca14sw0bm8"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.12"; sha256 = "1v5qldwzviwmjanl7ag4fvm9xjhm19m604gchn1qwygcpvpr7a80"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.9"; sha256 = "1qrc535r1x32xhy22kxrxj22fjjliy8ymwawbizdcjipnni7z6bv"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "7.0.12"; sha256 = "067c6zwr7hi4jvkhshj2fk6f1ksy5al23ynzc89qlqhy3qydwqry"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.12"; sha256 = "11fsl6q8n5nv7yd344bw481q0gn11w78nahd89pwnbwml832pmhy"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.9"; sha256 = "0nvh6ggbbp0axmxha86fmkhh4jrxjcmgwarcx2qm8qs3vc5x1cz2"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "7.0.12"; sha256 = "13g8m48qjy9gw2zj0ph5h21vw1icc21kpia8bg7sb6g66w399qdp"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "7.0.12"; sha256 = "1g9ppnz6dbc61diswkz0hk6939pxzmbx3qkx0wp4rab7zgxxg12s"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "7.0.12"; sha256 = "0sgr6nc7qh4f4jlfx47gyjl9drj0bxxgd1kvwysz941an3axclvd"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "7.0.0"; sha256 = "1fk7dcz6gfhd1k1d8ksz22rnjvj1waqjzk29ym4i3dz73rsq8j1i"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "7.0.0"; sha256 = "05zjmrpp99l128wijp1fy8asskc11ls871qaqr4mjnz3gbfycxnj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "7.0.0"; sha256 = "0ff20yklyjgyjzdyv7sybczgqhgd557m05dbwxzjznr0x41b180d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "7.0.0"; sha256 = "1f1h0l47abw0spssd64qkhgd7b54pyzslyb586zp21milimcfmgv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "7.0.0"; sha256 = "1812vnkn8n0i4yr3k5azcxcfx1bbpcsmms95rdyxjfrzfksr05ai"; }) + (fetchNuGet { pname = "Microsoft.Extensions.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 = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; }) + (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.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) + (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; sha256 = "1ih6399x4bxzchw7pq5195imir9viy2r1w702vy87vrarxyjqdp1"; }) + (fetchNuGet { pname = "NameParserSharp"; version = "1.5.0"; sha256 = "1qg5fj4mzfvwz54974kvc0hp5xwjmis7zpmfydmiyyg9wrc58k13"; }) + (fetchNuGet { pname = "NAudio.Core"; version = "2.1.0"; sha256 = "1pxd2qmqxsia1spdylxvv8ik5r614yvkmki438ihmhvvs2mxsmvi"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "NPOI"; version = "2.6.2"; sha256 = "19jc9fzbwgs8hydvgbn9qnkncifx9lz0qgrq4jfqv9q1yynh27q2"; }) + (fetchNuGet { pname = "Octokit"; version = "7.1.0"; sha256 = "1vy04mqvzh6c0rr2fbpsaa34f55pdwf76zkm4pdk3mjxwgqjvpbv"; }) + (fetchNuGet { pname = "Pluralize.NET"; version = "1.0.2"; sha256 = "0187adfnl288v7izgwx1iskgi024nm4l83s898x6pg2j79h8gxdv"; }) + (fetchNuGet { pname = "Polly"; version = "7.2.4"; sha256 = "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) + (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) + (fetchNuGet { pname = "Serilog"; version = "2.8.0"; sha256 = "0fnrs05yjnni06mbax7ig74wiiqjyyhrxmr1hrhlpwcmc40zs4ih"; }) + (fetchNuGet { pname = "Serilog.Exceptions"; version = "8.4.0"; sha256 = "1v0rnhr616wj85gb6wvafj22kvnphp7m9vsyalcc25hwa1jvlryr"; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.4.0"; sha256 = "1l6fyy9y5a168i1mm107aqyrwzhqmpy0cp1v13l2b89yv8dc105j"; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "7.0.0"; sha256 = "0r5m3zybx4mzcvazsdhqzb8g65j1fcqvw616bh2mxz0qagvxzd7z"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "Serilog.Sinks.ZipFile"; version = "1.0.1"; sha256 = "18swb04gk0hxwcbc4gndkpl8jgj643f8fga3w26sjkx6r2nhg35q"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) + (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; sha256 = "1lsc789fqsnh3jx5w0g5k2n1wlww58zyzrcf5rs3wx2fjrqi084k"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.4"; sha256 = "0rbv3a20ar73vy6mnj10s245lpninvjz7rhrmqz9vxq42k6g8diy"; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.0.2"; sha256 = "1r654m3ga9al9q4qjr1104rp6lk7j9blmf4j0104zq8893hhq727"; }) + (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 = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (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.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.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.Reflection.TypeExtensions"; version = "4.7.0"; sha256 = "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq"; }) + (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.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "7.0.0"; sha256 = "0xgg9y06j6ch3h65lyrpnghb7iaf9g97w1kg5sz0ji6ikfiqlkxz"; }) + (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "7.0.1"; sha256 = "1wyaakwg31nhbdjl7p3pky5h6q6bh9avbja8jcpmpjjx4rlwmb3k"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) +] diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix new file mode 100644 index 0000000000000..9ba77b00469dd --- /dev/null +++ b/pkgs/by-name/li/libation/package.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, wrapGAppsHook + +, libX11 +, libICE +, libSM +, libXi +, libXcursor +, libXext +, libXrandr +, fontconfig +, glew +, gtk3 +}: + +buildDotnetModule rec { + pname = "libation"; + version = "11.1.0"; + + src = fetchFromGitHub { + owner = "rmcrackan"; + repo = "Libation"; + rev = "v${version}"; + hash = "sha256-NxG1H8lj+aBpgKj03CDpX/tLT0SxDS3pnZGQ2ultBnQ="; + }; + + sourceRoot = "${src.name}/Source"; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + nugetDeps = ./deps.nix; + + dotnetFlags = [ "-p:PublishReadyToRun=false" ]; + + projectFile = [ + "LibationAvalonia/LibationAvalonia.csproj" + "LibationCli/LibationCli.csproj" + "HangoverAvalonia/HangoverAvalonia.csproj" + ]; + + nativeBuildInputs = [ wrapGAppsHook ]; + + runtimeDeps = [ + # For Avalonia UI + libX11 + libICE + libSM + libXi + libXcursor + libXext + libXrandr + fontconfig + glew + # For file dialogs + gtk3 + ]; + + postInstall = '' + install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg + install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace "/usr/bin/libation" "${meta.mainProgram}" + ''; + + # wrap manually, because we need lower case excutables + dontDotnetFixup = true; + + preFixup = '' + # remove binaries for other platform, like upstream does + pushd $out/lib/${pname} + rm -f *.x86.dll *.x64.dll + ${lib.optionalString (stdenv.system != "x86_64-linux") "rm -f *.x64.so"} + ${lib.optionalString (stdenv.system != "aarch64-linux") "rm -f *.arm64.so"} + ${lib.optionalString (stdenv.system != "x86_64-darwin") "rm -f *.x64.dylib"} + ${lib.optionalString (stdenv.system != "aarch64-darwin") "rm -f *.arm64.dylib"} + popd + + wrapDotnetProgram $out/lib/${pname}/Libation $out/bin/libation + wrapDotnetProgram $out/lib/${pname}/LibationCli $out/bin/libationcli + wrapDotnetProgram $out/lib/${pname}/Hangover $out/bin/hangover + ''; + + meta = { + changelog = "https://github.com/rmcrackan/Libation/releases/tag/${src.rev}"; + description = "An Audible audiobook manager"; + homepage = "https://github.com/rmcrackan/Libation"; + license = lib.licenses.gpl3Only; + mainProgram = "libation"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/li/libgpiod_1/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/pkgs/by-name/li/libgpiod_1/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch new file mode 100644 index 0000000000000..f2ee8e8d3d730 --- /dev/null +++ b/pkgs/by-name/li/libgpiod_1/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch @@ -0,0 +1,31 @@ +From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 +From: Johannes Lode <johannes.lode@dynainstruments.com> +Date: Thu, 14 Nov 2019 10:44:00 +0100 +Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as + regular functions. + +While cross-compiling there occurred "undefined reference to +`rpl_malloc'", the suggested change fixes the problem. + +Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 008499d..b492dc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], + + # This is always checked (library needs this) + AC_HEADER_STDC +-AC_FUNC_MALLOC ++# AC_FUNC_MALLOC -- does not work while cross-compiling ++AC_CHECK_FUNC([malloc realloc]) + AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) + AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) + AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) +-- +2.25.1 + diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix new file mode 100644 index 0000000000000..ce5a4ac2833da --- /dev/null +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkg-config, kmod +, enable-tools ? true +, enablePython ? false, python3, ncurses }: + +stdenv.mkDerivation rec { + pname = "libgpiod"; + version = "1.6.4"; + + src = fetchurl { + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; + sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; + }; + + patches = [ + # cross compiling fix + # https://github.com/brgl/libgpiod/pull/45 + ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch + ]; + + buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; + nativeBuildInputs = [ + autoconf-archive + pkg-config + autoreconfHook + ]; + + configureFlags = [ + "--enable-tools=${if enable-tools then "yes" else "no"}" + "--enable-bindings-cxx" + "--prefix=${placeholder "out"}" + ] ++ lib.optional enablePython "--enable-bindings-python"; + + meta = with lib; { + description = "C library and tools for interacting with the linux GPIO character device"; + longDescription = '' + Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use + the character device instead. This library encapsulates the ioctl calls and + data structures behind a straightforward API. + ''; + homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; + license = licenses.lgpl2; + maintainers = [ maintainers.expipiplus1 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index e4782d2eed462..7328416b93dcf 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,6 +2,7 @@ , cmake , darwin , fetchFromGitHub +, fetchpatch , nix-update-script , stdenv , symlinkJoin @@ -10,7 +11,7 @@ , cudaSupport ? config.cudaSupport , cudaPackages ? { } -, rocmSupport ? false +, rocmSupport ? config.rocmSupport , rocmPackages ? { } , openclSupport ? false @@ -37,15 +38,26 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1483"; + version = "1538"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; + hash = "sha256-3JPGKJbO7Z3Jxz9KNSLYBAM7zQ+RJwBqsfRtpK6JS48="; }; + patches = [ + # openblas > v0.3.21 64-bit pkg-config file is now named openblas64.pc + # can remove when patch is accepted upstream + # https://github.com/ggerganov/llama.cpp/pull/4134 + (fetchpatch { + name = "openblas64-pkg-config.patch"; + url = "https://github.com/ggerganov/llama.cpp/commit/c885cc9f76c00557601b877136191b0f7aadc320.patch"; + hash = "sha256-GBTxCiNrCazYRvcHwbqVMAALuJ+Svzf5BE7+nkxw064="; + }) + ]; + postPatch = '' substituteInPlace ./ggml-metal.m \ --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" diff --git a/pkgs/by-name/ln/lngen/package.nix b/pkgs/by-name/ln/lngen/package.nix new file mode 100644 index 0000000000000..1b06a5b1966bf --- /dev/null +++ b/pkgs/by-name/ln/lngen/package.nix @@ -0,0 +1,23 @@ +{ lib +, haskellPackages +, fetchFromGitHub +}: + +haskellPackages.mkDerivation { + pname = "lngen"; + version = "unstable-2023-10-17"; + src = fetchFromGitHub { + owner = "plclub"; + repo = "lngen"; + rev = "c7645001404e0e2fec2c56f128e30079b5b3fac6"; + hash = "sha256-2vUYHtl9yAadwdTtsjTI0klP+nRSYGXVpaSwD9EBTTI="; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = with haskellPackages; [ base syb parsec containers mtl ]; + executableHaskellDepends = with haskellPackages; [ base ]; + homepage = "https://github.com/plclub/lngen"; + description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; + maintainers = with lib.maintainers; [ chen ]; + license = lib.licenses.mit; +} diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix index ecc790cebc14a..28d7631e396a0 100644 --- a/pkgs/by-name/ma/mariadb-connector-java/package.nix +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -1,17 +1,21 @@ -{ lib, maven, fetchFromGitHub }: +{ lib +, maven +, fetchFromGitHub +, nix-update-script +}: maven.buildMavenPackage rec { pname = "mariadb-connector-java"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-j"; rev = "refs/tags/${version}"; - hash = "sha256-ssh6v2h/Ikl2Ulim6lSJ45avjKSCh3Vmtg+LPOgONRU="; + hash = "sha256-JuMm01ihgVoKpe8wyuUIDyzSxMODRg7dQpTCyVA/K10="; }; - mvnHash = "sha256-MizBoFlpYxwwcU7rOac1h2VPJoXv3eRQgWRgsTh8Xno="; + mvnHash = "sha256-Px4Qxb1tTvRKZum1xfe0mdX+EyimnyyfzrydiaDaYRo="; # Disable tests because they require networking mvnParameters = "-DskipTests"; @@ -22,6 +26,8 @@ maven.buildMavenPackage rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "MariaDB Connector/J is used to connect applications developed in Java to MariaDB and MySQL databases"; homepage = "https://mariadb.com/kb/en/about-mariadb-connector-j/"; diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index a42fe9754ff5f..a45930287a506 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { cp -r . "$out/lib/node_modules/@mermaid-js/mermaid-cli" makeWrapper "${nodejs}/bin/node" "$out/bin/mmdc" \ - '' + lib.optionalString (lib.meta.availableOn stdenv.targetPlatform chromium) '' + '' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform chromium) '' --set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}' \ '' + '' --add-flags "$out/lib/node_modules/@mermaid-js/mermaid-cli/src/cli.js" diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/by-name/me/meson/001-fix-rpath.patch index 29bec7903ca98..29bec7903ca98 100644 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/pkgs/by-name/me/meson/001-fix-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/by-name/me/meson/002-clear-old-rpath.patch index f1e3c76e8b53b..f1e3c76e8b53b 100644 --- a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ b/pkgs/by-name/me/meson/002-clear-old-rpath.patch diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/by-name/me/meson/003-more-env-vars.patch index e4ad43550423d..e4ad43550423d 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/by-name/me/meson/003-more-env-vars.patch diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/by-name/me/meson/004-gir-fallback-path.patch index e6d7402652778..e6d7402652778 100644 --- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/pkgs/by-name/me/meson/004-gir-fallback-path.patch diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch index 0a2eda9de9ac6..0a2eda9de9ac6 100644 --- a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch +++ b/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch diff --git a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/pkgs/by-name/me/meson/006-disable-bitcode.patch index a72997c104399..a72997c104399 100644 --- a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch +++ b/pkgs/by-name/me/meson/006-disable-bitcode.patch diff --git a/pkgs/development/tools/build-managers/meson/emulator-hook.sh b/pkgs/by-name/me/meson/emulator-hook.sh index 4f08087cf5f55..4f08087cf5f55 100644 --- a/pkgs/development/tools/build-managers/meson/emulator-hook.sh +++ b/pkgs/by-name/me/meson/emulator-hook.sh diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/by-name/me/meson/package.nix index 8758afea8211e..6239927848aa5 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -3,50 +3,38 @@ , fetchFromGitHub , fetchpatch , installShellFiles +, coreutils +, darwin +, libxcrypt , ninja , pkg-config , python3 -, zlib -, coreutils , substituteAll -, Foundation -, OpenGL -, AppKit -, Cocoa -, libxcrypt +, zlib }: +let + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation OpenGL; +in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; + hash = "sha256-dgYYz3tQDG6Z4eE77WO2dXdardxVzzGaFLQ5znPcTlw="; }; patches = [ - # Meson is currently inspecting fewer variables than autoconf does, which - # makes it harder for us to use setup hooks, etc. Taken from - # https://github.com/mesonbuild/meson/pull/6827 - ./more-env-vars.patch - - # Unlike libtool, vanilla Meson does not pass any information - # about the path library will be installed to to g-ir-scanner, - # breaking the GIR when path other than ${!outputLib}/lib is used. - # We patch Meson to add a --fallback-library-path argument with - # library install_dir to g-ir-scanner. - ./gir-fallback-path.patch - - # In common distributions, RPATH is only needed for internal libraries so + # In typical distributions, RPATH is only needed for internal libraries so # meson removes everything else. With Nix, the locations of libraries # are not as predictable, therefore we need to keep them in the RPATH. # At the moment we are keeping the paths starting with /nix/store. # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 (substituteAll { - src = ./fix-rpath.patch; + src = ./001-fix-rpath.patch; inherit (builtins) storeDir; }) @@ -56,50 +44,89 @@ python3.pkgs.buildPythonApplication rec { # But this can cause much bigger problem for Nix as it can produce # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. - ./clear-old-rpath.patch + ./002-clear-old-rpath.patch + + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. + # https://github.com/mesonbuild/meson/pull/6827 + ./003-more-env-vars.patch + + # Unlike libtool, vanilla Meson does not pass any information about the path + # library will be installed to to g-ir-scanner, breaking the GIR when path + # other than ${!outputLib}/lib is used. + # We patch Meson to add a --fallback-library-path argument with library + # install_dir to g-ir-scanner. + ./004-gir-fallback-path.patch # Patch out default boost search paths to avoid impure builds on # unsandboxed non-NixOS builds, see: # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 - ./boost-Do-not-add-system-paths-on-nix.patch + ./005-boost-Do-not-add-system-paths-on-nix.patch # Nixpkgs cctools does not have bitcode support. - ./disable-bitcode.patch + ./006-disable-bitcode.patch # Fix passing multiple --define-variable arguments to pkg-config. # https://github.com/mesonbuild/meson/pull/10670 (fetchpatch { url = "https://github.com/mesonbuild/meson/commit/d5252c5d4cf1c1931fef0c1c98dd66c000891d21.patch"; - sha256 = "GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; + hash = "sha256-GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; excludes = [ "docs/yaml/objects/dep.yaml" ]; }) ]; - setupHook = ./setup-hook.sh; + buildInputs = lib.optionals (python3.pythonOlder "3.9") [ + libxcrypt + ]; - nativeCheckInputs = [ ninja pkg-config ]; - checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; - checkPhase = '' - runHook preCheck + nativeBuildInputs = [ installShellFiles ]; - patchShebangs 'test cases' - substituteInPlace 'test cases/native/8 external program shebang parsing/script.int.in' \ - --replace /usr/bin/env ${coreutils}/bin/env + nativeCheckInputs = [ + ninja + pkg-config + ]; + + checkInputs = [ + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + OpenGL + ]; + + checkPhase = lib.concatStringsSep "\n" ([ + "runHook preCheck" + '' + patchShebangs 'test cases' + substituteInPlace \ + 'test cases/native/8 external program shebang parsing/script.int.in' \ + --replace /usr/bin/env ${coreutils}/bin/env + '' + ] + # Remove problematic tests + ++ (builtins.map (f: ''rm -vr "${f}";'') [ # requires git, creating cyclic dependency - rm -r 'test cases/common/66 vcstag' + ''test cases/common/66 vcstag'' # requires glib, creating cyclic dependency - rm -r 'test cases/linuxlike/6 subdir include order' - rm -r 'test cases/linuxlike/9 compiler checks with dependencies' + ''test cases/linuxlike/6 subdir include order'' + ''test cases/linuxlike/9 compiler checks with dependencies'' # requires static zlib, see #66461 - rm -r 'test cases/linuxlike/14 static dynamic linkage' + ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. - rm -r 'test cases/osx/7 bitcode' - HOME="$TMPDIR" python ./run_project_tests.py + ''test cases/osx/7 bitcode'' + ]) + ++ [ + ''HOME="$TMPDIR" python ./run_project_tests.py'' + "runHook postCheck" + ]); - runHook postCheck + postInstall = '' + installShellCompletion --zsh data/shell-completions/zsh/_meson + installShellCompletion --bash data/shell-completions/bash/meson ''; postFixup = '' @@ -117,18 +144,9 @@ python3.pkgs.buildPythonApplication rec { --replace "python3 -c " "${python3.interpreter} -c " ''; - buildInputs = lib.optionals (python3.pythonOlder "3.9") [ - libxcrypt - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --zsh data/shell-completions/zsh/_meson - installShellCompletion --bash data/shell-completions/bash/meson - ''; + setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { homepage = "https://mesonbuild.com"; description = "An open source, fast and friendly build system made in Python"; longDescription = '' @@ -140,8 +158,8 @@ python3.pkgs.buildPythonApplication rec { second spent waiting for the build system to actually start compiling code. ''; - license = licenses.asl20; - maintainers = with maintainers; [ mbe AndersonTorres ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (python3.meta) platforms; }; } diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh new file mode 100644 index 0000000000000..85849fbec734a --- /dev/null +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -0,0 +1,87 @@ +# shellcheck shell=bash disable=SC2206 + +mesonConfigurePhase() { + runHook preConfigure + + local flagsArray=() + + if [ -z "${dontAddPrefix-}" ]; then + flagsArray+=("--prefix=$prefix") + fi + + # See multiple-outputs.sh and meson’s coredata.py + flagsArray+=( + "--libdir=${!outputLib}/lib" + "--libexecdir=${!outputLib}/libexec" + "--bindir=${!outputBin}/bin" + "--sbindir=${!outputBin}/sbin" + "--includedir=${!outputInclude}/include" + "--mandir=${!outputMan}/share/man" + "--infodir=${!outputInfo}/share/info" + "--localedir=${!outputLib}/share/locale" + "-Dauto_features=${mesonAutoFeatures:-enabled}" + "-Dwrap_mode=${mesonWrapMode:-nodownload}" + ${crossMesonFlags} + "--buildtype=${mesonBuildType:-plain}" + ) + + flagsArray+=( + $mesonFlags + "${mesonFlagsArray[@]}" + ) + + echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" + + meson setup build "${flagsArray[@]}" + cd build || { echoCmd 'mesonConfigurePhase' "could not cd to build"; exit 1; } + + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echoCmd 'mesonConfigurePhase' "enabled parallel building" + fi + + if [[ ${checkPhase-ninjaCheckPhase} = ninjaCheckPhase && -z $dontUseMesonCheck ]]; then + checkPhase=mesonCheckPhase + fi + if [[ ${installPhase-ninjaInstallPhase} = ninjaInstallPhase && -z $dontUseMesonInstall ]]; then + installPhase=mesonInstallPhase + fi + + runHook postConfigure +} + +mesonCheckPhase() { + runHook preCheck + + local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}") + + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" + meson test --no-rebuild "${flagsArray[@]}" + + runHook postCheck +} + +mesonInstallPhase() { + runHook preInstall + + local flagsArray=() + + if [[ -n "$mesonInstallTags" ]]; then + flagsArray+=("--tags" "${mesonInstallTags// /,}") + fi + flagsArray+=( + $mesonInstallFlags + "${mesonInstallFlagsArray[@]}" + ) + + echoCmd 'mesonInstallPhase flags' "${flagsArray[@]}" + meson install --no-rebuild "${flagsArray[@]}" + + runHook postInstall +} + +if [ -z "${dontUseMesonConfigure-}" ] && [ -z "${configurePhase-}" ]; then + # shellcheck disable=SC2034 + setOutputFlags= + configurePhase=mesonConfigurePhase +fi diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix new file mode 100644 index 0000000000000..37d746f7c7be5 --- /dev/null +++ b/pkgs/by-name/ms/msolve/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, flint +, gmp +, mpfr +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "msolve"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "algebraic-solving"; + repo = "msolve"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mcq98zMWQcmlTZt9eIJJg+IW5UBMcKR+8TzuabpOBwE="; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + flint + gmp + mpfr + ]; + + doCheck = true; + + meta = with lib; { + description = "Library for polynomial system solving through algebraic methods"; + homepage = "https://msolve.lip6.fr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 4cd0658f3acc4..1529bc3c321ac 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.27"; + version = "1.1.29"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-aMoL125DjXM/HL+ebCkjywwEv1VTKPmF2CV/TJd1LMU="; + hash = "sha256-vI30dAcHdVtfD3xWIEytlDaobRX7Wkc7xt8vVHdXJxY="; }; - npmDepsHash = "sha256-i1tbHCI/z/kiGIROlVMvnt7x4f8D7pzTk1BcSPFDwFw="; + npmDepsHash = "sha256-l/jpNCVZe++o494W4EV86VAVdH9W8W8I0+dC2rBome8="; dontNpmInstall = true; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index e0dd291ef76b0..c6c41c13c6ea2 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.302"; + version = "0.0.307"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-I4ZkPdxidT2670NU5o1QTaee4fuDJNEirg7peuHqaJQ="; + hash = "sha256-HcjHqZwT+PTK0ICCvdhaoczNG/DHpJQy1dvGieA2mNc="; }; - vendorHash = "sha256-jYkEXoCxqlxLF7oRc7H+/pMwkphOEwt2qUFkg+JOKVA="; + vendorHash = "sha256-0HyKcn5xt9vezSn6crRsJ/Jshmnk4OM8HZqH/v7DUDM="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix new file mode 100644 index 0000000000000..b18fcb43191b4 --- /dev/null +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitea +, pkg-config +, curl +, expat +, gumbo +, ncurses +, sqlite +, yajl +}: + +stdenv.mkDerivation rec { + pname = "newsraft"; + version = "0.21"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "grisha"; + repo = "newsraft"; + rev = "newsraft-${version}"; + hash = "sha256-vnLlozzPIk3F2U2ZvOClHnpmkXx4fc0pM1X4hFXM2Pg="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ curl expat gumbo ncurses sqlite yajl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Feed reader for terminal"; + homepage = "https://codeberg.org/grisha/newsraft"; + license = licenses.isc; + maintainers = with maintainers; [ arthsmn ]; + mainProgram = "newsraft"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock index 134dec047f28f..6890e1bf90f89 100644 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ b/pkgs/by-name/ni/nickel/Cargo.lock @@ -19,21 +19,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "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", ] @@ -55,9 +56,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -69,15 +70,15 @@ 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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -93,9 +94,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -189,9 +190,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "beef" @@ -231,19 +232,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block-buffer" -version = "0.9.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -255,16 +246,10 @@ dependencies = [ ] [[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "regex-automata", @@ -273,9 +258,9 @@ 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" @@ -345,9 +330,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.3" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -355,36 +340,36 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", "terminal_size", ] [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -398,9 +383,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" @@ -455,7 +440,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c5a805f31fb098b1611170028501077ceb8c9e78f5345530f4fdefae9b61119" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "entities", "memchr", "once_cell", @@ -506,9 +491,9 @@ dependencies = [ [[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", ] @@ -668,9 +653,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", @@ -680,14 +665,58 @@ 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", ] [[package]] +name = "cxx" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.69", + "quote 1.0.33", + "scratch", + "syn 2.0.38", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] name = "debugid" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,9 +727,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -709,7 +741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "rustc_version", "syn 1.0.109", @@ -717,9 +749,18 @@ dependencies = [ [[package]] name = "deunicode" -version = "0.4.4" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71dbf1bf89c23e9cd1baf5e654f622872655f195b36588dc9dc38f7eda30758c" +dependencies = [ + "deunicode 1.4.1", +] + +[[package]] +name = "deunicode" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43" +checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" [[package]] name = "diff" @@ -735,20 +776,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", "crypto-common", ] @@ -812,7 +844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" dependencies = [ "base64 0.13.1", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -865,26 +897,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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-code" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -906,9 +927,9 @@ 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 = "fd-lock" @@ -917,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix 0.38.13", + "rustix", "windows-sys 0.48.0", ] @@ -941,9 +962,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[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", @@ -966,9 +987,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -981,9 +1002,9 @@ 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", "futures-sink", @@ -991,15 +1012,15 @@ dependencies = [ [[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", @@ -1008,38 +1029,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[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 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[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-channel", "futures-core", @@ -1065,24 +1086,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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1108,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -1133,9 +1143,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1154,9 +1173,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 = "humantime" @@ -1187,12 +1206,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", ] [[package]] @@ -1203,18 +1222,18 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "indoc" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inferno" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" +checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" dependencies = [ "ahash", - "indexmap 2.0.0", + "indexmap 2.0.2", "is-terminal", "itoa", "log", @@ -1227,9 +1246,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.31.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "lazy_static", @@ -1240,38 +1259,18 @@ 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.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "is-terminal" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.13", + "hermit-abi 0.3.3", + "rustix", "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" @@ -1304,15 +1303,6 @@ dependencies = [ ] [[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] name = "lalrpop" version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1351,9 +1341,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "line-wrap" @@ -1365,28 +1355,31 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "link-cplusplus" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[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", @@ -1415,7 +1408,7 @@ checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "regex-syntax 0.6.29", "syn 1.0.109", @@ -1465,10 +1458,19 @@ dependencies = [ ] [[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] name = "malachite" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6cf7f4730c30071ba374fac86ad35b1cb7a0716f774737768667ea3fa1828e3" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" dependencies = [ "malachite-base", "malachite-nz", @@ -1477,36 +1479,33 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06bfa98a4b4802af5a4263b4ad4660e28e51e8490f6354eb9336c70767e1c5" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" dependencies = [ - "itertools 0.9.0", - "rand", - "rand_chacha", + "itertools 0.11.0", "ryu", - "sha3", ] [[package]] name = "malachite-nz" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89e21c64b7af5be3dc8cef16f786243faf59459fe4ba93b44efdeb264e5ade4" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" dependencies = [ "embed-doc-image", - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "serde", ] [[package]] name = "malachite-q" -version = "0.3.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3755e541d5134b5016594c9043094172c4dda9259b3ce824a7b8101941850360" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" dependencies = [ - "itertools 0.9.0", + "itertools 0.11.0", "malachite-base", "malachite-nz", "serde", @@ -1514,18 +1513,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "digest 0.10.7", + "cfg-if", + "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -1555,6 +1555,47 @@ dependencies = [ ] [[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-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "metrics-util" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +dependencies = [ + "aho-corasick", + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.13.1", + "indexmap 1.9.3", + "metrics", + "num_cpus", + "ordered-float", + "quanta", + "radix_trie", + "sketches-ddsketch", +] + +[[package]] name = "minimad" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1574,13 +1615,13 @@ 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", + "wasi", "windows-sys 0.48.0", ] @@ -1601,13 +1642,15 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.2.2" +version = "1.3.0" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "clap_complete", "directories", "git-version", "insta", + "metrics", + "metrics-util", "nickel-lang-core", "nickel-lang-utils", "serde", @@ -1617,17 +1660,19 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.2.0" +version = "0.3.0" dependencies = [ "ansi_term", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-reporting", "comrak", "criterion", + "cxx", + "cxx-build", "indexmap 1.9.3", - "indoc 2.0.3", + "indoc 2.0.4", "js-sys", "lalrpop", "lalrpop-util", @@ -1635,8 +1680,10 @@ dependencies = [ "malachite", "malachite-q", "md-5", + "metrics", "nickel-lang-utils", "once_cell", + "pkg-config", "pprof", "pretty", "pretty_assertions", @@ -1653,10 +1700,12 @@ dependencies = [ "similar", "simple-counter", "strip-ansi-escapes", + "strsim", "termimad", "test-generator", "toml", "topiary", + "topiary-queries", "tree-sitter-nickel 0.1.0", "typed-arena", "unicode-segmentation", @@ -1666,18 +1715,20 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.2.2" +version = "1.3.0" dependencies = [ "anyhow", "assert_cmd", "assert_matches", - "clap 4.4.3", + "clap 4.4.7", "codespan", "codespan-lsp", "codespan-reporting", + "criterion", "csv", "derive_more", "env_logger", + "glob", "insta", "lalrpop", "lalrpop-util", @@ -1709,7 +1760,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.1.0" +version = "0.3.0" dependencies = [ "nickel-lang-core", ] @@ -1737,9 +1788,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", ] @@ -1750,7 +1801,7 @@ 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", ] @@ -1798,16 +1849,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "ordered-float" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] [[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 = "pad" @@ -1830,13 +1884,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 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -1854,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -1886,14 +1940,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "indexmap 1.9.3", "line-wrap", - "quick-xml 0.29.0", + "quick-xml 0.30.0", "serde", "time", ] @@ -1927,6 +1981,18 @@ dependencies = [ ] [[package]] +name = "portable-atomic" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "pprof" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1949,12 +2015,6 @@ dependencies = [ ] [[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" @@ -1962,13 +2022,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools 0.10.5", + "itertools 0.11.0", "predicates-core", ] @@ -2037,16 +2097,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "pyckel" -version = "1.2.2" +version = "1.3.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -2097,7 +2157,7 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "pyo3-macros-backend", "quote 1.0.33", "syn 1.0.109", @@ -2109,12 +2169,28 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[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", + "web-sys", + "winapi", +] + +[[package]] name = "quick-xml" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2125,9 +2201,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2147,7 +2223,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", ] [[package]] @@ -2161,51 +2237,19 @@ dependencies = [ ] [[package]] -name = "rand" -version = "0.7.3" +name = "raw-cpuid" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" 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", + "bitflags 1.3.2", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2213,14 +2257,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -2234,9 +2276,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2247,32 +2289,32 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2288,10 +2330,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[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", ] @@ -2313,28 +2361,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -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.13" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -2373,7 +2407,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8218eaf5d960e3c478a1b0f129fa888dd3d8d22eb3de097e9af14c1ab4438024" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] @@ -2406,16 +2440,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "scratch" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" + +[[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" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2433,13 +2473,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2459,27 +2499,27 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -2494,30 +2534,18 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[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", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", + "digest", ] [[package]] @@ -2558,9 +2586,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] name = "simple-counter" @@ -2575,6 +2603,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "sketches-ddsketch" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2589,14 +2623,14 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" dependencies = [ - "deunicode", + "deunicode 0.4.5", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "stable_deref_trait" @@ -2684,18 +2718,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.33" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "unicode-ident", ] @@ -2724,20 +2758,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.13", + "redox_syscall 0.4.1", + "rustix", "windows-sys 0.48.0", ] @@ -2754,9 +2788,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -2777,11 +2811,11 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -2811,32 +2845,33 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2844,15 +2879,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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2893,9 +2928,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "pin-project-lite", @@ -2908,9 +2943,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", - "syn 2.0.33", + "syn 2.0.38", ] [[package]] @@ -2927,9 +2962,9 @@ dependencies = [ [[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", ] @@ -2940,7 +2975,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -2950,9 +2985,9 @@ dependencies = [ [[package]] name = "topiary" version = "0.2.3" -source = "git+https://github.com/tweag/topiary.git?rev=refs/heads/main#7e6cb4f8b505eacee57aaf3c1ab0f3cf539da159" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" dependencies = [ - "clap 4.4.3", + "clap 4.4.7", "futures", "itertools 0.11.0", "log", @@ -2977,6 +3012,11 @@ dependencies = [ ] [[package]] +name = "topiary-queries" +version = "0.2.3" +source = "git+https://github.com/tweag/topiary.git?rev=8299a04bf83c4a2774cbbff7a036c022efa939b3#8299a04bf83c4a2774cbbff7a036c022efa939b3" + +[[package]] name = "tree-sitter" version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2988,8 +3028,8 @@ dependencies = [ [[package]] name = "tree-sitter-bash" -version = "0.20.3" -source = "git+https://github.com/tree-sitter/tree-sitter-bash#bdcd56c5a3896f7bbb7684e223c43d9f24380351" +version = "0.20.4" +source = "git+https://github.com/tree-sitter/tree-sitter-bash#7331995b19b8f8aba2d5e26deb51d2195c18bc94" dependencies = [ "cc", "tree-sitter", @@ -2998,7 +3038,7 @@ dependencies = [ [[package]] name = "tree-sitter-facade" version = "0.9.3" -source = "git+https://github.com/tweag/tree-sitter-facade#1b290e795e700a57d8bd303f98a9715ab1c4f598" +source = "git+https://github.com/tweag/tree-sitter-facade.git#1b290e795e700a57d8bd303f98a9715ab1c4f598" dependencies = [ "js-sys", "tree-sitter", @@ -3009,9 +3049,8 @@ dependencies = [ [[package]] name = "tree-sitter-json" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b04c4e1a92139535eb9fca4ec8fa9666cc96b618005d3ae35f3c957fa92f92" +version = "0.20.1" +source = "git+https://github.com/tree-sitter/tree-sitter-json.git#3fef30de8aee74600f25ec2e319b62a1a870d51e" dependencies = [ "cc", "tree-sitter", @@ -3039,8 +3078,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocaml" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1163abc658cf8ae0ecffbd8f4bd3ee00a2b98729de74f3b08f0e24f3ac208a" +source = "git+https://github.com/tree-sitter/tree-sitter-ocaml.git#694c57718fd85d514f8b81176038e7a4cfabcaaf" dependencies = [ "cc", "tree-sitter", @@ -3049,8 +3087,7 @@ dependencies = [ [[package]] name = "tree-sitter-ocamllex" version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e774222086fd065999b6605fb231fbfc386bf782aa7dbad52503ff00b429a62" +source = "git+https://github.com/314eter/tree-sitter-ocamllex.git#4b9898ccbf198602bb0dec9cd67cc1d2c0a4fad2" dependencies = [ "cc", "tree-sitter", @@ -3068,8 +3105,7 @@ dependencies = [ [[package]] name = "tree-sitter-rust" version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" +source = "git+https://github.com/tree-sitter/tree-sitter-rust.git#48e053397b587de97790b055a1097b7c8a4ef846" dependencies = [ "cc", "tree-sitter", @@ -3077,9 +3113,8 @@ dependencies = [ [[package]] name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" +version = "0.5.1" +source = "git+https://github.com/tree-sitter/tree-sitter-toml.git#342d9be207c2dba869b9967124c679b5e6fd0ebe" dependencies = [ "cc", "tree-sitter", @@ -3093,9 +3128,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[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 = "unescape" @@ -3132,9 +3167,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" @@ -3186,9 +3221,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -3218,7 +3253,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", ] @@ -3243,12 +3278,6 @@ 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" @@ -3274,7 +3303,7 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-shared", @@ -3308,7 +3337,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.67", + "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", "wasm-bindgen-backend", @@ -3360,9 +3389,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", ] @@ -3507,9 +3536,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -3534,3 +3563,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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ede7d7c7970ca2215b8c1ccf4d4f354c4733201dfaaba72d44ae5b37472e4901" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b27b1bb92570f989aac0ab7e9cbfbacdd65973f7ee920d9f0e71ebac878fd0b" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 5e26c96a5017b..3d82fc275c853 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -1,35 +1,47 @@ { lib , rustPlatform , fetchFromGitHub +, stdenv , python3 , nix-update-script }: rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-g7pRTwa2sniIOmgdYCxfYxGRtxnQP8zaVWuPjzEZTSg="; + hash = "sha256-MBonps3yFEpw9l3EAJ6BXNNjY2fUGzWCP+7h0M8LEAY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "topiary-0.2.3" = "sha256-DcmrQ8IuvUBDCBKKSt13k8rU8DJZWFC8MvxWB7dwiQM="; - "tree-sitter-bash-0.20.3" = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; + "topiary-0.2.3" = "sha256-EgDFjJeGJb36je/be7DXvzvpBYDUaupOiQxtL7bN/+Q="; + "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; "tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + "tree-sitter-json-0.20.1" = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; + "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8="; + "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now="; + "tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ="; + "tree-sitter-rust-0.20.4" = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; + }; }; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/ni/nix-search-cli/package.nix b/pkgs/by-name/ni/nix-search-cli/package.nix new file mode 100644 index 0000000000000..56bde6ac04c22 --- /dev/null +++ b/pkgs/by-name/ni/nix-search-cli/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, unstableGitUpdater +}: + +buildGoModule { + pname = "nix-search-cli"; + version = "unstable-2023-09-12"; + + src = fetchFromGitHub { + owner = "peterldowns"; + repo = "nix-search-cli"; + rev = "f3f1c53c72dadac06472a7112aeb486ab5dda695"; + hash = "sha256-YM1Lf7py79rU8aJE0PfQaMr5JWx5J1covUf1aCjRkc8="; + }; + + vendorHash = "sha256-JDOu7YdX9ztMZt0EFAMz++gD7n+Mn1VOe5g6XwrgS5M="; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "CLI for searching packages on search.nixos.org"; + homepage = "https://github.com/peterldowns/nix-search-cli"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + platforms = platforms.all; + mainProgram = "nix-search"; + }; +} diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix new file mode 100644 index 0000000000000..e41e760a29397 --- /dev/null +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -0,0 +1,48 @@ +{ lib +, rustPlatform +, fetchFromGitea +, pkg-config +, openssl +, nix +}: + +let + cargoFlags = [ "-p" "nix-web" ]; +in +rustPlatform.buildRustPackage rec { + pname = "nix-web"; + version = "0.1.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "gorgon"; + repo = "gorgon"; + rev = "nix-web-v${version}"; + hash = "sha256-+IDvoMRuMt1nS69yFhPPVs+s6Dj0dgXVdjjd9f3+spk="; + }; + cargoHash = "sha256-uVBfIw++MRxgVAC+KzGVuMZra8oktUfHcZQk90FF1a8="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + postPatch = '' + substituteInPlace nix-web/nix-web.service \ + --replace 'ExecStart=nix-web' "ExecStart=$out/bin/nix-web" + ''; + postInstall = '' + install -m 644 -D nix-web/nix-web.service $out/lib/systemd/system/nix-web.service + ''; + + cargoBuildFlags = cargoFlags; + cargoTestFlags = cargoFlags; + + NIX_WEB_BUILD_NIX_CLI_PATH = "${nix}/bin/nix"; + + meta = with lib; { + description = "Web interface for the Nix store"; + homepage = "https://codeberg.org/gorgon/gorgon/src/branch/main/nix-web"; + license = licenses.eupl12; + maintainers = with maintainers; [ embr ]; + mainProgram = "nix-web"; + }; +} diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix new file mode 100644 index 0000000000000..d1b39b7896000 --- /dev/null +++ b/pkgs/by-name/no/nofi/package.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, dbus, pkg-config}: + +rustPlatform.buildRustPackage rec { + pname = "nofi"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "ellsclytn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; + }; + + cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dbus ]; + + meta = with lib; { + description = "An interruption-free notification system for Linux"; + homepage = "https://github.com/ellsclytn/nofi/"; + changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; + license = [ licenses.asl20 /* or */ licenses.mit ]; + mainProgram = pname; + maintainers = [ maintainers.magnetophon ]; + }; +} diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix new file mode 100644 index 0000000000000..fde0f3378c397 --- /dev/null +++ b/pkgs/by-name/no/nom/package.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "nom"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "guyfedwards"; + repo = "nom"; + rev = "v${version}"; + hash = "sha256-mYE8cu7qHRyG/pZSr4u6tMEF3ZM5Qz+CX+oLf/chwl4="; + }; + + vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; + + meta = with lib; { + homepage = "https://github.com/guyfedwards/nom"; + description = "RSS reader for the terminal"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nadir-ishiguro ]; + mainProgram = "nom"; + }; +} diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 6e7af27f3b13b..debff8429d886 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -1,31 +1,44 @@ { lib , buildGoModule -, fetchFromGitHub , cairo +, fetchFromGitHub , gobject-introspection -, gtk3 , gtk-layer-shell +, gtk3 , pkg-config , wrapGAppsHook -, xdg-utils }: +, xdg-utils +}: -buildGoModule rec { +let pname = "nwg-drawer"; - version = "0.3.9"; + version = "0.4.1"; src = fetchFromGitHub { owner = "nwg-piotr"; - repo = pname; + repo = "nwg-drawer"; rev = "v${version}"; - sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; + hash = "sha256-2/YI91Rcm+N8tNoKBRIDAQ3T2M6T7+kWngbCzyaXOCc="; }; - vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; + vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8="; +in +buildGoModule { + inherit pname version src vendorHash; + + nativeBuildInputs = [ + gobject-introspection + pkg-config + wrapGAppsHook + ]; - buildInputs = [ cairo gtk3 gtk-layer-shell ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + buildInputs = [ + cairo + gtk-layer-shell + gtk3 + ]; - doCheck = false; + doCheck = false; # Too slow preInstall = '' mkdir -p $out/share/nwg-drawer @@ -43,9 +56,9 @@ buildGoModule rec { meta = with lib; { description = "Application drawer for sway Wayland compositor"; homepage = "https://github.com/nwg-piotr/nwg-drawer"; - license = licenses.mit; - platforms = platforms.linux; + license = with lib.licenses; [ mit ]; mainProgram = "nwg-drawer"; - maintainers = with maintainers; [ plabadens ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = with lib.platforms; linux; }; } diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 0240966e2d86a..7e5782cba0f1f 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -15,6 +15,7 @@ , pciutils , usbutils , util-linux +, nixosTests , testers , ocsinventory-agent , nix-update-script @@ -75,11 +76,14 @@ perlPackages.buildPerlPackage rec { ''; passthru = { - tests.version = testers.testVersion { - package = ocsinventory-agent; - command = "ocsinventory-agent --version"; - # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm - version = "2.10.0"; + tests = { + inherit (nixosTests) ocsinventory-agent; + version = testers.testVersion { + package = ocsinventory-agent; + command = "ocsinventory-agent --version"; + # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm + version = "2.10.0"; + }; }; updateScript = nix-update-script { }; }; diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/by-name/of/offpunk/package.nix index e1b4fdcfa2056..e0814a43ef8a3 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -1,14 +1,15 @@ -{ - fetchFromSourcehut, - installShellFiles, - less, - lib, - offpunk, - python3Packages, - testers, - timg, - xdg-utils, - xsel, +{ fetchFromSourcehut +, file +, installShellFiles +, less +, lib +, offpunk +, python3Packages +, testers +, timg +, xdg-utils +, xsel +, }: let @@ -23,6 +24,7 @@ let setproctitle ]; otherDependencies = [ + file less timg xdg-utils @@ -31,7 +33,7 @@ let in python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "1.10"; + version = "2.0"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -40,23 +42,21 @@ python3Packages.buildPythonPackage rec { owner = "~lioploum"; repo = "offpunk"; rev = "v${version}"; - hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; + hash = "sha256-6ftc2goCNgvXf5kszvjeSHn24Hn73jq26Irl5jiN6pk="; }; - nativeBuildInputs = [ python3Packages.flit-core installShellFiles ]; + nativeBuildInputs = [ python3Packages.hatchling installShellFiles ]; propagatedBuildInputs = otherDependencies ++ pythonDependencies; postInstall = '' installManPage man/*.1 ''; - passthru.tests.version = testers.testVersion { package = offpunk; }; - meta = with lib; { description = "An Offline-First browser for the smolnet "; homepage = src.meta.homepage; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; - license = licenses.bsd2; + license = licenses.agpl3Plus; }; } diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix new file mode 100644 index 0000000000000..b8c8b765d550f --- /dev/null +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "open-fprintd"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "uunicorn"; + repo = pname; + rev = version; + sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; + }; + + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; + + checkInputs = with python3Packages; [ dbus-python ]; + + postInstall = '' + install -D -m 644 debian/open-fprintd.service \ + $out/lib/systemd/system/open-fprintd.service + install -D -m 644 debian/open-fprintd-resume.service \ + $out/lib/systemd/system/open-fprintd-resume.service + install -D -m 644 debian/open-fprintd-suspend.service \ + $out/lib/systemd/system/open-fprintd-suspend.service + substituteInPlace $out/lib/systemd/system/open-fprintd.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-resume.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-suspend.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" + ''; + + meta = with lib; { + description = + "Fprintd replacement which allows you to have your own backend as a standalone service"; + homepage = "https://github.com/uunicorn/open-fprintd"; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/op/openai-triton-llvm/package.nix b/pkgs/by-name/op/openai-triton-llvm/package.nix index 2fb56d0a63522..5744cfa10c11b 100644 --- a/pkgs/by-name/op/openai-triton-llvm/package.nix +++ b/pkgs/by-name/op/openai-triton-llvm/package.nix @@ -1,27 +1,49 @@ -{ config -, lib +{ lib , stdenv , fetchFromGitHub +, pkgsBuildBuild , pkg-config , cmake , ninja , git -, doxygen -, sphinx , libxml2 , libxcrypt , libedit , libffi +, libpfm , mpfr , zlib , ncurses +, doxygen +, sphinx +, which +, sysctl , python3Packages , buildDocs ? true , buildMan ? true , buildTests ? true +, llvmTargetsToBuild ? [ "NATIVE" ] # "NATIVE" resolves into x86 or aarch64 depending on stdenv +, llvmProjectsToBuild ? [ "llvm" "mlir" ] }: -stdenv.mkDerivation (finalAttrs: { +let + llvmNativeTarget = + if stdenv.hostPlatform.isx86_64 then "X86" + else if stdenv.hostPlatform.isAarch64 then "AArch64" + else throw "Currently unsupported LLVM platform '${stdenv.hostPlatform.config}'"; + + inferNativeTarget = t: if t == "NATIVE" then llvmNativeTarget else t; + llvmTargetsToBuild' = [ "AMDGPU" "NVPTX" ] ++ builtins.map inferNativeTarget llvmTargetsToBuild; + + # This LLVM version can't seem to find pygments/pyyaml, + # but a later update will likely fix this (openai-triton-2.1.0) + python = + if buildTests + then python3Packages.python.withPackages (p: with p; [ psutil pygments pyyaml ]) + else python3Packages.python; + + isNative = stdenv.hostPlatform == stdenv.buildPlatform; +in stdenv.mkDerivation (finalAttrs: { pname = "openai-triton-llvm"; version = "14.0.6-f28c006a5895"; @@ -33,7 +55,8 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - # See https://github.com/openai/triton/blob/main/python/setup.py and https://github.com/ptillet/triton-llvm-releases/releases + # See https://github.com/openai/triton/blob/main/python/setup.py + # and https://github.com/ptillet/triton-llvm-releases/releases src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; @@ -46,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja git - python3Packages.python + python ] ++ lib.optionals (buildDocs || buildMan) [ doxygen sphinx @@ -58,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt libedit libffi + libpfm mpfr ]; @@ -69,37 +93,55 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/llvm"; cmakeFlags = [ - "-DLLVM_TARGETS_TO_BUILD=${ - let - # Targets can be found in - # https://github.com/llvm/llvm-project/tree/f28c006a5895fc0e329fe15fead81e37457cb1d1/clang/lib/Basic/Targets - # NOTE: Unsure of how "host" would function, especially given that we might be cross-compiling. - llvmTargets = [ "AMDGPU" "NVPTX" ] - ++ lib.optionals stdenv.isAarch64 [ "AArch64" ] - ++ lib.optionals stdenv.isx86_64 [ "X86" ]; - in - lib.concatStringsSep ";" llvmTargets - }" - "-DLLVM_ENABLE_PROJECTS=llvm;mlir" - "-DLLVM_INSTALL_UTILS=ON" - ] ++ lib.optionals (buildDocs || buildMan) [ - "-DLLVM_INCLUDE_DOCS=ON" - "-DMLIR_INCLUDE_DOCS=ON" - "-DLLVM_BUILD_DOCS=ON" - # "-DLLVM_ENABLE_DOXYGEN=ON" Way too slow, only uses one core - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_HTML=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals buildTests [ - "-DLLVM_INCLUDE_TESTS=ON" - "-DMLIR_INCLUDE_TESTS=ON" - "-DLLVM_BUILD_TESTS=ON" - ]; + (lib.cmakeFeature "LLVM_TARGETS_TO_BUILD" (lib.concatStringsSep ";" llvmTargetsToBuild')) + (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" (lib.concatStringsSep ";" llvmProjectsToBuild)) + (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config) + (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config) + (lib.cmakeBool "LLVM_INSTALL_UTILS" true) + (lib.cmakeBool "LLVM_INCLUDE_DOCS" (buildDocs || buildMan)) + (lib.cmakeBool "MLIR_INCLUDE_DOCS" (buildDocs || buildMan)) + (lib.cmakeBool "LLVM_BUILD_DOCS" (buildDocs || buildMan)) + # Way too slow, only uses one core + # (lib.cmakeBool "LLVM_ENABLE_DOXYGEN" (buildDocs || buildMan)) + (lib.cmakeBool "LLVM_ENABLE_SPHINX" (buildDocs || buildMan)) + (lib.cmakeBool "SPHINX_OUTPUT_HTML" buildDocs) + (lib.cmakeBool "SPHINX_OUTPUT_MAN" buildMan) + (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false) + (lib.cmakeBool "LLVM_INCLUDE_TESTS" buildTests) + (lib.cmakeBool "MLIR_INCLUDE_TESTS" buildTests) + (lib.cmakeBool "LLVM_BUILD_TESTS" buildTests) + # Cross compilation code taken/modified from LLVM 16 derivation + ] ++ lib.optionals (!isNative) (let + nativeToolchainFlags = let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + in [ + (lib.cmakeFeature "CMAKE_C_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}cc") + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "${nativeCC}/bin/${nativeCC.targetPrefix}c++") + (lib.cmakeFeature "CMAKE_AR" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ar") + (lib.cmakeFeature "CMAKE_STRIP" "${nativeBintools}/bin/${nativeBintools.targetPrefix}strip") + (lib.cmakeFeature "CMAKE_RANLIB" "${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib") + ]; + + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out")) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "${placeholder "out"}/bin") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "${placeholder "out"}/include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "${placeholder "out"}/lib") + (lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "${placeholder "out"}/libexec") + ]; + in [ + (lib.cmakeBool "CMAKE_CROSSCOMPILING" true) + (lib.cmakeFeature "CROSS_TOOLCHAIN_FLAGS_NATIVE" (lib.concatStringsSep ";" + (lib.concatLists [ nativeToolchainFlags nativeInstallFlags ]))) + ]); postPatch = '' # `CMake Error: cannot write to file "/build/source/llvm/build/lib/cmake/mlir/MLIRTargets.cmake": Permission denied` chmod +w -R ../mlir + patchShebangs ../mlir/test/mlir-reduce # FileSystem permissions tests fail with various special bits rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test @@ -107,9 +149,21 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" + '' + lib.optionalString stdenv.isAarch64 '' + # Not sure why this fails + rm test/tools/llvm-exegesis/AArch64/latency-by-opcode-name.s + ''; + + postInstall = lib.optionalString (!isNative) '' + cp -a NATIVE/bin/llvm-config $out/bin/llvm-config-native ''; doCheck = buildTests; + + nativeCheckInputs = [ which ] + ++ lib.optionals stdenv.isDarwin [ sysctl ]; + + checkTarget = "check-all"; requiredSystemFeatures = [ "big-parallel" ]; meta = with lib; { @@ -117,9 +171,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/llvm/llvm-project"; license = with licenses; [ ncsa ]; maintainers = with maintainers; [ SomeoneSerge Madouura ]; - platforms = platforms.linux; - # Consider the derivation broken if we're not building for CUDA or ROCm, or if we're building for aarch64 - # and ROCm is enabled. See https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344. - broken = stdenv.isAarch64 && !config.cudaSupport; + platforms = with platforms; aarch64 ++ x86; }; }) diff --git a/pkgs/by-name/op/openrussian-cli/package.nix b/pkgs/by-name/op/openrussian-cli/package.nix new file mode 100644 index 0000000000000..e196507f67e34 --- /dev/null +++ b/pkgs/by-name/op/openrussian-cli/package.nix @@ -0,0 +1,86 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, pkg-config +, wget +, unzip +, mawk +, sqlite +, which +, lua5_3 +, installShellFiles +, makeWrapper +}: +let + luaEnv = lua5_3.withPackages (p: with p; [ luasql-sqlite3 luautf8 ]); +in +stdenv.mkDerivation rec { + pname = "openrussian-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "rhaberkorn"; + repo = "openrussian-cli"; + rev = version; + hash = "sha256-lu13Dd3D4P/7Yol1ixt86BHk86y8DMsbFzfi244+KuY="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/rhaberkorn/openrussian-cli/commit/984e555acbadbd1aed7df17ab53e2c586a2f8f68.patch"; + hash = "sha256-/z4YrEeuejtCtwiFXksFREwgQoWvtI0Kl9w75KDQfF8="; + }) + # Work around https://github.com/dumblob/mysql2sqlite/issues/75 + ./use-mawk.patch + ]; + + nativeBuildInputs = [ + pkg-config + wget + unzip + sqlite + which + installShellFiles + makeWrapper + mawk + ]; + + buildInputs = [ luaEnv ]; + + makeFlags = [ + "LUA=${luaEnv}/bin/lua" + "LUAC=${luaEnv}/bin/luac" + ]; + + dontConfigure = true; + + # Can't use "make install" here + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/openrussian + cp openrussian-sqlite3.db $out/share/openrussian + cp openrussian $out/bin + + wrapProgram $out/bin/openrussian \ + --prefix LUA_PATH ';' '${lua5_3.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua5_3.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' + + runHook postInstall + ''; + + postInstall = '' + installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash + installManPage ./openrussian.1 + ''; + + meta = with lib; { + description = "Offline Console Russian Dictionary (based on openrussian.org)"; + homepage = "https://github.com/rhaberkorn/openrussian-cli"; + license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; + maintainers = with maintainers; [ zane ]; + mainProgram = "openrussian"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/op/openrussian-cli/use-mawk.patch b/pkgs/by-name/op/openrussian-cli/use-mawk.patch new file mode 100644 index 0000000000000..d0cfa814bae3c --- /dev/null +++ b/pkgs/by-name/op/openrussian-cli/use-mawk.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 8fe3880..281ce2d 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ openrussian-sql.zip: + + openrussian-sqlite3.db : openrussian-sql.zip mysql2sqlite postprocess.sql + $(RM) $@ +- unzip -p $< openrussian.sql | awk -f ./mysql2sqlite - | sqlite3 $@ ++ unzip -p $< openrussian.sql | mawk -f ./mysql2sqlite - | sqlite3 $@ + sqlite3 $@ -batch <postprocess.sql + + # Try to generate all possible pages diff --git a/pkgs/by-name/pa/padre/package.nix b/pkgs/by-name/pa/padre/package.nix new file mode 100644 index 0000000000000..aefea32d53863 --- /dev/null +++ b/pkgs/by-name/pa/padre/package.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "padre"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "glebarez"; + repo = "padre"; + rev = "refs/tags/v${version}"; + hash = "sha256-UkL0EydwQfZl4HVtXiU8AyLJnzqBwECIgwm3bpQvyes="; + }; + + vendorHash = "sha256-BBDGnz8u2FEKwuTP9DKz6FoODaW4+VFcL36lumoYTb8="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Advanced exploiting tool for Padding Oracle attacks against CBC mode encryption"; + homepage = "https://github.com/glebarez/padre"; + changelog = "https://github.com/glebarez/padre/releases/tag/v${version}"; + # https://github.com/glebarez/padre/issues/28 + license = licenses.unfree; + maintainers = with maintainers; [ fab ]; + mainProgram = "padre"; + }; +} diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index cdaccc6b436ad..4faecc29cff19 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.2"; + version = "0.24.4"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "v${version}"; - hash = "sha256-tumEwaHXFLSXOmyQba4wBU5irvzZBL3BsCtF+Nlly+c="; + hash = "sha256-RTV3TVNciJE7dC/gtViZcSWFXR2A4qNMAJ/1OEzMAus="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 67b05b8f4b674..ee649f396fa3f 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; + maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/pt/pterm/0001-dtnetsubs-remove-null-check.patch b/pkgs/by-name/pt/pterm/0001-dtnetsubs-remove-null-check.patch new file mode 100644 index 0000000000000..043da784f0a7d --- /dev/null +++ b/pkgs/by-name/pt/pterm/0001-dtnetsubs-remove-null-check.patch @@ -0,0 +1,16 @@ +diff --git a/dtnetsubs.c b/dtnetsubs.c +index ad1c30d..c1fda9b 100644 +--- a/dtnetsubs.c ++++ b/dtnetsubs.c +@@ -865,10 +865,7 @@ int dtSend (NetFet *fet, const void *buf, int len) + ** Update the IN pointer, then wake the send thread. + */ + fet->sendin = in; +- if (ssemp (fet) != NULL) +- { +- sem_post (ssemp (fet)); +- } ++ sem_post (ssemp (fet)); + + if (dtSendFree (fet) == 0) + { diff --git a/pkgs/by-name/pt/pterm/package.nix b/pkgs/by-name/pt/pterm/package.nix new file mode 100644 index 0000000000000..c0d96e44f124a --- /dev/null +++ b/pkgs/by-name/pt/pterm/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, libsndfile +, wxGTK32 +, SDL +}: + +stdenv.mkDerivation rec { + pname = "pterm"; + version = "6.0.4"; + + buildInputs = [ libsndfile SDL wxGTK32 ]; + + src = fetchurl { + url = "https://www.cyber1.org/download/linux/pterm-${version}.tar.bz2"; + hash = "sha256-0OJvoCOGx/a51Ja7n3fOTeQJEcdyn/GhaJ0NtVCyuC8="; + }; + + patches = [ ./0001-dtnetsubs-remove-null-check.patch ]; + + preBuild = '' + substituteInPlace Makefile.common Makefile.wxpterm --replace "/bin/echo" "echo" + echo "exit 0" > wxversion.py + ''; + + hardeningDisable = [ "format" ]; + + env.PTERMVERSION = "${version}"; + + installPhase = '' + runHook preInstall + + install -Dm755 "pterm" "$out/bin/pterm" + + runHook postInstall + ''; + + meta = with lib; { + description = "terminal emulator for the Cyber1 mainframe-based CYBIS system"; + homepage = "https://www.cyber1.org/"; + license = licenses.zlib; + maintainers = with maintainers; [ sarcasticadmin ]; + mainProgram = "pterm"; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 5af31a41de88d..51bf396095902 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.4.1"; + version = "1.6.0"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = version; - hash = "sha256-x/Rar80jwBX64pW+uv0edhlC44OP1b1e2vnJLFGlIms="; + hash = "sha256-QbbBpaBIlU4IoU/NM7igDap8TxOKePQ8JI3ZlH944Bs="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; @@ -26,7 +26,6 @@ python3Packages.buildPythonApplication rec { "pyprland.common" "pyprland.plugins" "pyprland.plugins.interface" - "pyprland.plugins.ironbar" ]; meta = with lib; { diff --git a/pkgs/by-name/qu/quicktype/package.nix b/pkgs/by-name/qu/quicktype/package.nix index 20ce7b39fb3ad..2b52d2370b8c3 100644 --- a/pkgs/by-name/qu/quicktype/package.nix +++ b/pkgs/by-name/qu/quicktype/package.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "quicktype"; - version = "23.0.75"; # version from https://npm.im/quicktype + version = "23.0.78"; # version from https://npm.im/quicktype src = fetchFromGitHub { owner = "quicktype"; repo = "quicktype"; - rev = "9b570a73a896306778940c793c0037a38815304a"; # version not tagged - hash = "sha256-boCBgIoM2GECipZTJlp9IaeXT24aR8tawS1X8CFDDqw="; + rev = "317deefa6a0c8ba0201b9b2b50d00c7e93c41d78"; # version not tagged + hash = "sha256-KkyxS3mxOmUA8ZpB0tqdpdafvP429R5Y39C3CszTiZk="; }; postPatch = '' diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/by-name/rq/rqbit/package.nix index a60b3e9ddf79c..0505cbb1b69ef 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, darwin }: rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-7n+T+y60RjmZC7bE96Ljg0xVg4bSzV/LFgezTld4zfI="; + hash = "sha256-9yYHxlvRlO8iJ3SPi0+4lEgBgAaqaDffKChqAe4OsYU="; }; - cargoHash = "sha256-hcuZ4hqGJT/O7vFefKPGZlkqhdsAl5LGAcSRQAEopnM="; + cargoHash = "sha256-dUQiW6J3Wycp5D3mAwGwruU6CkQ534OyP1GdsY7jzEw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; doCheck = false; @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ikatson/rqbit"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; + mainProgram = "rqbit"; }; } diff --git a/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix b/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix new file mode 100644 index 0000000000000..9f88ebd503a43 --- /dev/null +++ b/pkgs/by-name/rt/rtl-sdr-osmocom/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "rtl-sdr-osmocom"; + version = "2.0.1"; + + src = fetchFromGitea { + domain = "gitea.osmocom.org"; + owner = "sdr"; + repo = "rtl-sdr"; + rev = "v${version}"; + hash = "sha256-+RYSCn+wAkb9e7NRI5kLY8a6OXtJu7QcSUht1R6wDX0="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \ + --replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}" + + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; + + nativeBuildInputs = [ pkg-config cmake ]; + + propagatedBuildInputs = [ libusb1 ]; + + cmakeFlags = lib.optionals stdenv.isLinux [ + "-DINSTALL_UDEV_RULES=ON" + "-DWITH_RPC=ON" + ]; + + meta = with lib; { + description = "Software to turn the RTL2832U into a SDR receiver"; + longDescription = '' + This packages the rtl-sdr library by the Osmocom project. This is the upstream codebase of the unsuffixed "rtl-sdr" package, which is a downstream fork. A list of differences can be found here: + https://github.com/librtlsdr/librtlsdr/blob/master/README_improvements.md + + The Osmocom upstream has a regular release schedule, so this package will likely support newer SDR dongles. It should be compatible with most software that currently depends on the "rtl-sdr" nixpkg, but comptabiliy should be manually confirmed. + ''; + homepage = "https://gitea.osmocom.org/sdr/rtl-sdr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ skovati ]; + platforms = platforms.unix; + mainProgram = "rtl_sdr"; + }; +} diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index db5c9f6b34191..24fd8be884784 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-01"; + version = "unstable-2023-10-31"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d56b31d67473e0970bc457469b0cbec2e35f8b10"; - hash = "sha256-/lMjL2dl7UVYRjafFKmV3XsIH6QehUWCozCuBuxFgpQ="; + rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844"; + hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU="; }; postPatch = '' diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index d01328a184199..f452eb313f510 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.2"; + version = "2023.3"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2023.2"; - hash = "sha256-yVxb5GaQDuCsyjIV+oZzNUEFoq6gMPeaIeQviwGdAgY="; + rev = "2023.3"; + hash = "sha256-mJgCzp8iKzSWf4Tud5xDpnuY4aNJmnEo/hTcuGTaOWM="; }; installPhase = '' diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index ac7a6ec1f18ff..83059f1a281cb 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.3.6"; + version = "0.3.12"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-3Js44cLS6GLI6wFuT2wxgwyMF3beXaULVeaejfxxtA0="; + hash = "sha256-vGtHz1lSKbucR4MmXv542lv9kbON9Cwo7vB5TaeqoX8="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-QZ/zU67oUW75T8DOzjQwmEAr6gjIg/6ZO4Vm/47Lc40="; + vendorHash = "sha256-vE9gh0u8j2NViK2dUd39zZtUuaoKv0hf8VhSX/P4ar8="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/si/signaturepdf/package.nix b/pkgs/by-name/si/signaturepdf/package.nix new file mode 100644 index 0000000000000..be7c2fdd308be --- /dev/null +++ b/pkgs/by-name/si/signaturepdf/package.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, php +, makeWrapper +, imagemagick +, librsvg +, potrace +, pdftk +, ghostscript +}: + +stdenv.mkDerivation rec { + pname = "signaturepdf"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "24eme"; + repo = "${pname}"; + rev = "v${version}"; + hash = "sha256-7yhvTxpjxHcmRxTE7avM+dN+yz9iVr8Ea/e2yfkBURA="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/signaturepdf $out/bin + + cp --target-directory=$out/share/signaturepdf --recursive \ + app.php config locale public templates vendor + + makeWrapper ${lib.getExe php} $out/bin/signaturepdf \ + --inherit-argv0 \ + --chdir $out/share/signaturepdf \ + --prefix PATH : ${lib.makeBinPath [ imagemagick librsvg potrace pdftk ghostscript ]} \ + --run 'port=$1' \ + --run '[ $# -ge 1 ] || ( echo "Usage $0 <port> -d upload_max_filesize=24M -d post_max_size=24M -d max_file_uploads=201" >&2 && exit 1 )' \ + --run 'shift' \ + --run 'echo "You may now open a web browser on http://localhost:$port"' \ + --add-flags '-S "localhost:$port" -t public' + + runHook preInstall + ''; + + meta = with lib; { + description = "Web software for signing PDFs and also organize pages, edit metadata and compress pdf"; + homepage = "https://pdf.24eme.fr/"; + changelog = + "https://github.com/24eme/signaturepdf/releases/tag/v${version}"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index 2af3c28de9221..8518092203b8e 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -21,9 +21,16 @@ , eigen , libvdwxc , llvmPackages -, gpuBackend ? "none" , cudaPackages , rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; diff --git a/pkgs/by-name/so/soundfont-arachno/package.nix b/pkgs/by-name/so/soundfont-arachno/package.nix new file mode 100644 index 0000000000000..1bfcad7fdc408 --- /dev/null +++ b/pkgs/by-name/so/soundfont-arachno/package.nix @@ -0,0 +1,27 @@ +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "soundfont-arachno"; + version = "1.0"; + + src = fetchzip { + # Linked on http://www.arachnosoft.com/main/download.php?id=soundfont-sf2: + url = "https://www.dropbox.com/s/2rnpya9ecb9m4jh/arachno-soundfont-${builtins.replaceStrings ["."] [""] version}-sf2.zip"; + hash = "sha256-Z5ETe0AKPCi4KlM2xOlNcyQn1xvCuor3S/tcrF+AwNQ="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + install -Dm444 Arachno*.sf2 $out/share/soundfonts/arachno.sf2 + runHook postInstall + ''; + + meta = with lib; { + description = "General MIDI-compliant bank, aimed at enhancing the realism of your MIDI files and arrangements"; + homepage = "http://www.arachnosoft.com/main/soundfont.php"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ mrtnvgr ]; + }; +} diff --git a/pkgs/by-name/sp/spfft/package.nix b/pkgs/by-name/sp/spfft/package.nix index 72ae473d14a5f..55b20defd53c1 100644 --- a/pkgs/by-name/sp/spfft/package.nix +++ b/pkgs/by-name/sp/spfft/package.nix @@ -6,9 +6,16 @@ , mpi , gfortran , llvmPackages -, gpuBackend ? "none" , cudaPackages , rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index 1f8abde4b7230..210fb04af9b80 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -6,9 +6,16 @@ , blas , gfortran , llvmPackages -, gpuBackend ? "none" , cudaPackages , rocmPackages +, config +, gpuBackend ? ( + if config.cudaSupport + then "cuda" + else if config.rocmSupport + then "rocm" + else "none" +) }: assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index f329dcfa794c7..6989e86a37298 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -11,7 +11,7 @@ , wayland-protocols , libxkbcommon , libglvnd -, mpv +, mpv-unwrapped , darwin , waylandSupport ? false }: @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-DVduZ1qPbcDlH+B5hibC2HUjwEUV+CpDDpMI8GdPwro"; + hash = "sha256-rNM3kQrEkqLAW6Dia+VsEi9etUG218AL8tO0amWXb34="; }; - vendorHash = "sha256-Dj6I+gt0gB5HWTWdFXCV5UpLuvg+HhuygRJAdvV/Yp8"; + vendorHash = "sha256-I4ZZmQfYTMtNT+3WCs6/g42uF4EKGSjGHCqG8Du5rCo="; nativeBuildInputs = [ copyDesktopItems @@ -43,7 +43,7 @@ buildGoModule rec { buildInputs = [ libglvnd - mpv + mpv-unwrapped ] ++ lib.optionals stdenv.isLinux [ xorg.libXxf86vm xorg.libX11 diff --git a/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix new file mode 100644 index 0000000000000..ae41f6a236841 --- /dev/null +++ b/pkgs/by-name/sw/sway-audio-idle-inhibit/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, libpulseaudio +, wayland +, wayland-protocols +}: +stdenv.mkDerivation { + pname = "sway-audio-idle-inhibit"; + version = "unstable-2023-08-09"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayAudioIdleInhibit"; + rev = "c850bc4812216d03e05083c69aa05326a7fab9c7"; + sha256 = "sha256-MKzyF5xY0uJ/UWewr8VFrK0y7ekvcWpMv/u9CHG14gs="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config + ]; + + buildInputs = [ + libpulseaudio wayland wayland-protocols + ]; + + meta = with lib; { + description = "Prevents swayidle from sleeping while any application is outputting or receiving audio"; + homepage = "https://github.com/ErikReider/SwayAudioIdleInhibit"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ rafaelrc ]; + mainProgram = "sway-audio-idle-inhibit"; + }; +} + diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix new file mode 100644 index 0000000000000..08b6158d4f11a --- /dev/null +++ b/pkgs/by-name/sw/sway-overfocus/package.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, lib, nix-update-script, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "sway-overfocus"; + version = "0.2.3-fix"; + + src = fetchFromGitHub { + owner = "korreman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-KHbYlxgrrZdNKJ7R9iVflbbP1c6qohM/NHBSYuzxEt4="; + }; + + cargoHash = "sha256-zp6PSu8P+ZUhrqi5Vxpe+z9zBaSkdVQBMGNP0FVOviQ="; + + # Crate without tests. + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = ''"Better" focus navigation for sway and i3.''; + homepage = "https://github.com/korreman/sway-overfocus"; + changelog = "https://github.com/korreman/sway-overfocus/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = [ maintainers.ivan770 ]; + mainProgram = "sway-overfocus"; + }; +} + diff --git a/pkgs/by-name/sy/symbolicator/Cargo.lock b/pkgs/by-name/sy/symbolicator/Cargo.lock index 1752195bb12ad..29b24ea9cc764 100644 --- a/pkgs/by-name/sy/symbolicator/Cargo.lock +++ b/pkgs/by-name/sy/symbolicator/Cargo.lock @@ -222,7 +222,7 @@ dependencies = [ "hex", "http", "hyper", - "ring", + "ring 0.16.20", "time", "tokio", "tower", @@ -287,9 +287,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.31.2" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c681fef332c3462634cd97fced8d1ac3cfdf790829bd7bfb4006cfba76712053" +checksum = "73018483d9cb78e1a0d4dcbc94327b01d532e7cb28f26c5bceff97f8f0e4c6eb" dependencies = [ "aws-credential-types", "aws-http", @@ -675,12 +675,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" @@ -810,9 +804,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" +checksum = "d1a12477b7237a01c11a80a51278165f9ba0edd28fa6db00a65ab230320dc58c" [[package]] name = "byteorder" @@ -1054,9 +1048,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" dependencies = [ "libc", ] @@ -1567,11 +1561,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64", "dirs-next", "hyper", "hyper-rustls", - "ring", + "ring 0.16.20", "rustls", "rustls-pemfile", "serde", @@ -1660,9 +1654,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -1784,7 +1778,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1822,16 +1816,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1893,7 +1887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -1936,7 +1930,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -1944,9 +1938,9 @@ dependencies = [ [[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" @@ -2057,13 +2051,13 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" dependencies = [ - "base64 0.21.4", + "base64", "pem", - "ring", + "ring 0.17.5", "serde", "serde_json", "simple_asn1", @@ -2190,9 +2184,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[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", @@ -2707,7 +2701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -2726,13 +2720,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 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -2770,11 +2764,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.13.1", + "base64", + "serde", ] [[package]] @@ -2955,7 +2950,7 @@ dependencies = [ [[package]] name = "process-event" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -3114,6 +3109,15 @@ 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 = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3174,7 +3178,7 @@ version = "0.11.18" source = "git+https://github.com/getsentry/reqwest?branch=restricted-connector#04ea4c720aca814c3f1de500b3e6fe3b0feeae4c" dependencies = [ "async-compression", - "base64 0.21.4", + "base64", "bytes", "encoding_rs", "futures-core", @@ -3229,12 +3233,26 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "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 = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3266,9 +3284,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ "bitflags 2.4.1", "errno", @@ -3284,7 +3302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -3307,7 +3325,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64", ] [[package]] @@ -3316,8 +3334,8 @@ version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3388,8 +3406,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -3795,9 +3813,9 @@ dependencies = [ [[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", @@ -3805,9 +3823,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4200,7 +4218,7 @@ dependencies = [ [[package]] name = "symbolicator" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "axum", @@ -4238,7 +4256,7 @@ dependencies = [ [[package]] name = "symbolicator-crash" -version = "23.10.1" +version = "23.11.0" dependencies = [ "bindgen", "cmake", @@ -4246,7 +4264,7 @@ dependencies = [ [[package]] name = "symbolicator-js" -version = "23.10.1" +version = "23.11.0" dependencies = [ "data-url", "futures", @@ -4272,7 +4290,7 @@ dependencies = [ [[package]] name = "symbolicator-native" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "apple-crash-report-parser", @@ -4303,7 +4321,7 @@ dependencies = [ [[package]] name = "symbolicator-service" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "aws-config", @@ -4347,7 +4365,7 @@ dependencies = [ [[package]] name = "symbolicator-sources" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "aws-types", @@ -4362,7 +4380,7 @@ dependencies = [ [[package]] name = "symbolicator-stress" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "axum", @@ -4384,7 +4402,7 @@ dependencies = [ [[package]] name = "symbolicator-test" -version = "23.10.1" +version = "23.11.0" dependencies = [ "axum", "humantime", @@ -4402,7 +4420,7 @@ dependencies = [ [[package]] name = "symbolicli" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -4427,7 +4445,7 @@ dependencies = [ [[package]] name = "symsorter" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "chrono", @@ -4525,18 +4543,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -4611,7 +4629,7 @@ dependencies = [ "mio 0.8.8", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -4773,9 +4791,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.39" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", @@ -5006,12 +5024,18 @@ 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 = "ureq" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64", "log", "native-tls", "once_cell", @@ -5044,9 +5068,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", @@ -5169,7 +5193,7 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-split" -version = "23.10.1" +version = "23.11.0" dependencies = [ "anyhow", "clap", @@ -5297,10 +5321,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index c744f572a59e9..7ffaf41bb688a 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "23.10.1"; + version = "23.11.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-G8ElLH6u07uJR2Jz05rM59tnVADaDQ768lK477NuWuM="; + hash = "sha256-eXMMk12ZxRs5k3DaRhGADwLbE62L8e4N3R5Rw8kZMKI="; fetchSubmodules = true; }; @@ -46,6 +46,9 @@ rustPlatform.buildRustPackage rec { SYMBOLICATOR_GIT_VERSION = src.rev; SYMBOLICATOR_RELEASE = version; ZSTD_SYS_USE_PKG_CONFIG = true; + } // lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; # tests require network access diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix new file mode 100644 index 0000000000000..b44f6ec906f36 --- /dev/null +++ b/pkgs/by-name/te/termshot/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule rec { + pname = "termshot"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "homeport"; + repo = "termshot"; + rev = "v${version}"; + hash = "sha256-Sxp6abYq0MrqtqDdpffSBdZB3/EyIMF9Ixsc7IgW5hI="; + }; + + vendorHash = "sha256-jzDbA1iN+1dbTVgKw228TuCV3eeAVmHFDiHd2qF/80E="; + + ldflags = [ + "-s" + "-w" + "-X github.com/homeport/termshot/internal/cmd.version=${version}" + ]; + + meta = { + description = "Creates screenshots based on terminal command output"; + homepage = "https://github.com/homeport/termshot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [defelo]; + mainProgram = "termshot"; + }; +} diff --git a/pkgs/os-specific/linux/tinyalsa/default.nix b/pkgs/by-name/ti/tinyalsa/package.nix index cae778227c731..cae778227c731 100644 --- a/pkgs/os-specific/linux/tinyalsa/default.nix +++ b/pkgs/by-name/ti/tinyalsa/package.nix diff --git a/pkgs/development/libraries/tinycompress/default.nix b/pkgs/by-name/ti/tinycompress/package.nix index 96b82bc696fcb..96b82bc696fcb 100644 --- a/pkgs/development/libraries/tinycompress/default.nix +++ b/pkgs/by-name/ti/tinycompress/package.nix diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix new file mode 100644 index 0000000000000..e74ea6e558af6 --- /dev/null +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "tlrc"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "tldr-pages"; + repo = "tlrc"; + rev = "v${version}"; + hash = "sha256-Jdie9ESSbRV07SHjITfQPwDKTedHMbY01FdEMlNOr50="; + }; + + cargoHash = "sha256-2OXyPtgdRGIIc7jIES9zhRpFiaodcEnaK88k+rUVSJo="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage tldr.1 + + installShellCompletion \ + --name tldr --bash $releaseDir/build/tlrc-*/out/tldr.bash \ + --zsh $releaseDir/build/tlrc-*/out/_tldr \ + --fish $releaseDir/build/tlrc-*/out/tldr.fish + ''; + + meta = with lib; { + description = "Official tldr client written in Rust"; + homepage = "https://github.com/tldr-pages/tlrc"; + changelog = "https://github.com/tldr-pages/tlrc/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "tldr"; + maintainers = with maintainers; [ acuteenvy ]; + }; +} diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 6aee9c1598b9e..c8fc25f206962 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -17,13 +17,13 @@ assert lib.elem lineEditingLibrary [ "isocline" "readline" ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.29.36"; + version = "2.30.7"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-tQp2DOBW71Wm1aQqspW9tuH8aM8ir+ilZiENdElB/+0="; + hash = "sha256-W0hcIeWbgORWBYuNbVJRA8NNnuBEG8HMLeVBxXtd2VQ="; }; postPatch = '' diff --git a/pkgs/by-name/ty/typst-preview/Cargo.lock b/pkgs/by-name/ty/typst-preview/Cargo.lock new file mode 100644 index 0000000000000..81618b1902ead --- /dev/null +++ b/pkgs/by-name/ty/typst-preview/Cargo.lock @@ -0,0 +1,4166 @@ +# 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.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 = "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.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", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "append-only-vec" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[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 = "biblatex" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" +dependencies = [ + "numerals", + "paste", + "strum", + "unicode-normalization", + "unscanny", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bit-set" +version = "0.5.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[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 = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytecheck" +version = "0.6.11" +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", +] + +[[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 = "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 = "chinese-number" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9cec9efb10b00914876c7e7b1fdaec572b888443b4046cd11ba91eb8c5a1ccb" +dependencies = [ + "chinese-variant", + "enum-ordinalize", + "num-bigint", + "num-traits", +] + +[[package]] +name = "chinese-variant" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" + +[[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", +] + +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "citationberg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +dependencies = [ + "quick-xml 0.28.2", + "serde", +] + +[[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_complete" +version = "4.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "comemo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +dependencies = [ + "comemo-macros", + "siphasher", +] + +[[package]] +name = "comemo-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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 = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +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 = "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-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +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 = "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 = "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.38", +] + +[[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.38", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "data-url" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", + "serde", +] + +[[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 = "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", +] + +[[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.38", +] + +[[package]] +name = "dissimilar" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "ecow" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" +dependencies = [ + "serde", +] + +[[package]] +name = "elsa" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714f766f3556b44e7e4776ad133fcc3445a489517c25c704ace411bb14790194" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-ordinalize" +version = "3.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[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", +] + +[[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 = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontdb" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +dependencies = [ + "log", + "slotmap", + "tinyvec", + "ttf-parser", +] + +[[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.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 = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + +[[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.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-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "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" +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 = "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 = "git2" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +dependencies = [ + "bitflags 2.4.1", + "libc", + "libgit2-sys", + "log", + "url", +] + +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + +[[package]] +name = "hayagriva" +version = "0.4.0" +source = "git+https://github.com/Myriad-Dreamin/hayagriva.git?branch=typst.ts-v0.9.0#567dcc691ddaf0f30644c53db3f50072250fbd93" +dependencies = [ + "biblatex", + "ciborium", + "citationberg", + "indexmap 2.0.2", + "numerals", + "paste", + "rkyv", + "serde", + "serde_yaml", + "thiserror", + "unic-langid", + "unicode-segmentation", + "unscanny", + "url", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +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", + "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.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.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", + "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 = "hypher" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" + +[[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 = "icu_collections" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" +dependencies = [ + "displaydoc", + "serde", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_properties" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "serde", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "postcard", + "serde", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_adapters" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" +dependencies = [ + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_provider_blob" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" +dependencies = [ + "icu_provider", + "postcard", + "serde", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "icu_segmenter" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" +dependencies = [ + "core_maths", + "displaydoc", + "icu_collections", + "icu_locid", + "icu_provider", + "icu_segmenter_data", + "serde", + "utf8_iter", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + +[[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 = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "indexmap" +version = "1.9.3" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", + "serde", +] + +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + +[[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", + "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-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[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" + +[[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 = "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 = "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.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libgit2-sys" +version = "0.16.1+1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libz-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "lipsum" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c5e9ef2d2ad6fe67a59ace27c203c8d3a71d195532ee82e3bbe0d5f9a9ca541" +dependencies = [ + "rand", + "rand_chacha", +] + +[[package]] +name = "litemap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" + +[[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 = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[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.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", + "windows-sys", +] + +[[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 = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys", +] + +[[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-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_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "numerals" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" + +[[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 = "open" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openssl" +version = "0.10.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +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 2.0.38", +] + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +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 = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "libm", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 0.4.1", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-clean" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pdf-writer" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" +dependencies = [ + "bitflags 1.3.2", + "itoa", + "memchr", + "ryu", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +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 = "pixglyph" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plist" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" +dependencies = [ + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml 0.30.0", + "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 = "postcard" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.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 = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[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 = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", + "serde", +] + +[[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 = "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 = "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "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", + "regex-syntax 0.8.2", +] + +[[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.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[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" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "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", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "resvg" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia 0.11.2", + "usvg", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[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.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", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +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 = "rustybuzz" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.15" +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" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[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 = "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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[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.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +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.0.2", + "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.38", +] + +[[package]] +name = "serde_yaml" +version = "0.9.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +dependencies = [ + "indexmap 2.0.2", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[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 = "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 = "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 = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[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", +] + +[[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 = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +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 = "subsetter" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" + +[[package]] +name = "svg2pdf" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" +dependencies = [ + "image", + "miniz_oxide", + "pdf-writer", + "usvg", +] + +[[package]] +name = "svgtypes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" +dependencies = [ + "kurbo", + "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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "unicode-xid", +] + +[[package]] +name = "syntect" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "fancy-regex", + "flate2", + "fnv", + "once_cell", + "plist", + "regex-syntax 0.7.5", + "serde", + "serde_json", + "thiserror", + "walkdir", + "yaml-rust", +] + +[[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" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[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 = "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", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[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.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 = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "tiny-skia" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.11.2", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", + "serde", + "zerovec", +] + +[[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", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys", +] + +[[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-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-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-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +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.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.2", + "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 = [ + "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.38", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[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", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typst" +version = "0.9.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=typst.ts-v0.9.0#1e987a9ebad28c4f425d7fb02ca1c98aeea28ee2" +dependencies = [ + "base64", + "bitflags 2.4.1", + "bytemuck", + "comemo", + "ecow", + "flate2", + "fontdb", + "image", + "indexmap 2.0.2", + "kurbo", + "log", + "miniz_oxide", + "once_cell", + "palette", + "pdf-writer", + "pixglyph", + "regex", + "resvg", + "roxmltree", + "rustybuzz", + "serde", + "siphasher", + "stacker", + "subsetter", + "svg2pdf", + "time", + "tiny-skia 0.11.2", + "toml", + "tracing", + "ttf-parser", + "typst-macros", + "typst-syntax", + "unicode-ident", + "unicode-math-class", + "unicode-properties", + "unicode-segmentation", + "unscanny", + "usvg", + "wasmi", + "xmlparser", + "xmlwriter", + "xmp-writer", +] + +[[package]] +name = "typst-library" +version = "0.9.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=typst.ts-v0.9.0#1e987a9ebad28c4f425d7fb02ca1c98aeea28ee2" +dependencies = [ + "az", + "chinese-number", + "ciborium", + "comemo", + "csv", + "ecow", + "hayagriva", + "hypher", + "icu_properties", + "icu_provider", + "icu_provider_adapters", + "icu_provider_blob", + "icu_segmenter", + "indexmap 2.0.2", + "kurbo", + "lipsum", + "log", + "once_cell", + "roxmltree", + "rustybuzz", + "serde_json", + "serde_yaml", + "smallvec", + "syntect", + "time", + "toml", + "tracing", + "ttf-parser", + "typed-arena", + "typst", + "unicode-bidi", + "unicode-math-class", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "typst-macros" +version = "0.9.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=typst.ts-v0.9.0#1e987a9ebad28c4f425d7fb02ca1c98aeea28ee2" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "typst-preview" +version = "0.9.1" +dependencies = [ + "anyhow", + "chrono", + "clap", + "clap_complete", + "clap_mangen", + "codespan-reporting", + "comemo", + "dirs", + "elsa", + "env_logger", + "futures", + "hyper", + "log", + "memmap2 0.7.1", + "notify", + "once_cell", + "open", + "same-file", + "serde", + "serde_json", + "siphasher", + "tiny-skia 0.10.0", + "tokio", + "tokio-tungstenite", + "typst", + "typst-library", + "typst-ts-compiler", + "typst-ts-core", + "typst-ts-svg-exporter", + "vergen", + "walkdir", +] + +[[package]] +name = "typst-syntax" +version = "0.9.0" +source = "git+https://github.com/Myriad-Dreamin/typst.git?branch=typst.ts-v0.9.0#1e987a9ebad28c4f425d7fb02ca1c98aeea28ee2" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + +[[package]] +name = "typst-ts-compiler" +version = "0.4.0-rc9" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=7871cb8e7135351951d8fe5e63eccb1883e8342e#7871cb8e7135351951d8fe5e63eccb1883e8342e" +dependencies = [ + "append-only-vec", + "base64", + "chrono", + "codespan-reporting", + "comemo", + "dirs", + "dissimilar", + "ecow", + "flate2", + "fst", + "hex", + "indexmap 2.0.2", + "instant", + "log", + "memmap2 0.9.0", + "nohash-hasher", + "notify", + "once_cell", + "parking_lot", + "pathdiff", + "reqwest", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "tar", + "tokio", + "typst", + "typst-library", + "typst-ts-core", + "typst-ts-svg-exporter", + "walkdir", +] + +[[package]] +name = "typst-ts-core" +version = "0.4.0-rc9" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=7871cb8e7135351951d8fe5e63eccb1883e8342e#7871cb8e7135351951d8fe5e63eccb1883e8342e" +dependencies = [ + "base64", + "base64-serde", + "byteorder", + "comemo", + "ecow", + "flate2", + "fxhash", + "hex", + "log", + "once_cell", + "path-clean", + "rkyv", + "rustc-hash", + "serde", + "serde_json", + "serde_with", + "sha2", + "siphasher", + "svgtypes", + "tiny-skia 0.11.2", + "tiny-skia-path 0.11.2", + "ttf-parser", + "typst", + "xmlparser", +] + +[[package]] +name = "typst-ts-svg-exporter" +version = "0.4.0-rc9" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=7871cb8e7135351951d8fe5e63eccb1883e8342e#7871cb8e7135351951d8fe5e63eccb1883e8342e" +dependencies = [ + "base64", + "comemo", + "log", + "siphasher", + "tiny-skia 0.11.2", + "typst", + "typst-ts-core", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[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-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-math-class" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" + +[[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-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +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 = "unsafe-libyaml" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + +[[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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" +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", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "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", + "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", + "tiny-skia-path 0.11.2", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8_iter" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e7dc29b3c54a2ea67ef4f953d5ec0c4085035c0ae2d325be1c0d2144bd9f16" +dependencies = [ + "anyhow", + "git2", + "rustc_version", + "rustversion", + "time", +] + +[[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.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.38", + "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.38", + "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 = "wasmi" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +dependencies = [ + "smallvec", + "spin", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + +[[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 = "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", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +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", +] + +[[package]] +name = "writeable" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[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.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +dependencies = [ + "libc", +] + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xmp-writer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" + +[[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 = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +dependencies = [ + "serde", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] diff --git a/pkgs/by-name/ty/typst-preview/package.json b/pkgs/by-name/ty/typst-preview/package.json new file mode 100644 index 0000000000000..f68c8a6b1a23f --- /dev/null +++ b/pkgs/by-name/ty/typst-preview/package.json @@ -0,0 +1,26 @@ +{ + "name": "typst-preview-frontend", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview", + "test": "vitest", + "coverage": "vitest run --coverage", + "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" + }, + "dependencies": { + "@myriaddreamin/typst-ts-renderer": "0.4.0-rc11", + "@myriaddreamin/typst.ts": "0.4.0-rc11", + "rxjs": "^7.8.1" + }, + "devDependencies": { + "typescript": "^5.0.2", + "vite": "^4.3.9", + "vite-plugin-singlefile": "^0.13.5", + "vite-plugin-wasm": "^3.2.2", + "vitest": "^0.32.2" + } +} diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix new file mode 100644 index 0000000000000..880e7288ca976 --- /dev/null +++ b/pkgs/by-name/ty/typst-preview/package.nix @@ -0,0 +1,94 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, mkYarnPackage +, fetchYarnDeps +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: + +let + # Keep the vscode "mgt19937.typst-preview" extension in sync when updating + # this package at pkgs/applications/editors/vscode/extensions/default.nix + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "Enter-tainer"; + repo = "typst-preview"; + rev = "v${version}"; + hash = "sha256-VmUcnmTe5Ngcje0SSpOY13HUIfdxBMg8KwvZ1wupCqc="; + }; + + frontendSrc = "${src}/addons/frontend"; + + frontend = mkYarnPackage { + inherit version; + pname = "typst-preview-frontend"; + src = frontendSrc; + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${frontendSrc}/yarn.lock"; + hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R deps/typst-preview-frontend/dist $out + runHook postInstall + ''; + + doDist = false; + }; +in +rustPlatform.buildRustPackage { + pname = "typst-preview"; + inherit version src; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4="; + "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk="; + "typst-ts-compiler-0.4.0-rc9" = "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + prePatch = '' + mkdir -p addons/vscode/out/frontend + cp -R ${frontend}/* addons/vscode/out/frontend/ + ''; + + meta = { + description = "Typst preview extension for VSCode"; + homepage = "https://github.com/Enter-tainer/typst-preview/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; + mainProgram = "typst-preview"; + }; +} diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 1a6f813254413..bb0a2ab0728d8 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.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-RAMQC9weEvTV44nAXjwMYv+4O5aSNNM5UOf/xBb4SBE="; + hash = "sha256-+Hh9vNVWen5ri8+Qy4pzaMrC0Laa1xMlURxEYwo4hSk="; }; - cargoHash = "sha256-ZBedAIHwbRiR9i6w0CWIiE+OJvTkmxiEihn7zLAV/Dg="; + cargoHash = "sha256-tLBWbnER5ufK3NQ6mxzqY/dmiwaPKTcPOXS68S6yXf4="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -58,6 +58,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.uiua.org/"; license = lib.licenses.mit; mainProgram = "uiua"; - maintainers = with lib.maintainers; [ cafkafk tomasajt ]; + maintainers = with lib.maintainers; [ cafkafk tomasajt defelo ]; }; } diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/by-name/us/usql/package.nix index 780be25a33b52..2faeda9b09b9b 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-SJypezOTQr+TiG/rePXxgjrspeErqj6qw9TBen41e4Q="; + hash = "sha256-XfzCJOr0lOkimUKbOW0+qFNQMmYc0DBgi+0ItmEOjwE="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-i2lH6ajRmfJHsh7nzCjt7mi3issA4kSBdG42w67pOC4="; + vendorHash = "sha256-sijt6YOp1pFNhaxLIOLH90Z5ODVbWFj/mp8Csx8n+ac="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) @@ -35,7 +35,7 @@ buildGoModule rec { "impala" ]; - # These tags and flags are copied from build-release.sh + # These tags and flags are copied from build.sh tags = [ "most" "sqlite_app_armor" @@ -46,7 +46,6 @@ buildGoModule rec { "sqlite_stat4" "sqlite_userauth" "sqlite_vtable" - "sqlite_icu" "no_adodb" ]; diff --git a/pkgs/by-name/ut/ut/package.nix b/pkgs/by-name/ut/ut/package.nix new file mode 100644 index 0000000000000..2ed2bdde444fb --- /dev/null +++ b/pkgs/by-name/ut/ut/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ut"; + version = "2.0.0"; + + cmakeFlags = [ + "-DBOOST_UT_ALLOW_CPM_USE=OFF" + ]; + + src = fetchFromGitHub { + owner = "boost-ext"; + repo = "ut"; + rev = "v${finalAttrs.version}"; + hash = "sha256-nMRhVtbnORMnZxIdrv6pvfj8/fv/buh4Y7mz0cr4p+E="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + meta = with lib; { + description = "UT: C++20 μ(micro)/Unit Testing Framework"; + homepage = "https://github.com/boost-ext/ut"; + license = licenses.boost; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = platforms.all; + }; +}) + diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index 831119e1d4710..6441c53c5f835 100755 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.125"; + version = "1.5.141"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; + hash = "sha256-N5L6k2oVXfnER7JRoX0JtzgEhb/vFMexu7hUKQhmcoE="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 21862ae9a5f90..251a16c8b6383 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-2023-10-23"; + version = "unstable-2023-11-12"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "798ebafdc8c27529217f159f8ff53edb0a8a328f"; - hash = "sha256-OVCnJEdc/DdJJCks6c2jP9wK31VSNP1NBOsJZ2SFY+0="; + rev = "86c46be310032bc6588bdc813fae1bc235fac60b"; + hash = "sha256-qyFIJORrjONwyasDvO3COUcE4VJAjZEa3QJDQ+rhwqY="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix new file mode 100644 index 0000000000000..777e192aee4a0 --- /dev/null +++ b/pkgs/by-name/va/valijson/package.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "valijson"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tristanpenman"; + repo = "valijson"; + rev = "v${version}"; + hash = "sha256-COVFBZtuTd1nyI/25feUYCurBwPlQV3qbxSSkn6aLl4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Header-only C++ library for JSON Schema validation, with support for many popular parsers"; + homepage = "https://github.com/tristanpenman/valijson"; + license = licenses.bsd2; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 0992f6612e98f..0094284f814bc 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -16,48 +16,62 @@ , moreutils , nodePackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; version = "0.4.3"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wGOyDGY0FpAVS5+MTiKrOpDyd13ng0RLGAENW5tXuR4="; }; - pnpm-deps = stdenvNoCC.mkDerivation { - pname = "${pname}-pnpm-deps"; - inherit src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; - - nativeBuildInputs = [ - jq - moreutils - nodePackages.pnpm - ]; - - # 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 - ''; + # NOTE: This requires pnpm 8.10.0 or newer + # https://github.com/pnpm/pnpm/pull/7214 + pnpmDeps = + assert lib.versionAtLeast nodePackages.pnpm.version "8.10.0"; + stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version patches ELECTRON_SKIP_BINARY_DOWNLOAD; + + nativeBuildInputs = [ + jq + moreutils + nodePackages.pnpm + ]; - dontFixup = true; - outputHashMode = "recursive"; - outputHash = { - "aarch64-linux" = "sha256-OcAQbUi+wpBAumncYxP3qtTzjyxiHL69kbQefwaeBfg="; - "x86_64-linux" = "sha256-R5/2MSH/jXHrj2x1Ap2OoOFLBLQp3Sq91o01uW8hWOw="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; + pnpmPatch = builtins.toJSON { + pnpm.supportedArchitectures = { + os = [ "linux" ]; + cpu = [ "x64" "arm64" ]; + }; + }; + + postPatch = '' + 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 = "sha256-nNXe0vSQiQTkiRqgScKlpkpG/BJc2eIY2ueAd9sk36c="; + }; nativeBuildInputs = [ copyDesktopItems @@ -76,7 +90,7 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) export STORE_PATH=$(mktemp -d) - cp -r ${pnpm-deps}/* "$STORE_PATH" + cp -Tr "$pnpmDeps" "$STORE_PATH" chmod -R +w "$STORE_PATH" pnpm config set store-dir "$STORE_PATH" @@ -137,6 +151,10 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + inherit (finalAttrs) pnpmDeps; + }; + meta = with lib; { description = "An alternate client for Discord with Vencord built-in"; homepage = "https://github.com/Vencord/Vesktop"; @@ -145,4 +163,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; }; -} +}) diff --git a/pkgs/by-name/wo/wordlists/package.nix b/pkgs/by-name/wo/wordlists/package.nix index 16106707fd96d..5edd1f5ece4e5 100644 --- a/pkgs/by-name/wo/wordlists/package.nix +++ b/pkgs/by-name/wo/wordlists/package.nix @@ -1,11 +1,8 @@ { lib -, callPackage +, symlinkJoin , nmap , rockyou -, runtimeShell , seclists -, symlinkJoin -, tree , wfuzz , lists ? [ nmap @@ -13,33 +10,39 @@ seclists wfuzz ] +, writeShellScriptBin +, tree }: +let + wordlistsCollection = symlinkJoin { + name = "wordlists-collection"; + paths = lists; -symlinkJoin rec { - pname = "wordlists"; - version = "unstable-2023-10-10"; - - name = "${pname}-${version}"; - paths = lists; + postBuild = '' + shopt -s extglob + rm -rf $out/!(share) + rm -rf $out/share/!(wordlists) + shopt -u extglob + ''; + }; - postBuild = '' - mkdir -p $out/bin + # A command to show the location of the links. + wordlistsBin = writeShellScriptBin "wordlists" '' + ${lib.getExe tree} ${wordlistsCollection}/share/wordlists + ''; + # A command for easy access to the wordlists. + wordlistsPathBin = writeShellScriptBin "wordlists_path" '' + printf "${wordlistsCollection}/share/wordlists\n" + ''; - # Create a command to show the location of the links. - cat >> $out/bin/wordlists << __EOF__ - #!${runtimeShell} - ${tree}/bin/tree ${placeholder "out"}/share/wordlists - __EOF__ - chmod +x $out/bin/wordlists +in symlinkJoin { + name = "wordlists"; - # Create a handy command for easy access to the wordlists. - # e.g.: `cat "$(wordlists_path)/rockyou.txt"`, or `ls "$(wordlists_path)/dirbuster"` - cat >> $out/bin/wordlists_path << __EOF__ - #!${runtimeShell} - printf "${placeholder "out"}/share/wordlists\n" - __EOF__ - chmod +x $out/bin/wordlists_path - ''; + paths = [ + wordlistsCollection + wordlistsBin + wordlistsPathBin + ]; meta = with lib; { description = "A collection of wordlists useful for security testing"; @@ -65,6 +68,6 @@ symlinkJoin rec { If you want to add a new package that provides wordlist/s the convention is to copy it to {file}`$out/share/wordlists/myNewWordlist`. ''; - maintainers = with maintainers; [ janik pamplemousse ]; + maintainers = with maintainers; [ janik pamplemousse h7x4 ]; }; } diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index 1ec3b6905a657..2f4af30ff304d 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -24,19 +24,21 @@ , perlPackages , pkg-config , systemd -, forceInstallAllHacks ? false +, forceInstallAllHacks ? true , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation (finalAttrs: { pname = "xscreensaver"; - version = "6.06"; + version = "6.08"; src = fetchurl { url = "https://www.jwz.org/xscreensaver/xscreensaver-${finalAttrs.version}.tar.gz"; - hash = "sha256-9TT6uFqDbeW4vo6R/CG4DKfWpO2ThuviB9S+ek50mac="; + hash = "sha256-XPUrpSXO7PlLLyvWNIXr3zGOEvzA8q2tfUwQbYVedqM="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ intltool makeWrapper @@ -65,7 +67,13 @@ stdenv.mkDerivation (finalAttrs: { perlPackages.MozillaCA perlPackages.perl ] - ++ lib.optional withSystemd systemd; + ++ lib.optionals withSystemd [ systemd ]; + + postPatch = '' + pushd hacks + patchShebangs check-configs.pl munge-ad.pl xml2man.pl + popd + ''; preConfigure = '' # Fix installation paths for GTK resources. diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 3845e65fecc5d..abdbdbc2e7965 100644 --- a/pkgs/by-name/yg/yggdrasil/package.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-JeeOT3fb+4+eUyWl7rAXa5+Yf1XCT20xJeCdhBC0oeo="; + sha256 = "sha256-+E8CJs6m6iyMQNIqBbKLg8ghZR0FIuY5D1iDoUlaDyo="; }; - vendorHash = "sha256-yu725RgKDRmpNFNuffBFKZjZOFyzt00kKGuz696JHk0="; + vendorHash = "sha256-FXlIrsl3fbWpEpwrY5moaJI0H0yXtrTQhHFu+ktWRVM="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/common-updater/nix-update.nix index 269e1b6e64553..342b1677c6de8 100644 --- a/pkgs/common-updater/nix-update.nix +++ b/pkgs/common-updater/nix-update.nix @@ -4,4 +4,4 @@ , extraArgs ? [ ] }: -[ "${nix-update}/bin/nix-update" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index 59957bb7005d1..606b0f0161c2a 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "annapurna-sil"; - version = "1.204"; + version = "2.000"; src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; - hash = "sha256-4ya3Iydrz5Pvol9sTDIe9ZW5k3+XQp8GB2LAnRpeiXs="; + hash = "sha256-tvh1E9uGCikJgjmbn28gD7rUgBdKjtvdwgoRIeccGq8="; }; installPhase = '' diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index 4f3ab7eb013a0..5e8195211b05c 100644 --- a/pkgs/data/fonts/curie/default.nix +++ b/pkgs/data/fonts/curie/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/curie"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 41926ac1b6795..2ccb44d45d2ea 100644 --- a/pkgs/data/fonts/edwin/default.nix +++ b/pkgs/data/fonts/edwin/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/MuseScoreFonts/Edwin"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 04f89b6d2a1f3..6993a1641de56 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -136,7 +136,6 @@ buildNpmPackage rec { license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ - jfrankenau ttuegel babariviere rileyinman diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 88ef4e588c776..919d77f10f4f5 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.200"; + version = "2.203"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; + hash = "sha256-RG12veiZXqjfK2gONmauhGReuLEkqxbQ4h4PEwaih/U="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 86565615534c6..fee51ebacf4a9 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -160,8 +160,8 @@ rec { noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; - version = "2.001"; - sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg="; + version = "2.002"; + sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; }; noto-fonts-color-emoji = diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index 6a628174f2e4f..3f76820979422 100644 --- a/pkgs/data/fonts/open-fonts/default.nix +++ b/pkgs/data/fonts/open-fonts/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kiwi0fruit/open-fonts"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index 1f946ecb17af9..1b57c9f286d3d 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -26,6 +26,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/scientifica"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index f01c50b426088..d0571fae0bfda 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sil-abyssinica"; - version = "2.200"; + version = "2.201"; src = fetchzip { url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + hash = "sha256-DJWp3T9uBLnztSq9r5YCSWaBjIK/0Aljg1IiU0FLrdE="; }; installPhase = '' diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index a8aba0c1fb232..7f2e9a1b158b4 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.03"; + version = "15.1.04"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-DGRIxE0HDX/cx7mQMBmGgRrbbj7fzWDAOMlhZM1/EEw="; + hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-/fogZ8mkOz/4YFZVxU3tTZfYwZw7zGizoQ3yQkF+aME="; + hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 8147db6e10863..e7820a85842c2 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.03"; + version = "15.1.04"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-IZM+21ipmDHoiHYfKQdoguLWN9KC9FlHsNbqOcXDBFQ="; + hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA="; }; dontUnpack = true; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index be53cafa434a5..1de1411cb754d 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -41,6 +41,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ romildo fortuneteller2k ]; + maintainers = with maintainers; [ romildo moni ]; }; } diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix index 5afd2fe228f6a..82742723806f5 100644 --- a/pkgs/data/icons/phinger-cursors/default.nix +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/phinger-cursors"; platforms = platforms.unix; license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix index bff4bb703a4ec..17a6d31b8a567 100644 --- a/pkgs/data/icons/tau-hydrogen/default.nix +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-rfgSNytPCVCkAJ9N3kRw9mfcXr+JEqy1jyyDgXqxtsM="; + hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index b344ca0d4aad0..c7ca80ccb0081 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20231012"; + version = "20231112"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-KXmHaoIZ01M6Nu2LlVgTZarUp+5VPpLfnkc7d/Xl4z0="; + sha256 = "sha256-CTygf2/CbxNO/9e8OfxeGZFaSrKXdlQdvUgywZX1U9o="; }; dontUnpack = true; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index cbfd42dfc874e..15eac7a7168a9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "49d09494dd24eae895fe1260e2c26157f740e451", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", - "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", - "msg": "Update from Hackage at 2023-10-21T19:49:07Z" + "commit": "f4111a737432472002a38495b14b930255705d6a", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f4111a737432472002a38495b14b930255705d6a.tar.gz", + "sha256": "0q1nhk821fdwxmidsd9mnd77ml4c05f7rnmd80g4s876s65ldi5q", + "msg": "Update from Hackage at 2023-11-10T11:27:19Z" } diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 197793db6c66f..8de13f2eaf368 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "dev" ]; @@ -23,9 +23,15 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; + sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; }; + patches = [ + # Submitted upstream at + # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 + ./fix-clang-warnings.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch new file mode 100644 index 0000000000000..2d185549c4e6b --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 1780c44..7998a51 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba06..4ca6d06 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 40cce28dc5d29..bc4aaf72ae9e6 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 = "20231031055637"; + version = "20231118232758"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k="; + hash = "sha256-m4B1O8h6lRxArEyuE4XUF9eJtoBhl59QNXkVjWKx2ko="; }; vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index 203b260e251b6..e8dd692eb6e47 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-2023-10-26"; + version = "unstable-2023-11-07"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928"; - hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0="; + rev = "808b81b2e88884e8eca5d951b89f54983fa6c237"; + hash = "sha256-g5tM6VBPLXin5s7X0PpzWOOGTEwHpVUurWOPqM/O13A="; }; dontConfigure = true; diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index 6b56064b87349..71e7fb9a28632 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -23,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-08-12"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; + hash = "sha256-NxIWH3qLW8sEguovAv9wfgnlnmPlTipRJTmMo3rSHNY="; }; nativeBuildInputs = [ @@ -64,8 +63,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; - meta = with lib; { description = "A modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 9547e35438908..c18d55db5b448 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.991"; + version = "0.994"; srcs = [ (fetchurl { url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm"; + hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip"; - sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip"; - sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy"; + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; + hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; }) ]; @@ -24,15 +20,17 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a OneStepBack* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/data/themes/utterly-nord-plasma/default.nix new file mode 100644 index 0000000000000..4fbb0f5b8a837 --- /dev/null +++ b/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, kdeclarative +, kirigami2 +, plasma-framework +, plasma-workspace +}: + +stdenv.mkDerivation rec { + pname = "utterly-nord-plasma"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0"; + hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8="; + }; + + propagatedUserEnvPkgs = [ + breeze-icons + kdeclarative.bin + kirigami2 + plasma-framework.bin + plasma-workspace + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} + + cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + + cp -a *.colors $out/share/color-schemes/ + + cp -a wallpaper $out/share/wallpapers/Utterly-Nord + + cp -a kvantum $out/share/Kvantum/Utterly-Nord + cp -a kvantum-solid $out/share/Kvantum/Utterly-Nord-Solid + cp -a kvantum-light $out/share/Kvantum/Utterly-Nord-Light + cp -a kvantum-light-solid $out/share/Kvantum/Utterly-Nord-Light-Solid + + cp -a *.colorscheme $out/share/konsole/ + + cp -a sddm $out/share/sddm/themes/Utterly-Nord + + runHook postInstall + ''; + + meta = with lib; { + description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; + homepage = "https://himdek.com/Utterly-Nord-Plasma/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/data/themes/utterly-round-plasma-style/default.nix new file mode 100644 index 0000000000000..40bdb2f71d887 --- /dev/null +++ b/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "utterly-round-plasma-style"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "c3677d5223286f69871f6745cdb3b71367229d40"; + hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme} + + cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark + cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid + cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light + cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid + + cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round + cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid + + runHook postInstall + ''; + + meta = with lib; { + description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme"; + homepage = "https://himdek.com/Utterly-Round-Plasma-Style/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 93802c6b88746..1490b5db79d72 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k amaxine ]; + maintainers = with maintainers; [ moni amaxine ]; }; } diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 6a4fac1261567..1a46c693b0278 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchgit , SDL2 , cmake , espeak @@ -21,18 +20,16 @@ , libXfixes , libdrm , libffi +, libjpeg , libusb1 , libuvc , libvlc , libvncserver , libxcb , libxkbcommon -, lua5_1 -, luajit , makeWrapper , mesa , mupdf -, ninja , openal , openjpeg , pcre2 @@ -121,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { libXfixes libdrm libffi + libjpeg libusb1 libuvc libvlc @@ -128,9 +126,9 @@ stdenv.mkDerivation (finalAttrs: { libxcb libxkbcommon mesa - mupdf.dev + mupdf openal - openjpeg.dev + openjpeg pcre2 sqlite tesseract diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 299319a0687ab..6c02844c0ad50 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.11"; + version = "6.0.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OdKEskxrzFo4VOsR2+rsH3G63uqMmsBuXufayHWSQac="; + hash = "sha256-17loD7FNy5PwSxIyXk313yiMxO10rOeP94q08tm76gw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 274c81bfce96b..4fb99cfb80ae3 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild addToSearchPath GOPATH "${go-lib}/share/gocode" - make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath} + make ARCH=${stdenv.hostPlatform.linuxArch} -C go/src/${goPackagePath} runHook postBuild ''; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index c471417d61650..bb658fcd4489f 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -17,8 +17,6 @@ , libadwaita , librsvg , rustc -, rust -, writeText , cargo }: @@ -60,16 +58,6 @@ stdenv.mkDerivation rec { librsvg ]; - mesonFlags = - let - # ERROR: 'rust' compiler binary not defined in cross or native file - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in - lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index faf44e50e0fcf..3803a88ce1912 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -14,10 +14,10 @@ }: gsmakeDerivation rec { pname = "gnustep-base"; - version = "1.28.0"; + version = "1.29.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; + hash = "sha256-4fjdsLBsYEDxLOFrq17dKii2sLKvOaFCu0cw3qQtM5U="; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkg-config ]; @@ -46,6 +46,12 @@ gsmakeDerivation rec { url = "https://github.com/gnustep/libs-base/commit/37913d006d96a6bdcb963f4ca4889888dcce6094.patch"; sha256 = "PyOmzRIirSKG5SQY+UwD6moCidPb8PXCx3aFgfwxsXE="; }) + # https://github.com/gnustep/libs-base/pull/334 + (fetchpatch { + url = "https://github.com/gnustep/libs-base/commit/b4feee311f2beaf499a5742967213f523de30f16.patch"; + excludes = [ "ChangeLog" ]; + hash = "sha256-r0qpxjpEM6y+F/gju6JhpDNxnFJNHFG/mt3NmC1hWrs="; + }) ]; meta = { diff --git a/pkgs/desktops/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh index 736635ab50269..79ead3f7b7295 100644 --- a/pkgs/desktops/gnustep/make/builder.sh +++ b/pkgs/desktops/gnustep/make/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup providedPreConfigure="$preConfigure"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index f53c4ea05f8d1..ab23fc36da838 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -47,5 +47,6 @@ mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.lxqt.members; + mainProgram = "lxqt-openssh-askpass"; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index c297ec27a3a97..f2946f4992028 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, fetchpatch , nix-update-script , gettext , meson @@ -12,24 +11,15 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-ZR0FJ8DkPlO1Zatvxv3NghAVBPo2j+1m0k4C+gvYPVA="; + sha256 = "sha256-KrpeDQH43n7seeSPVYKETxy1g0JuUowZerjgktLQg/4="; }; - patches = [ - # Headerbars: fix missing default-decoration - # https://github.com/elementary/stylesheet/pull/1258 - (fetchpatch { - url = "https://github.com/elementary/stylesheet/commit/9cea2383bec8f90d25f1e9b854b5221737487521.patch"; - sha256 = "sha256-6komROS4+nxwoGoKoiDmnrTfLNZAvnTU6hIEOQQfmxc="; - }) - ]; - nativeBuildInputs = [ gettext meson diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix index 0904fbe2579f0..5abffc0cc6778 100644 --- a/pkgs/desktops/pantheon/granite/7/default.nix +++ b/pkgs/desktops/pantheon/granite/7/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.3.0"; + version = "7.4.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-siFS8BiHVlDtM5odL0Lf1aRMoG6qqQOnbsXGKVyc218="; + sha256 = "sha256-z/6GxWfbsngySv2ziNwzhcEfTamxP1DnJ2ld9fft/1U="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index b9d3dd80a23ce..2c2600845b246 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -8,7 +8,6 @@ , flatpak , fwupd , ostree -, packagekit-qt , pcre , util-linux , qtquickcontrols2 @@ -42,7 +41,6 @@ mkDerivation { flatpak fwupd ostree - packagekit-qt pcre util-linux qtquickcontrols2 diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 9475ed35f889e..167ffa0b5cc87 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.17.3"; + version = "0.17.10"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-E+tlnkwJiyG8x29um/G7OqIDCJ/laDMTm3z7VvdWy6s="; + hash = "sha256-LUAYfR6MNNGLaqv8EBx0JQ8KYYD7jRvez3HJFnczV+Y="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-ltSYZYsXWiq5ASvRmR7ETgK9e8bj4f9bhZAZEIceLkw="; + hash = "sha256-MVGYENy6/xI/ph/X0DxquigCuLK1FAEIONzoQU7TXoM="; }; # elixir-ls is an umbrella app diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 7ea0a40d37484..31ec97942e524 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/development/compilers/bfc/default.nix index f84026d443f2b..2ebf02b18138f 100644 --- a/pkgs/development/compilers/bfc/default.nix +++ b/pkgs/development/compilers/bfc/default.nix @@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec { env = { LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; # process didn't exit successfully: <...> SIGSEGV diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 5a139fb290647..dcadf054bc30f 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "114"; + version = "116"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-bzHNIQy0AN8mIFGG+638p/MBSqlkWuaOzKGSsMDAPH4="; + hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index f33e594b7e250..29cf5b115b300 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # There is not enough space in the load command to accomodate a full path to the store, + # so use `@executable_path` to specify a relative path to chicken’s lib folder. + sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ + -i Makefile.macosx + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin @@ -31,7 +38,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" - "POSTINSTALL_PROGRAM=install_name_tool" + "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index cb56eabc5d781..78535382a7ca5 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 129388005b5ad..4c4f69bc74ff2 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.58.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; + sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 02fff2b3d9b38..39dfa67d23e4e 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230802"; + version = "20231112"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; + sha256 = "sha256-oH1/QZX8cF9sZikP5XpNdfsMepJrgW+uX0OGHhJVbmw="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index b72d418a97dcd..9ae727f937674 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -274,6 +274,17 @@ in lib.makeScope pkgs.newScope (self: with self; { } ); + elm-land = nodePkgs."elm-land".overrideAttrs ( + old: { + meta = with lib; nodePkgs."elm-land".meta // { + description = "A production-ready framework for building Elm applications."; + homepage = "https://elm.land/"; + license = licenses.bsd3; + maintainers = [ maintainers.zupo ]; + }; + } + ); + lamdera = callPackage ./packages/lamdera.nix {}; elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index b6110ac4db992..c825c6c663495 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 30b2662ba4908..8112b01bc9e81 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -3,6 +3,7 @@ "elm-coverage", "elm-doc-preview", "@elm-tooling/elm-language-server", + "elm-land", "elm-live", "elm-spa", "elm-test", diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 5bf0474e66faa..bfc0fcdf7bdb2 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@babel/cli-7.12.10" = { @@ -1399,6 +1399,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1642,13 +1705,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.8.9" = { + "@types/node-20.8.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.9"; + version = "20.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz"; - sha512 = "UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; + sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; }; }; "@types/node-8.10.66" = { @@ -1957,13 +2020,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.11.0" = { + "acorn-8.11.2" = { name = "acorn"; packageName = "acorn"; - version = "8.11.0"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.0.tgz"; - sha512 = "hNiSyky+cuYVALBrsjB7f9gMN9P4u09JyAiMNMLaVfsmkDJuH84M1T/0pfDX/OJfGWcobd2A7ecXYzygn8wibA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz"; + sha512 = "nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="; }; }; "address-1.0.3" = { @@ -3190,13 +3253,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001554" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001554"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz"; - sha512 = "A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3946,13 +4009,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.33.1" = { + "core-js-compat-3.33.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.1"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz"; - sha512 = "6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz"; + sha512 = "axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw=="; }; }; "core-util-is-1.0.2" = { @@ -4810,13 +4873,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.567" = { + "electron-to-chromium-1.4.576" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.567"; + version = "1.4.576"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz"; - sha512 = "8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz"; + sha512 = "yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA=="; }; }; "elliptic-6.5.4" = { @@ -7204,15 +7267,6 @@ let sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - }; "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -7330,15 +7384,6 @@ let sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; }; }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; - }; - }; "is-data-descriptor-1.0.1" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -7357,22 +7402,22 @@ let sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; - "is-descriptor-0.1.6" = { + "is-descriptor-0.1.7" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz"; + sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="; }; }; - "is-descriptor-1.0.2" = { + "is-descriptor-1.0.3" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz"; + sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="; }; }; "is-directory-0.3.1" = { @@ -8122,15 +8167,6 @@ let sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - }; "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; @@ -10957,13 +10993,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.3.0" = { + "punycode-2.3.1" = { name = "punycode"; packageName = "punycode"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"; + sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; "q-1.5.1" = { @@ -12928,13 +12964,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "sudo-prompt-8.2.5" = { @@ -13108,13 +13144,22 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.22.0" = { + "terser-5.15.1" = { name = "terser"; packageName = "terser"; - version = "5.22.0"; + version = "5.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz"; - sha512 = "hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; + sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; + }; + }; + "terser-5.24.0" = { + name = "terser"; + packageName = "terser"; + version = "5.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz"; + sha512 = "ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw=="; }; }; "terser-5.3.8" = { @@ -13549,6 +13594,15 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typescript-4.9.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz"; + sha512 = "CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA=="; + }; + }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -13720,13 +13774,13 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-2.0.0" = { + "universalify-2.0.1" = { name = "universalify"; packageName = "universalify"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"; + sha512 = "gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="; }; }; "unpipe-1.0.0" = { @@ -13990,6 +14044,15 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; + "vite-4.3.9" = { + name = "vite"; + packageName = "vite"; + version = "4.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; + sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + }; + }; "vite-4.5.0" = { name = "vite"; packageName = "vite"; @@ -14880,7 +14943,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -15118,7 +15181,7 @@ in sources."picomatch-2.3.1" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -15471,6 +15534,148 @@ in bypassCache = true; reconstructLock = true; }; + elm-land = nodeEnv.buildNodePackage { + name = "elm-land"; + packageName = "elm-land"; + version = "0.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.4.tgz"; + sha512 = "ruspCQ7s+ZOSILEJ8psXuQMb4ASGfgXCqmMjiLIyV7oX42nSpQGYADTXwiAwo+E7ESev1TWspn/DkAxsuDo6Qg=="; + }; + dependencies = [ + sources."@adobe/css-tools-4.3.1" + sources."@esbuild/android-arm-0.17.19" + sources."@esbuild/android-arm64-0.17.19" + sources."@esbuild/android-x64-0.17.19" + sources."@esbuild/darwin-arm64-0.17.19" + sources."@esbuild/darwin-x64-0.17.19" + sources."@esbuild/freebsd-arm64-0.17.19" + sources."@esbuild/freebsd-x64-0.17.19" + sources."@esbuild/linux-arm-0.17.19" + sources."@esbuild/linux-arm64-0.17.19" + sources."@esbuild/linux-ia32-0.17.19" + sources."@esbuild/linux-loong64-0.17.19" + sources."@esbuild/linux-mips64el-0.17.19" + sources."@esbuild/linux-ppc64-0.17.19" + sources."@esbuild/linux-riscv64-0.17.19" + sources."@esbuild/linux-s390x-0.17.19" + sources."@esbuild/linux-x64-0.17.19" + sources."@esbuild/netbsd-x64-0.17.19" + sources."@esbuild/openbsd-x64-0.17.19" + sources."@esbuild/sunos-x64-0.17.19" + sources."@esbuild/win32-arm64-0.17.19" + sources."@esbuild/win32-ia32-0.17.19" + sources."@esbuild/win32-x64-0.17.19" + sources."@jridgewell/gen-mapping-0.3.3" + sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/source-map-0.3.5" + sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."anymatch-3.1.3" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-from-1.1.2" + sources."chokidar-3.5.3" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."copy-anything-2.0.6" + sources."cross-spawn-6.0.5" + sources."debug-3.2.7" + sources."errno-0.1.8" + sources."esbuild-0.17.19" + sources."fill-range-7.0.1" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.3" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.11" + sources."iconv-lite-0.6.3" + sources."image-size-0.5.5" + sources."immutable-4.3.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."is-what-3.14.1" + sources."isexe-2.0.0" + sources."less-4.2.0" + sources."lodash-4.17.21" + sources."make-dir-2.1.0" + sources."mime-1.6.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."mkdirp-0.5.6" + sources."ms-2.1.3" + sources."nanoid-3.3.6" + sources."needle-3.2.0" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parse-node-version-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."postcss-8.4.31" + sources."prr-1.0.1" + sources."readdirp-3.6.0" + sources."rimraf-2.6.3" + sources."rollup-3.29.4" + sources."safer-buffer-2.1.2" + sources."sass-1.69.5" + sources."sax-1.3.0" + sources."semver-5.7.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + (sources."stylus-0.61.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + sources."source-map-0.7.4" + ]; + }) + sources."sugarss-4.0.1" + sources."temp-0.9.4" + sources."terser-5.15.1" + sources."to-regex-range-5.0.1" + sources."tslib-2.6.2" + sources."typescript-4.9.3" + sources."undici-types-5.26.5" + sources."vite-4.3.9" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Reliable web apps for everyone"; + homepage = "https://elm.land"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; @@ -15756,7 +15961,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" @@ -15920,7 +16125,7 @@ in (sources."fs-extra-11.1.1" // { dependencies = [ sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."fs-minipass-1.2.7" @@ -15984,7 +16189,7 @@ in sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -16264,7 +16469,7 @@ in sources."@types/http-proxy-1.17.13" sources."@types/json-schema-7.0.14" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/parse-json-4.0.1" sources."@types/q-1.5.7" sources."@types/source-list-map-0.1.4" @@ -16435,7 +16640,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001561" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16455,18 +16660,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."clean-css-4.2.4" // { @@ -16534,7 +16728,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.33.1" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16659,7 +16853,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.576" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -16732,18 +16926,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -16987,7 +17170,7 @@ in sources."is-core-module-2.13.1" sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" + sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -17144,13 +17327,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -17520,7 +17697,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -17696,18 +17873,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -17764,18 +17930,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -18231,7 +18386,7 @@ in sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; }; dependencies = [ - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@esbuild/android-arm-0.17.19" sources."@esbuild/android-arm64-0.17.19" sources."@esbuild/android-x64-0.17.19" @@ -18284,7 +18439,7 @@ in sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.11.0" + sources."acorn-8.11.2" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" @@ -18593,7 +18748,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" @@ -18671,11 +18826,10 @@ in sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -18692,7 +18846,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -18707,7 +18861,7 @@ in sources."undici-types-5.26.5" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" @@ -18737,7 +18891,7 @@ in sources."@esbuild/win32-arm64-0.18.20" sources."@esbuild/win32-ia32-0.18.20" sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."esbuild-0.18.20" ]; }) @@ -18789,7 +18943,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" @@ -18938,7 +19092,7 @@ in sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 37ccb5f1a02bb..436fda2a05217 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.45"; + version = "3.1.47"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; + npmDepsHash = "sha256-Qft+//za5ed6Oquxtcdpv7g5oOc2WmWuRJ/CDe+FEiI="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; + hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI="; rev = version; }; @@ -85,6 +85,9 @@ stdenv.mkDerivation rec { cp -r . $appdir chmod -R +w $appdir + mkdir -p $appdir/node_modules + cp -r ${nodeModules}/* $appdir/node_modules + mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 27e32df06312d..6d052179ebd85 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-J8Zw79TXYpDfnsx6UgB4sqY1vdwVHildqtCcXlBvUxQ="; + hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg="; }; - cargoHash = "sha256-4FhD9MvAhP88WGqVIUG2JHxd/gbDYf++bdlS6lVW0xs="; + cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch b/pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch index 068d7c09b686d..10f812e3814a8 100644 --- a/pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch +++ b/pkgs/development/compilers/factor-lang/adjust-paths-in-unit-tests.patch @@ -8,17 +8,17 @@ Subject: [PATCH] adjust unit test for finding executables in path for NixOS 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/io/standard-paths/unix/unix-tests.factor b/basis/io/standard-paths/unix/unix-tests.factor -index 986c0564d2..f0772fdcc9 100644 +index acd5029..870537f 100644 --- a/basis/io/standard-paths/unix/unix-tests.factor +++ b/basis/io/standard-paths/unix/unix-tests.factor -@@ -5,12 +5,12 @@ sequences tools.test ; - +@@ -5,13 +5,13 @@ sequences tools.test ; + { f } [ "" find-in-path ] unit-test { t } [ - "ls" find-in-path { "/bin/ls" "/usr/bin/ls" } member? + "ls" find-in-path not not ] unit-test - + { t } [ "/sbin:" "PATH" os-env append "PATH" [ "ps" find-in-path @@ -26,6 +26,3 @@ index 986c0564d2..f0772fdcc9 100644 + not not ] with-os-env ] unit-test --- -2.19.2 - diff --git a/pkgs/development/compilers/factor-lang/factor98.nix b/pkgs/development/compilers/factor-lang/factor99.nix index 104290684a506..85ff98a28ba1a 100644 --- a/pkgs/development/compilers/factor-lang/factor98.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -83,8 +83,8 @@ let ${wrapFactorScript { from = "./factor"; inherit runtimeLibs; }} ln -sf factor.image .factor-wrapped.image ''; - rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; - version = "0.98"; + rev = "e10b64dbc53a8583098e73580a1eb9ff4ce0c709"; + version = "0.99"; in stdenv.mkDerivation { @@ -93,12 +93,12 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.factorcode.org/releases/${version}/factor-src-${version}.zip"; - sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri"; + sha256 = "f5626bb3119bd77de9ac3392fdbe188bffc26557fab3ea34f7ca21e372a8443e"; }; patches = [ - ./staging-command-line-0.98-pre.patch - ./workdir-0.98-pre.patch + ./staging-command-line-0.99-pre.patch + ./workdir-0.99-pre.patch ./adjust-paths-in-unit-tests.patch ]; diff --git a/pkgs/development/compilers/factor-lang/scope.nix b/pkgs/development/compilers/factor-lang/scope.nix index 02f0f88963418..af0d7af1293f1 100644 --- a/pkgs/development/compilers/factor-lang/scope.nix +++ b/pkgs/development/compilers/factor-lang/scope.nix @@ -5,7 +5,7 @@ let inside = (self: let callPackage = pkgs.newScope self; in rec { - interpreter = callPackage ./factor98.nix { inherit (pkgs) stdenv; }; + interpreter = callPackage ./factor99.nix { inherit (pkgs) stdenv; }; # Convenience access for using the returned attribute the same way as the # interpreter derivation. Takes a list of runtime libraries as its only diff --git a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch b/pkgs/development/compilers/factor-lang/staging-command-line-0.99-pre.patch index 57fc657ddcf30..a9631664a35d9 100644 --- a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch +++ b/pkgs/development/compilers/factor-lang/staging-command-line-0.99-pre.patch @@ -1,10 +1,10 @@ diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor -index ec86089dbe..b146168ec9 100644 +index cfcca0d..87a2b01 100644 --- a/basis/tools/deploy/backend/backend.factor +++ b/basis/tools/deploy/backend/backend.factor -@@ -69,7 +69,7 @@ ERROR: can't-deploy-library-file library ; +@@ -72,7 +72,7 @@ ERROR: can't-deploy-library-file library ; [ staging-image-name "-output-image=" prepend , ] - [ " " join "-include=" prepend , ] bi + [ join-words "-include=" prepend , ] bi ] [ - input-image-name "-i=" prepend , + input-image-name resource-path "-i=" prepend , diff --git a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch b/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch deleted file mode 100644 index f1498743dd675..0000000000000 --- a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor -index 2d382e49d1..d4d9228d6c 100644 ---- a/core/io/pathnames/pathnames.factor -+++ b/core/io/pathnames/pathnames.factor -@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath ) - GENERIC: absolute-path ( path -- path' ) - - M: string absolute-path -- "resource:" ?head [ -+ "resource:work" ?head [ -+ trim-head-separators "/var/lib/factor" prepend-path -+ absolute-path ] -+ [ "resource:" ?head [ - trim-head-separators resource-path - absolute-path - ] [ -@@ -158,6 +161,7 @@ M: string absolute-path - ] [ - current-directory get prepend-path - ] if ] if -+ ] if - ] if ; - - M: object normalize-path ( path -- path' ) diff --git a/pkgs/development/compilers/factor-lang/workdir-0.99-pre.patch b/pkgs/development/compilers/factor-lang/workdir-0.99-pre.patch new file mode 100644 index 0000000000000..f1e7a5920627b --- /dev/null +++ b/pkgs/development/compilers/factor-lang/workdir-0.99-pre.patch @@ -0,0 +1,13 @@ +diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor +index a172fe4..40858bc 100644 +--- a/core/io/pathnames/pathnames.factor ++++ b/core/io/pathnames/pathnames.factor +@@ -166,6 +166,8 @@ GENERIC: absolute-path ( path -- path' ) + + M: string absolute-path + { ++ { [ "resource:work" ?head ] ++ [ trim-head-separators "/var/lib/factor" prepend-path absolute-path ] } + { [ "resource:" ?head ] [ trim-head-separators resource-path absolute-path ] } + { [ "vocab:" ?head ] [ trim-head-separators vocab-path absolute-path ] } + { [ "~" ?head ] [ trim-head-separators home prepend-path absolute-path ] } diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index 39db0518281da..8a8600f1f639f 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index c471378c275f5..568c3094107a3 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 0fe23000cc900..01f1725130803 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -108,8 +108,8 @@ let inherit version; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; - stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + stageNameAddon = optionalString withoutTargetLibc "-nolibc"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; javaAwtGtk = langJava && x11Support; xlibs = [ diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000000..d938d67a2d068 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,85 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -60,6 +60,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename) + if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) + break; + if (!map) +- return filename; ++ { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ return s; ++ } ++ } ++ return filename; ++ } + name = filename + map->old_len; + name_len = strlen (name) + 1; + +@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (dwarf2out.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 0000000000000..57ae2111f020a --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,84 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -69,6 +69,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename) + break; + if (!map) + { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = realname ? realname : filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ if (realname != filename) ++ free (const_cast <char *> (realname)); ++ return s; ++ } ++ } + if (realname != filename) + free (const_cast <char *> (realname)); + return filename; +@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + + diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 15880913bde1a..c4b0dbf91b665 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -63,8 +63,8 @@ in ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ ({ - "13" = [ ./13/no-sys-dirs-riscv.patch ]; - "12" = [ ./no-sys-dirs-riscv.patch ]; + "13" = [ ./13/no-sys-dirs-riscv.patch ./13/mangle-NIX_STORE-in-__FILE__.patch ]; + "12" = [ ./no-sys-dirs-riscv.patch ./12/mangle-NIX_STORE-in-__FILE__.patch ]; "11" = [ ./no-sys-dirs-riscv.patch ]; "10" = [ ./no-sys-dirs-riscv.patch ]; "9" = [ ./no-sys-dirs-riscv-gcc9.patch ]; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index f5f0c93171476..92ed154a02ba4 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 6aa87a152015e..97539cd54321e 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index c5aa5897761e9..a54894bda9527 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 651ff1e7d44b9..5079578239eac 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index 74c0088473b85..3db1320366523 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 973e62f955396..499f463e801a4 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -194,6 +194,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index 3c51fb981afdc..3d7852ec701e7 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -205,6 +205,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 87ce19f66054b..7dc90444d0085 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -205,6 +205,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index fa184a6fe1716..7a06d124dfdbe 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -205,6 +205,8 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 91032cb03d6ec..522eab95794f3 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -205,6 +205,9 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index 3b0bef212a068..affebd95763e3 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -198,6 +198,9 @@ stdenv.mkDerivation (rec { sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch + # Work around a type not being defined when including Rts.h in bytestring's cbits # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. ./9.4.6-bytestring-posix-source.patch diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix index 48cec53e3b18c..705b85fb1159e 100644 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -197,6 +197,9 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.8.nix b/pkgs/development/compilers/ghc/9.4.8.nix new file mode 100644 index 0000000000000..e915c549dc62f --- /dev/null +++ b/pkgs/development/compilers/ghc/9.4.8.nix @@ -0,0 +1,391 @@ +# DO NOT port this expression to hadrian. It is not possible to build a GHC +# cross compiler with 9.4.* and hadrian. +{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, xattr, autoSignDarwinBinariesHook +, bash + +, libiconv ? null, ncurses +, glibcLocales ? null + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !(stdenv.targetPlatform.isx86 + || stdenv.targetPlatform.isPower + || stdenv.targetPlatform.isSparc + || stdenv.targetPlatform.isAarch64) +, # LLVM is conceptually a run-time-only dependency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildTargetLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, enableProfiledLibs ? true + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.8"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0bf407eb67fe3e3c24b0f4c8dea8cb63e07f63ca0f76cf2058565143507ab85e"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [ + # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs + # Can be removed if the Cabal library included with ghc backports the linked fix + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/6c796218c92f93c95e94d5ec2d077f6956f68e98.patch"; + stripLen = 1; + extraPrefix = "libraries/Cabal/"; + sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; + }) + + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + ./docs-sphinx-7.patch + ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ + # Prevent the paths module from emitting symbols that we don't use + # when building with separate outputs. + # + # These cause problems as they're not eliminated by GHC's dead code + # elimination on aarch64-darwin. (see + # https://github.com/NixOS/nixpkgs/issues/140774 for details). + ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ]; + + postPatch = "patchShebangs ."; + + # GHC needs the locale configured during the Haddock phase. + LANG = "en_US.UTF-8"; + + # GHC is a bit confused on its cross terminology. + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" + '' + lib.optionalString useLLVM '' + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" + '' + '' + + echo -n "${buildMK}" > mk/build.mk + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index d2d6dade497ed..83b986be2b328 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -266,6 +266,12 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + patches = [ + # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 + (if lib.versionAtLeast version "9.8" + then ./docs-sphinx-7-ghc98.patch + else ./docs-sphinx-7.patch ) + ]; postPatch = '' patchShebangs --build . ''; diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch new file mode 100644 index 0000000000000..3fc1a0f21561d --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -28 +28 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch new file mode 100644 index 0000000000000..49fa45d1b9a23 --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -67 +67 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index bc2dfbda09f35..0f49384d6e7c1 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.32.2"; + version = "0.32.4"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1FIeH4NFyYQinqzCBZ9m2Jm6f5tLJDJxVdb4D3+fQ4w="; + hash = "sha256-xl75692d8h1uvh32pf+VJcXwQJwocxDaBNbfolHJKXU="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI="; + cargoHash = "sha256-SwG7cfoDYGyBu+1qF3+ynnw9rOA6jNExRV9uOVwgO60="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 9753a1077a639..ff55201ebd03f 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.3.1"; + version = "13.1.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; + hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 7806cf0744380..c12af4db34c56 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.3"; + version = "1.21.4"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig="; + hash = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c="; }; strictDeps = true; diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 47459664af0a5..4eef8acb06934 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,5 +1,5 @@ # -*- shell-script -*- -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup function extract diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 3f7c286d5903f..d8b8c141042bf 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.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA="; + sha256 = "sha256-NiBwQ7BzNgRdWLvjOi1fQni+vnYwn0nLHxqAVucmb2k="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index 85c0d7043efd2..04e768d0bff82 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.3"; + version = "1.9.4"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; + sha256 = "07d20c4c2518833e2265ca0acee15b355463361aa4efdab858dad826cf94325c"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; + sha256 = "541d0c5a9378f8d2fc384bb8595fc6ffe20d61054629a6e314fb2f8dfe2f2ade"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; + sha256 = "67eec264f6afc9e9bf72c0f62c84d91c2ebdfaed6a0aa11606e3c983d278b441"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; + sha256 = "67542975e86102eec95bc4bb7c30c5d8c7ea9f9a0b388f0e10f546945363b01a"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 002cca08aac56..715414e7dab9d 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; + hash = "sha256-YYQ7lkf9BtOymU8yd6ZN4ctaWlKX2TC4yOO8DpN0ACQ="; }; patches = [ diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index c4e6f2827e82b..c09ec676e9ea7 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -133,7 +133,17 @@ in stdenv.mkDerivation (rec { hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; stripLen = 1; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 10 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 863d31874ec8c..6a3b8cbabab7d 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -266,11 +266,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -281,10 +283,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -293,16 +297,22 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); }); diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index fc0d7533c9949..9b6ab0a77c2a8 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -119,9 +119,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 24dd31ea9fef8..541db8c400dea 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -271,11 +271,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -286,10 +288,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -298,17 +302,29 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ./libclc { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/compilers/llvm/16/libclc/default.nix index 9148deeee6f40..6fa0751f906be 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/compilers/llvm/16/libclc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }: +{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: stdenv.mkDerivation rec { pname = "libclc"; - version = "16.0.3"; + inherit version; - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "llvmorg-${version}"; - hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; - }; - sourceRoot = "${src.name}/libclc"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ llvm_14 ]; + buildInputs = [ llvm ]; strictDeps = true; postInstall = '' diff --git a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch index 1e5108a27c38f..1e5108a27c38f 100644 --- a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix index c387764b4f650..78cd632024cda 100644 --- a/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!headersOnly) [ cxxabi ] - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" # If we're only building the headers we don't actually *need* a functioning # C/C++ compiler: diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 04bfee14aa186..90c57dc52a2d5 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' @@ -65,7 +63,7 @@ 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 (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, @@ -74,8 +72,11 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; diff --git a/pkgs/development/compilers/llvm/16/lld/add-table-base.patch b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch new file mode 100644 index 0000000000000..15fc903a5e3f3 --- /dev/null +++ b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch @@ -0,0 +1,190 @@ +From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 +From: Sam Clegg <sbc@chromium.org> +Date: Fri, 25 Aug 2023 13:56:16 -0700 +Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting + +This is similar to `--global-base` but determines where to place the +table segments rather than that data segments. + +See https://github.com/emscripten-core/emscripten/issues/20097 + +Differential Revision: https://reviews.llvm.org/D158892 +--- + test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ + wasm/Driver.cpp | 19 ++++++++-- + wasm/Options.td | 5 ++- + wasm/Writer.cpp | 8 ----- + 4 files changed, 93 insertions(+), 11 deletions(-) + create mode 100644 test/wasm/table-base.s + +diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s +new file mode 100644 +index 000000000000000..56fff414fd31d96 +--- /dev/null ++++ b/test/wasm/table-base.s +@@ -0,0 +1,72 @@ ++# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o ++ ++# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT ++ ++# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 ++ ++.globl _start ++_start: ++ .functype _start () -> () ++ i32.const _start ++ drop ++ end_function ++ ++# CHECK-DEFAULT: - Type: TABLE ++# CHECK-DEFAULT-NEXT: Tables: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: ElemType: FUNCREF ++# CHECK-DEFAULT-NEXT: Limits: ++# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] ++# CHECK-DEFAULT-NEXT: Minimum: 0x2 ++# CHECK-DEFAULT-NEXT: Maximum: 0x2 ++ ++# CHECK-DEFAULT: - Type: GLOBAL ++# CHECK-DEFAULT-NEXT: Globals: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: true ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 66560 ++# CHECK-DEFAULT-NEXT: - Index: 1 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: false ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 1 ++ ++# CHECK-DEFAULT: - Type: EXPORT ++# CHECK-DEFAULT: - Name: __table_base ++# CHECK-DEFAULT-NEXT: Kind: GLOBAL ++# CHECK-DEFAULT-NEXT: Index: 1 ++ ++# CHECK-100: - Type: TABLE ++# CHECK-100-NEXT: Tables: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: ElemType: FUNCREF ++# CHECK-100-NEXT: Limits: ++# CHECK-100-NEXT: Flags: [ HAS_MAX ] ++# CHECK-100-NEXT: Minimum: 0x65 ++# CHECK-100-NEXT: Maximum: 0x65 ++ ++# CHECK-100: - Type: GLOBAL ++# CHECK-100-NEXT: Globals: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: true ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 66560 ++# CHECK-100-NEXT: - Index: 1 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: false ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 100 ++ ++# CHECK-100: - Type: EXPORT ++# CHECK-100: - Name: __table_base ++# CHECK-100-NEXT: Kind: GLOBAL ++# CHECK-100-NEXT: Index: 1 +diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp +index 84304881f5ca34e..c2f5f0185781f36 100644 +--- a/wasm/Driver.cpp ++++ b/wasm/Driver.cpp +@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { + + config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); + config->globalBase = args::getInteger(args, OPT_global_base, 0); ++ config->tableBase = args::getInteger(args, OPT_table_base, 0); + config->maxMemory = args::getInteger(args, OPT_max_memory, 0); + config->zStackSize = + args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); +@@ -573,6 +574,17 @@ static void setConfigs() { + if (config->exportTable) + error("-shared/-pie is incompatible with --export-table"); + config->importTable = true; ++ } else { ++ // Default table base. Defaults to 1, reserving 0 for the NULL function ++ // pointer. ++ if (!config->tableBase) ++ config->tableBase = 1; ++ // The default offset for static/global data, for when --global-base is ++ // not specified on the command line. The precise value of 1024 is ++ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that ++ // emscripten used prior to wasm-ld). ++ if (!config->globalBase && !config->relocatable && !config->stackFirst) ++ config->globalBase = 1024; + } + + if (config->relocatable) { +@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { + warn("-Bsymbolic is only meaningful when combined with -shared"); + } + +- if (config->globalBase && config->isPic) { +- error("--global-base may not be used with -shared/-pie"); ++ if (config->isPic) { ++ if (config->globalBase) ++ error("--global-base may not be used with -shared/-pie"); ++ if (config->tableBase) ++ error("--table-base may not be used with -shared/-pie"); + } + } + +diff --git a/wasm/Options.td b/wasm/Options.td +index 50417d2928e0a34..bb764396bf4df14 100644 +--- a/wasm/Options.td ++++ b/wasm/Options.td +@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, + HelpText<"Remove maximum size from function table, allowing table to grow">; + + def global_base: JJ<"global-base=">, +- HelpText<"Where to start to place global data">; ++ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; + + def import_memory: FF<"import-memory">, + HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; +@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, + def stack_first: FF<"stack-first">, + HelpText<"Place stack at start of linear memory rather than after data">; + ++def table_base: JJ<"table-base=">, ++ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; ++ + defm whole_archive: B<"whole-archive", + "Force load of all members in a static library", + "Do not force load of all members in a static library (default)">; +diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp +index f25d358dc5bae6f..0576bf2907e49c4 100644 +--- a/wasm/Writer.cpp ++++ b/wasm/Writer.cpp +@@ -358,13 +358,6 @@ void Writer::layoutMemory() { + memoryPtr = config->globalBase; + } + } else { +- if (!config->globalBase && !config->relocatable && !config->isPic) { +- // The default offset for static/global data, for when --global-base is +- // not specified on the command line. The precise value of 1024 is +- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that +- // emscripten used prior to wasm-ld). +- config->globalBase = 1024; +- } + memoryPtr = config->globalBase; + } + +@@ -1685,7 +1678,6 @@ void Writer::run() { + // For PIC code the table base is assigned dynamically by the loader. + // For non-PIC, we start at 1 so that accessing table index 0 always traps. + if (!config->isPic) { +- config->tableBase = 1; + if (WasmSym::definedTableBase) + WasmSym::definedTableBase->setVA(config->tableBase); + if (WasmSym::definedTableBase32) diff --git a/pkgs/development/compilers/llvm/16/lld/default.nix b/pkgs/development/compilers/llvm/16/lld/default.nix index cc18aee76a448..84943e8effce1 100644 --- a/pkgs/development/compilers/llvm/16/lld/default.nix +++ b/pkgs/development/compilers/llvm/16/lld/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + ./add-table-base.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch deleted file mode 100644 index 6a09c91b5132b..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 00bd60bc24bb..17416b0bd3c0 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - CmdArgs.push_back("-plugin"); -- std::string Plugin = -- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; -+ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix deleted file mode 100644 index 70ffb3e0dd19e..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 -, buildLlvmTools -, fixDarwinDylibNames -, enableManpages ? false -}: - -let - self = stdenv.mkDerivation ({ - pname = "clang"; - inherit version; - - src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake python3 ] - ++ lib.optional enableManpages python3.pkgs.sphinx - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libxml2 libllvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - ]; - - patches = [ - ../../common/clang/5-8-purity.patch - ./gnu-install-dirs.patch - (substituteAll { - src = ./LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) - ]; - - postPatch = '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - postInstall = '' - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/{clang,scan-view} - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view - rm $out/bin/c-index-test - patchShebangs $python/bin - - mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin - ''; - - passthru = { - inherit libllvm; - isClang = true; - hardeningUnsupportedFlags = [ "fortify3" ]; - }; - - meta = llvm_meta // { - homepage = "https://clang.llvm.org/"; - description = "A C language family frontend for LLVM"; - longDescription = '' - The Clang project provides a language front-end and tooling - infrastructure for languages in the C language family (C, C++, Objective - C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. - It aims to deliver amazingly fast compiles, extremely useful error and - warning messages and to provide a platform for building great source - level tools. The Clang Static Analyzer and clang-tidy are tools that - automatically find bugs in your code, and are great examples of the sort - of tools that can be built using the Clang frontend as a library to - parse C/C++ code. - ''; - mainProgram = "clang"; - }; - } // lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - buildPhase = '' - make docs-clang-man - ''; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man page for Clang ${version}"; - }; - }); -in self diff --git a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch deleted file mode 100644 index 7e6903222f45b..0000000000000 --- a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2667b1d6892e..87c5ad58738f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") -@@ -344,7 +346,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" -@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" -@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - ) - endif() - -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index e657059744a4..19da44638fe6 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -99,9 +99,9 @@ macro(add_clang_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -143,7 +143,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -160,5 +160,5 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index a621c02644e3..e140efc9c83c 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -129,13 +129,13 @@ install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${cuda_wrapper_files} - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-clang-headers -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ad990e010eef..92e52d05afb9 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt -index 04151a8e0331..13918d91c4ba 100644 ---- a/tools/clang-check/CMakeLists.txt -+++ b/tools/clang-check/CMakeLists.txt -@@ -19,4 +19,4 @@ target_link_libraries(clang-check - ) - - install(TARGETS clang-check -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index a13633eaefc4..9b0094783690 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt -index 6161d08ae587..a003292d1676 100644 ---- a/tools/clang-offload-bundler/CMakeLists.txt -+++ b/tools/clang-offload-bundler/CMakeLists.txt -@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler - ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} - ) - --install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) -+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index 771e3bdea6f0..d1396e62b28f 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -14,11 +14,11 @@ target_link_libraries(clang-rename - clangToolingRefactor - ) - --install(TARGETS clang-rename RUNTIME DESTINATION bin) -+install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 2dd670307636..1fe576f77ddb 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -121,7 +121,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index 380379300b09..adfd58ed5f7d 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(LibexecFile ${LibexecFiles}) -@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/libexec/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) -- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) -+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - endforeach() - - foreach(ManPage ${ManPages}) -@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/share/scan-build/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) -- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) -+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) - endforeach() - - add_custom_target(scan-build ALL DEPENDS ${Depends}) -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index b305ca562a72..554bcb379061 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(ShareFile ${ShareFiles}) -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/share/scan-view/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) -- install(FILES share/${ShareFile} DESTINATION share/scan-view) -+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) - endforeach() - - add_custom_target(scan-view ALL DEPENDS ${Depends}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch deleted file mode 100644 index 77bf2640c4774..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake 2017-05-25 00:53:24.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:24:24.937433155 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(X86 i386 i686) - set(X86_64 x86_64) - set(MIPS32 mips mipsel) -diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt 2017-07-13 04:33:30.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:24:45.945075423 +0900 -@@ -444,6 +444,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch deleted file mode 100644 index 8f4c76bca1eba..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} -- ) -- endif() - endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} -diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt -index 8bfc15b5c..f23d0f71a 100644 ---- a/test/asan/CMakeLists.txt -+++ b/test/asan/CMakeLists.txt -@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) - endif() - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-asan-iossim-x86_64" and similar. They also require that an extra env --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(ASAN_TEST_IOS "1") -- pythonize_bool(ASAN_TEST_IOS) -- set(ASAN_TEST_DYNAMIC True) -- -- foreach(arch ${DARWIN_iossim_ARCHS}) -- set(ASAN_TEST_IOSSIM "1") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- foreach (arch ${DARWIN_ios_ARCHS}) -- set(ASAN_TEST_IOSSIM "0") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - # Add unit tests. - if(COMPILER_RT_INCLUDE_TESTS) - set(ASAN_TEST_DYNAMIC False) -diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt -index a68908612..cde0accb5 100644 ---- a/test/tsan/CMakeLists.txt -+++ b/test/tsan/CMakeLists.txt -@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) - list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-tsan-iossim-x86_64" and similar. They also require an extra environment --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(TSAN_TEST_IOS "1") -- pythonize_bool(TSAN_TEST_IOS) -- -- set(arch "x86_64") -- set(TSAN_TEST_IOSSIM "1") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(arch "arm64") -- set(TSAN_TEST_IOSSIM "0") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - if(COMPILER_RT_INCLUDE_TESTS) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in --- -2.14.1 - diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch b/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch deleted file mode 100644 index e7abf9735b908..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/xray/xray_buffer_queue.h -+++ b/lib/xray/xray_buffer_queue.h -@@ -17,6 +17,7 @@ - - #include "sanitizer_common/sanitizer_atomic.h" - #include "sanitizer_common/sanitizer_mutex.h" -+#include <cstddef> - #include <deque> - #include <unordered_set> - #include <utility> diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix deleted file mode 100644 index fede3347e42b2..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi -, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD -}: - -let - - useLLVM = stdenv.hostPlatform.useLLVM or false; - bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; - inherit (stdenv.hostPlatform) isMusl; - -in - -stdenv.mkDerivation { - pname = "compiler-rt"; - inherit version; - src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; - - nativeBuildInputs = [ cmake python3 libllvm.dev ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - - env.NIX_CFLAGS_COMPILE = toString [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; - - cmakeFlags = [ - "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" - "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ lib.optionals (useLLVM) [ - "-DCOMPILER_RT_BUILD_BUILTINS=ON" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program - "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ lib.optionals (bareMetal) [ - "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # The compiler-rt build infrastructure sniffs supported platforms on Darwin - # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails - # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" - ]; - - outputs = [ "out" "dev" ]; - - patches = [ - ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory - # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce - ../../common/compiler-rt/glibc.patch - ./gnu-install-dirs.patch - - ./sys-ustat.patch - ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch - ./compiler-rt-5-cstddef.patch - ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' - substituteInPlace lib/builtins/int_util.c \ - --replace "#include <stdlib.h>" "" - substituteInPlace lib/builtins/clear_cache.c \ - --replace "#include <assert.h>" "" - substituteInPlace lib/builtins/cpu_model.c \ - --replace "#include <assert.h>" "" - ''; - - # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' - ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' - ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o - ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o - ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o - ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o - '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/freebsd/libgcc.a - ''; - - meta = llvm_meta // { - homepage = "https://compiler-rt.llvm.org/"; - description = "Compiler runtime libraries"; - longDescription = '' - The compiler-rt project provides highly tuned implementations of the - low-level code generator support routines like "__fixunsdfdi" and other - calls generated when a target doesn't have a short sequence of native - instructions to implement a core IR operation. It also provides - implementations of run-time libraries for dynamic testing tools such as - AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. - ''; - # "All of the code in the compiler-rt project is dual licensed under the MIT - # license and the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 618e597e96d4b..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f997c53410c1..ac079d89b57b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.4.3) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - endif() - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff722b..91fb79d1980c 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -344,7 +344,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH} -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -361,7 +361,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index f646975475bb..75885bf305b8 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -391,7 +391,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index b38c6ca96fac..a4580414cbc8 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -43,11 +43,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -67,9 +67,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR) - string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) - endif() - set(COMPILER_RT_LIBRARY_OUTPUT_DIR -- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - - if(APPLE) - # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index ec3bf40b95e6..af119f10ee2b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -44,8 +44,8 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - # Install sanitizer headers. - install(FILES ${SANITIZER_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index 2c486bff821b..0ee715da95f8 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch b/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch deleted file mode 100644 index d9e9a10d86003..0000000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001 -From: Craig Topper <craig.topper@intel.com> -Date: Thu, 24 May 2018 17:59:47 +0000 -Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux - -<sys/ustat.h> has been removed from glibc 2.28 by: - -commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Sun Mar 18 11:28:59 2018 +0800 - -Deprecate ustat syscall interface -This patch uses pre-computed size of struct ustat for Linux to fix - -https://bugs.llvm.org/show_bug.cgi?id=37418 - -Patch by H.J. Lu. - -Differential Revision: https://reviews.llvm.org/D47281 - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index 94b8f3f627..936d818673 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -253,7 +252,19 @@ namespace __sanitizer { - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); -+ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which -+ // has been removed from glibc 2.28. -+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ -+ || defined(__x86_64__) -+#define SIZEOF_STRUCT_USTAT 32 -+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ -+ || defined(__powerpc__) || defined(__s390__) -+#define SIZEOF_STRUCT_USTAT 20 -+#else -+#error Unknown size of struct ustat -+#endif -+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix deleted file mode 100644 index 70f0d2e11bb67..0000000000000 --- a/pkgs/development/compilers/llvm/5/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -}: - -let - release_version = "5.0.2"; - version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; - - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); - mkExtraBuildCommands = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ''; - - in { - - libllvm = callPackage ./llvm { - inherit llvm_meta; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libllvm-polly = callPackage ./llvm { - inherit llvm_meta; - enablePolly = true; - }; - - llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; }; - - libclang = callPackage ./clang { - inherit clang-tools-extra_src llvm_meta; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ./lld { - inherit llvm_meta; - }; - - lldb = callPackage ./lldb { - inherit llvm_meta; - }; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - compiler-rt = callPackage ./compiler-rt { - inherit llvm_meta; - }; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libcxx { - inherit llvm_meta; - }; - - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - }; - - openmp = callPackage ./openmp { - inherit llvm_meta targetLlvm; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/5/libcxx/default.nix b/pkgs/development/compilers/llvm/5/libcxx/default.nix deleted file mode 100644 index 073787e92db66..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt -}: - -assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; - -stdenv.mkDerivation { - pname = "libcxx"; - inherit version; - - src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - outputs = [ "out" "dev" ]; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.hostPlatform.isMusl python3 - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ cxxabi ]; - - cmakeFlags = [ - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=${cxxabi.pname}" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; - - preInstall = lib.optionalString (stdenv.isDarwin) '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) - installName="$out/lib/$baseName" - abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') - - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file - done - done - ''; - - passthru = { - isLLVM = true; - inherit cxxabi; - }; - - meta = llvm_meta // { - homepage = "https://libcxx.llvm.org/"; - description = "C++ standard library"; - longDescription = '' - libc++ is an implementation of the C++ standard library, targeting C++11, - C++14 and above. - ''; - # "All of the code in libc++ is dual licensed under the MIT license and the - # UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch deleted file mode 100644 index d9ea0dc7dfd0e..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca5afba86d19..ed69e4043c3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxx CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index b1f6bee8f945..1b455fceed7f 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -55,7 +55,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) - ) - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} - COMPONENT libcxx - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 5a1b2ccdc426..106d3d6c1d3c 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - - if (LIBCXX_INSTALL_HEADERS) - install(DIRECTORY . -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - COMPONENT cxx-headers - FILES_MATCHING - ${LIBCXX_HEADER_PATTERN} -@@ -44,7 +44,7 @@ if (LIBCXX_INSTALL_HEADERS) - set(generated_config_deps generate_config_header) - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 578651423f3b..277befd631ac 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -355,8 +355,8 @@ if (LIBCXX_INSTALL_LIBRARY) - set(experimental_lib cxx_experimental) - endif() - install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib} -- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx - ) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. -@@ -364,7 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx> - # after we required CMake 3.0. - install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} - COMPONENT libcxx) - endif() - endif() diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix deleted file mode 100644 index cc2ac1beaf0c2..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libcxxabi"; - inherit version; - - src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; - - outputs = [ "out" "dev" ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + 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} - ''; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin) libunwind; - - preInstall = lib.optionalString stdenv.isDarwin '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done - done - ''; - - postInstall = '' - mkdir -p "$dev/include" - install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" - ''; - - passthru = { - libName = "c++abi"; - }; - - meta = llvm_meta // { - homepage = "https://libcxxabi.llvm.org/"; - description = "Provides C++ standard library support"; - longDescription = '' - libc++abi is a new implementation of low level support for a standard C++ library. - ''; - # "All of the code in libc++abi is dual licensed under the MIT license and - # the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch deleted file mode 100644 index 760d7194f7b9d..0000000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4db3328deb9c..74b39acfe588 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxxabi CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index adcc412880c9..71758665af05 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -174,8 +174,8 @@ endif() - add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) - - install(TARGETS ${LIBCXXABI_TARGETS} -- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi - ) - - if (NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/5/lld/default.nix b/pkgs/development/compilers/llvm/5/lld/default.nix deleted file mode 100644 index d3cbede8433a8..0000000000000 --- a/pkgs/development/compilers/llvm/5/lld/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, llvm_meta -, buildLlvmTools -, fetch -, cmake -, libllvm -, version -}: - -stdenv.mkDerivation rec { - pname = "lld"; - inherit version; - - src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libllvm ]; - - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; - - # Musl's default stack size is too small for lld to be able to link Firefox. - LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; - - outputs = [ "out" "lib" "dev" ]; - - meta = llvm_meta // { - broken = stdenv.isDarwin; - homepage = "https://lld.llvm.org/"; - description = "The LLVM linker (unwrapped)"; - longDescription = '' - LLD is a linker from the LLVM project that is a drop-in replacement for - system linkers and runs much faster than them. It also provides features - that are useful for toolchain developers. - The linker supports ELF (Unix), PE/COFF (Windows), and Mach-O (macOS) - in descending order of completeness. Internally, LLD consists - of several different linkers. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch deleted file mode 100644 index ed673870dec5b..0000000000000 --- a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2ab0e35f1ab..f68e23d2a70d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -203,7 +205,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index fd1d44199ca6..2ec1831ed8f6 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -56,7 +56,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -73,5 +73,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 2df10697ff66..94aa8d092220 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -13,7 +13,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld) diff --git a/pkgs/development/compilers/llvm/5/lldb/default.nix b/pkgs/development/compilers/llvm/5/lldb/default.nix deleted file mode 100644 index 6c60a44b3d651..0000000000000 --- a/pkgs/development/compilers/llvm/5/lldb/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, fetchpatch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, darwin -}: - -stdenv.mkDerivation rec { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; - - patches = [ - # Fix PythonString::GetString for >=python-3.7 - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; - sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; - stripLen = 1; - }) - ./gnu-install-dirs.patch - ]; - - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ - cmake/modules/LLDBStandalone.cmake - ''; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa - ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch deleted file mode 100644 index 5c6193b028fa4..0000000000000 --- a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada293811b3e..6c2149309f65 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ) - -+include(GNUInstallDirs) -+ - include(LLDBStandalone) - include(LLDBConfig) - include(AddLLDB) -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4c6f1efd673d..179a12b49cce 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -54,14 +54,14 @@ function(add_lldb_library name) - endif() - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${out_dir} - ARCHIVE DESTINATION ${out_dir}) - else() - install(TARGETS ${name} - COMPONENT ${name} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -126,7 +126,7 @@ function(add_lldb_executable name) - if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} - DEPENDS ${name} -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 726552675f47..f1f769f34446 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -276,7 +276,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -@@ -286,7 +286,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/tools/intel-mpx/CMakeLists.txt b/tools/intel-mpx/CMakeLists.txt -index 29ba9a1cacec..30e2f9334b95 100644 ---- a/tools/intel-mpx/CMakeLists.txt -+++ b/tools/intel-mpx/CMakeLists.txt -@@ -12,4 +12,4 @@ target_link_libraries(lldb-intel-mpxtable - PUBLIC liblldb LLVMSupport) - - install(TARGETS lldb-intel-mpxtable -- LIBRARY DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix deleted file mode 100644 index 74523490244ff..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ /dev/null @@ -1,283 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, enableManpages ? false -, enableSharedLibraries ? !enableManpages -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; -in - -stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; - polly_src = fetch "polly" "1f4i1qsw7ywx25v262p8syz339zcbvfkx295xz26hmqrn944xa6x"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python3 ] - ++ optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; - name = "llvm-gcc8-type-mismatch.patch"; - sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; - }) - ./fix-gcc9.patch - #(fetchpatch { - # name = "llvm-fix-gcc9.patch"; - # url = "https://reviews.llvm.org/file/data/zs3ck5ryvc5n672fd2kw/PHID-FILE-byoqefzwmkd7qnlip4v2/file"; - # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; - # stripLen = 1; - #}) - - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix invalid std::string(nullptr) for GCC 12 - (fetchpatch { - name = "nvptx-gcc-12.patch"; - url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; - sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; - stripLen = 1; - }) - - ../../llvm-7-musl.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - - # llvm-5 does not support dwarf-5 style info, fails on gcc-11. - rm test/tools/llvm-symbolizer/print_context.c - '' + optionalString stdenv.isAarch64 '' - patch -p0 < ${../../aarch64.patch} - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] - ++ lib.optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ lib.optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ${lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.buildPlatform); - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch b/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch deleted file mode 100644 index eaf71f1468def..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp -index f79cb0e6..c6279046 100644 ---- a/lib/Target/Mips/MipsFastISel.cpp -+++ b/lib/Target/Mips/MipsFastISel.cpp -@@ -70,6 +70,7 @@ - #include <cassert> - #include <cstdint> - #include <new> -+#include <array> - - #define DEBUG_TYPE "mips-fastisel" - -@@ -1309,13 +1310,13 @@ bool MipsFastISel::fastLowerArguments() { - return false; - } - -- const ArrayRef<MCPhysReg> GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, -- Mips::A3}; -- const ArrayRef<MCPhysReg> FGR32ArgRegs = {Mips::F12, Mips::F14}; -- const ArrayRef<MCPhysReg> AFGR64ArgRegs = {Mips::D6, Mips::D7}; -- ArrayRef<MCPhysReg>::iterator NextGPR32 = GPR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextFGR32 = FGR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextAFGR64 = AFGR64ArgRegs.begin(); -+ std::array<MCPhysReg, 4> GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, -+ Mips::A3}}; -+ std::array<MCPhysReg, 2> FGR32ArgRegs = {{Mips::F12, Mips::F14}}; -+ std::array<MCPhysReg, 2> AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; -+ auto NextGPR32 = GPR32ArgRegs.begin(); -+ auto NextFGR32 = FGR32ArgRegs.begin(); -+ auto NextAFGR64 = AFGR64ArgRegs.begin(); - - struct AllocatedReg { - const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 40f6fa06036cb..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index 9ddc0f7ff81d..7ca45f286d47 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.4.3) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -157,14 +161,14 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 969292cd6b00..d7aea77bdd20 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") -+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 32bed50bb060..cca5bfff4970 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") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 286c04fba287..07905e68f595 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -268,7 +268,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch deleted file mode 100644 index 3f6d6acb83f7c..0000000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e03aed4809..8b8bbb8c403e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -279,15 +279,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - -+set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING -+ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) -+ - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -512,9 +518,9 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF - option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -945,7 +951,7 @@ add_subdirectory(cmake/modules) - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -957,7 +963,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 1c922651b133..d555fd627a4f 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -589,11 +589,11 @@ macro(add_llvm_library name) - else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR - (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) -- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(ARG_SHARED OR BUILD_SHARED_LIBS) - if(WIN32 OR CYGWIN OR MINGW) - set(install_type RUNTIME) -- set(install_dir bin) -+ set(install_dir ${CMAKE_INSTALL_BINDIR}) - else() - set(install_type LIBRARY) - endif() -@@ -637,9 +637,9 @@ macro(add_llvm_loadable_module name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(WIN32 OR CYGWIN) - # DLL platform -- set(dlldir "bin") -+ set(dlldir "${CMAKE_INSTALL_BINDIR}") - else() -- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") -+ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -@@ -651,7 +651,7 @@ macro(add_llvm_loadable_module name) - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION ${dlldir} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() -@@ -864,7 +864,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1275,7 +1275,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir bin) - endif() -@@ -1293,7 +1293,7 @@ function(llvm_install_library_symlink name dest type) - endif() - endfunction() - --function(llvm_install_symlink name dest) -+function(llvm_install_symlink name dest output_dir) - cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) - foreach(path ${CMAKE_MODULE_PATH}) - if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1316,7 +1316,7 @@ function(llvm_install_symlink name dest) - set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) - - install(SCRIPT ${INSTALL_SYMLINK} -- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" -+ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" - COMPONENT ${component}) - - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) -@@ -1400,7 +1400,8 @@ function(add_llvm_tool_symlink link_name target) - endif() - - if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) -- llvm_install_symlink(${link_name} ${target}) -+ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) -+ llvm_install_symlink(${link_name} ${target} ${output_dir}) - endif() - endif() - endfunction() -@@ -1452,9 +1453,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) - elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 1d8094cc505f..afdbe6e6d19c 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -140,9 +140,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 4540c5c36c8e..4cefb17fbd55 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) - - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index ac4b0b7c0304..21a6a3da8667 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -84,11 +84,11 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") - configure_file( -diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 482697b06baf..af2ac1e6c979 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() - -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") -+ set(bindir "${DESTDIR}${outdir}/") - - message("Creating ${name}") - -diff --git a/docs/CMake.rst b/docs/CMake.rst -index b6ebf37adc92..34c73d2869e0 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -461,8 +461,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -493,13 +493,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - OS X Only: If enabled CMake will generate a target named -@@ -651,9 +671,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). - - This file is available in two different locations. - --* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where -- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. -- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -+* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where -+ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are -+ installed as part of an installed version of LLVM. This is typically -+ ``cmake/llvm/`` within the lib directory. On Linux, this is typically -+ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. - - * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where - ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt -index 1d5ca3ba92b0..026f5453c1da 100644 ---- a/include/llvm/CMakeLists.txt -+++ b/include/llvm/CMakeLists.txt -@@ -4,5 +4,5 @@ add_subdirectory(Support) - # If we're doing an out-of-tree build, copy a module map for generated - # header files into the build area. - if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- configure_file(module.modulemap.build module.modulemap COPYONLY) -+ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) - endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index f201e1f7bff0..4582ed556a02 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -24,6 +24,10 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" -+#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 08b096afb052..2deae0dcfacc 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -332,12 +332,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = path.str(); -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); -+ } - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 6e913519a809..85641eef721f 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) - add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index 19b606933082..27b9f71b3d79 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,6 +8,6 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) diff --git a/pkgs/development/compilers/llvm/5/openmp/default.nix b/pkgs/development/compilers/llvm/5/openmp/default.nix deleted file mode 100644 index 900e920173fb6..0000000000000 --- a/pkgs/development/compilers/llvm/5/openmp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, llvm_meta -, fetch -, cmake -, llvm -, targetLlvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ - (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ]; - - meta = llvm_meta // { - homepage = "https://openmp.llvm.org/"; - description = "Support for the OpenMP language"; - longDescription = '' - The OpenMP subproject of LLVM contains the components required to build an - executable OpenMP program that are outside the compiler itself. - Contains the code for the runtime library against which code compiled by - "clang -fopenmp" must be linked before it can run and the library that - supports offload to target devices. - ''; - # "All of the code is dual licensed under the MIT license and the UIUC - # License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix index 0a0aa3be18a19..02e3cdcb8eb9a 100644 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols ]; CXXFLAGS = "-fno-rtti"; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 35ebea77782f3..1fa448fe9d8e9 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.20230924"; + version = "0.0.20231113"; in stdenvNoCC.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { owner = "minoki"; repo = "LunarML"; rev = "refs/tags/v${version}"; - sha256 = "QN5iJEpJJZZuUfY/z57bpOQHDU31ecmJPWQtkXsLmDg="; + hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index 0f556f85daa37..e8eb62a15f130 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; + patches = [ + ./readlink.patch + ]; + configureFlags = [ "--enable-mcpplib" ]; meta = with lib; { diff --git a/pkgs/development/compilers/mcpp/readlink.patch b/pkgs/development/compilers/mcpp/readlink.patch new file mode 100644 index 0000000000000..0f5fc6d7e963d --- /dev/null +++ b/pkgs/development/compilers/mcpp/readlink.patch @@ -0,0 +1,24 @@ +From 1c4b0f26614bff331eb8a9f2b514309af6f31fd0 Mon Sep 17 00:00:00 2001 +From: Jose <pepone@users.noreply.github.com> +Date: Mon, 26 Jun 2023 16:43:43 +0200 +Subject: [PATCH] Add 'unistd' header for readlink (#8) + +--- + src/system.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/system.c b/src/system.c +index a3501f9..646caf6 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -37,6 +37,11 @@ + * 2. append the system-dependent routines in this file. + */ ++ ++#ifndef _MSC_VER ++# include <unistd.h> // For readlink() ++#endif ++ + #if PREPROCESSED + #include "mcpp.H" + #else diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index a8bf26bacdfd9..0996702ec6253 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -2,7 +2,6 @@ , fetchurl , mrustc , mrustc-minicargo -, rust , llvm_12 , llvmPackages_12 , libffi @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" - "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" + "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; buildPhase = '' @@ -129,7 +128,7 @@ stdenv.mkDerivation rec { cp run_rustc/${outputDir}/prefix/bin/rustc_binary $out/bin/rustc cp -r run_rustc/${outputDir}/prefix/lib/* $out/lib/ - cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/ + cp $out/lib/rustlib/${stdenv.targetPlatform.rust.rustcTarget}/lib/*.so $out/lib/ runHook postInstall ''; @@ -146,4 +145,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 40e39d411d694..fff5762a38d72 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; installCheckPhase = '' bin/neko bin/test.n diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index 88acc0654cf2b..85b26848f4e45 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/pkgs/development/compilers/opensycl/default.nix b/pkgs/development/compilers/opensycl/default.nix index 995b21330a996..c406d4c9d5c26 100644 --- a/pkgs/development/compilers/opensycl/default.nix +++ b/pkgs/development/compilers/opensycl/default.nix @@ -8,8 +8,9 @@ , libxml2 , libffi , makeWrapper +, config , rocmPackages -, rocmSupport ? false +, rocmSupport ? config.rocmSupport }: let inherit (llvmPackages_15) stdenv; diff --git a/pkgs/development/compilers/rust/1_72.nix b/pkgs/development/compilers/rust/1_73.nix index f540c229c6ff6..37e75e0a7a4f1 100644 --- a/pkgs/development/compilers/rust/1_72.nix +++ b/pkgs/development/compilers/rust/1_73.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.72.1"; - rustcSha256 = "sha256-f0iEX2pSzbtdY/sFKP1fUg60QydbVfmOMoFZ+GVo+JU="; + rustcVersion = "1.73.0"; + rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -35,25 +35,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.71.1"; + bootstrapVersion = "1.72.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21"; - x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4"; - x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01"; - arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258"; - armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60"; - aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f"; - aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c"; - x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c"; - aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351"; - powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537"; - riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea"; - mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed"; + i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911"; + x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410"; + x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac"; + arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110"; + armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb"; + aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b"; + aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f"; + x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e"; + aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983"; + powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c"; + riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101"; }; - selectRustPackage = pkgs: pkgs.rust_1_72; + selectRustPackage = pkgs: pkgs.rust_1_73; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 7c0b46d55931f..97ac69270252d 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, rust, callPackage, version, hashes }: +{ stdenv, fetchurl, callPackage, version, hashes }: let - platform = rust.toRustTarget stdenv.hostPlatform; + platform = stdenv.hostPlatform.rust.rustcTarget; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46e238ff47971..8eb628aa536b7 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsBuildHost, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, rustPlatform, rust, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable @@ -116,6 +116,6 @@ rustPlatform.buildRustPackage.override { broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform; }; } -// lib.optionalAttrs (rust.toRustTarget stdenv.buildPlatform != rust.toRustTarget stdenv.hostPlatform) { +// lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget) { HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config"; }) diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index dd2c116a341b9..ebf8d900bb3b5 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,7 +19,6 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu - mips64el-unknown-linux-gnuabi64 ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1550887c3567f..1758abb6bea51 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc, rustfmt +, darwin, cargo, cmake, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -53,7 +53,7 @@ in stdenv.mkDerivation (finalAttrs: { # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE} # environment variables. # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53 - "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.buildPlatform)}" = + "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] stdenv.buildPlatform.rust.rustcTarget}" = "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config"; NIX_LDFLAGS = toString ( @@ -68,15 +68,18 @@ in stdenv.mkDerivation (finalAttrs: { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; - setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; - setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; - ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}"; + ccPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}"; + cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}"; + setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}"; + setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}"; + setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}"; + ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; + cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; in [ "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" @@ -90,23 +93,23 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" - "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" + "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. "--target=${concatStringsSep "," ([ - (rust.toRustTargetSpec stdenv.targetPlatform) + stdenv.targetPlatform.rust.rustcTargetSpec # (build!=target): When cross-building a compiler we need to add # the build platform as well so rustc can compile build.rs # scripts. ] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.buildPlatform) + stdenv.buildPlatform.rust.rustcTargetSpec # (host!=target): When building a cross-targeting compiler we # need to add the host platform as well so rustc can compile # build.rs scripts. ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.hostPlatform) + stdenv.hostPlatform.rust.rustcTargetSpec ])}" "${setBuild}.cc=${ccForBuild}" @@ -137,7 +140,7 @@ in stdenv.mkDerivation (finalAttrs: { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [ + ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 @@ -149,12 +152,12 @@ in stdenv.mkDerivation (finalAttrs: { buildPhase = if fastCross then " runHook preBuild - mkdir -p build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-{std,rustc}/${rust.toRustTargetSpec stdenv.hostPlatform}/release/ - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/libstd-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/libstd.so - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/librustc_driver-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc.so - ln -s ${rustc}/bin/rustc build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/rustc-main - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.libstd.stamp - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.librustc.stamp + mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp python ./x.py --keep-stage=0 --stage=1 build library/std runHook postBuild @@ -167,8 +170,8 @@ in stdenv.mkDerivation (finalAttrs: { mkdir -v $out/bin $doc $man makeWrapper ${rustc}/bin/rustc $out/bin/rustc --add-flags "--sysroot $out" makeWrapper ${rustc}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" - ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${rust.toRustTargetSpec stdenv.hostPlatform} $out/lib/rustlib/ - echo rust-std-${rust.toRustTargetSpec stdenv.hostPlatform} >> $out/lib/rustlib/components + ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man @@ -288,9 +291,8 @@ in stdenv.mkDerivation (finalAttrs: { "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "mipsel-linux" "mips64el-linux" - "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" - "s390x-linux" "x86_64-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 6a06213e95994..68ceb1a7d7f64 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; + sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; }; patches = [ @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" ''; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index c6c743ce1e595..f19501a6d7d82 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config cmake spirv-tools ] + nativeBuildInputs = [ pkg-config cmake ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers ] + buildInputs = [ spirv-headers spirv-tools ] ++ lib.optionals (!isROCm) [ llvm ]; nativeCheckInputs = [ lit ]; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 818ad22fae74c..0494539c4435c 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip -, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, fetchzip +, autoconf +, automake +, autoreconfHook +, dos2unix +, file +, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool -, libuuid, openssl, pango, xorg -, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null -, squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null +, alsa-lib +, coreutils +, freetype +, glib +, glibc +, gnugrep +, libGL +, libpulseaudio +, libtool +, libuuid +, openssl +, pango +, xorg +, squeakImageHash ? null +, squeakSourcesHash ? null +, squeakSourcesVersion ? null +, squeakVersion ? null +, squeakVmCommitHash ? null +, squeakVmCommitHashHash ? null , squeakVmVersion ? null } @ args: let - inherit (builtins) elemAt; + inherit (builtins) elemAt toString; + nullableOr = o: default: if o == null then default else o; bits = stdenv.hostPlatform.parsed.cpu.bits; @@ -75,7 +100,6 @@ in stdenv.mkDerivation { autoconf automake autoreconfHook - clang dos2unix file perl @@ -88,6 +112,7 @@ in stdenv.mkDerivation { glib glibc gnugrep + libGL libpulseaudio libtool libuuid @@ -139,7 +164,16 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ( + [ "-fcommon" ] + ++ (lib.optionals stdenv.cc.isClang [ + # LLVM 16 turned these into errors (rightly, perhaps.) + # Allow this package to continue to build despite this change. + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-function-pointer-types" + ]) + ); preAutoreconf = '' pushd ./platforms/unix/config > /dev/null diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index df41ab6e16180..aee24225021c2 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,9 +5,10 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.17"; out = "5.1.1"; } + { case = range "8.13" "8.18"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY="; release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index af2f56475fd7e..9420d69cb4b08 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,13 +6,14 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.18"; out = "8.17"; } + { case = range "8.14" "8.18"; out = "8.18"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } { case = "8.7"; out = "8.7.2"; } ] null; + release."8.18".sha256 = "sha256-KObBEYerWhIStmq90G3vs9K5LUEOfB2SPxirwLiWQ6E="; release."8.17".sha256 = "sha256-D878t/PijVCopRKHYqfwdNvt3arGlI8yxbK/vI6qZUY="; release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv"; release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 49333b4169718..dac3fb2b74dff 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.18"; out = "1.0+8.18"; } { case = "8.17"; out = "1.0+8.17"; } { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } @@ -19,10 +20,9 @@ mkCoqDerivation { { case = "8.9"; out = "0.6.5"; } { case = "8.8"; out = "0.6.3"; } { case = "8.7"; out = "0.6.2"; } - { case = "8.6"; out = "0.6.1"; } - { case = "8.5"; out = "0.6"; } ] null; + release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI="; release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4="; release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0="; release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 7d22abad7c7f7..53f98c13861f2 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; } { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; } - { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } + { cases = [ (isGe "8.11") (range "1.12" "1.18") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 8406fcbd134cc..ffdb5193ae365 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.17" coq.coq-version then "1.5.3" else null; + defaultVersion = if lib.versions.range "8.8" "8.18" coq.coq-version then "1.5.4" else null; + release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA="; release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s="; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 2c9f4e4cf27c7..0d28bbc0527f0 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup +{ lib, mkCoqDerivation, coq, mathcomp, mathcomp-finmap , fourcolor, hierarchy-builder, version ? null }: mkCoqDerivation { @@ -6,16 +6,20 @@ mkCoqDerivation { release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU="; + release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; + release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; releaseRev = v: "v${v}"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.16"; out = "0.9.1"; } - { case = range "8.12" "8.12"; out = "0.9"; } + defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ + { cases = [ (isGe "8.16") (range "2.0.0" "2.1.0") ]; out = "0.9.3"; } + { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } + { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } + { cases = [ (range "8.12" "8.13") (range "1.12.0" "1.14.0") ]; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup fourcolor hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp-finmap mathcomp.fingroup fourcolor hierarchy-builder ]; meta = with lib; { description = "Library of formalized graph theory results in Coq"; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 7e608fc61f348..5cbfbdf0c6f40 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -9,6 +9,8 @@ let repo = "analysis"; owner = "math-comp"; + release."0.6.6".sha256 = "sha256-tWtv6yeB5/vzwpKZINK9OQ0yQsvD8qu9zVSNHvLMX5Y="; + release."0.6.5".sha256 = "sha256-oJk9/Jl1SWra2aFAXRAVfX7ZUaDfajqdDksYaW8dv8E="; release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; release."0.6.0".sha256 = "sha256-0msICcIrK6jbOSiBu0gIVU3RHwoEEvB88CMQqW/06rg="; release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k="; @@ -24,7 +26,9 @@ let release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } + { cases = [ (isGe "8.17") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } + { cases = [ (isGe "8.14") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } + { cases = [ (isGe "8.14") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } diff --git a/pkgs/development/coq-modules/mathcomp-apery/default.nix b/pkgs/development/coq-modules/mathcomp-apery/default.nix index 6951169387681..0b447909116ee 100644 --- a/pkgs/development/coq-modules/mathcomp-apery/default.nix +++ b/pkgs/development/coq-modules/mathcomp-apery/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.2"; } ] null; release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY="; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 234d25f909b22..fa6032a7f08d8 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.17") ]; out = "1.5.2"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.18") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index d0bb3fb54a901..a649916892a81 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ { cases = [ (isGe "8.17") (isGe "0.6.0") ]; out = "0.5.2"; } - { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.2") ]; out = "0.5.1"; } + { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index bbb94420ab465..bc4ed1f1f7473 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } - { cases = [ (range "8.13" "8.18") (range "1.12" "1.17.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.18.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index ae1dcd57c3dda..f95f1d425ea8e 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,8 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ - { case = isGe "8.15"; out = "1.17.0"; } + { case = isGe "8.17"; out = "1.18.0"; } + { case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } @@ -37,6 +38,7 @@ let release = { "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; + "1.18.0".sha256 = "sha256-mJJ/zvM2WtmBZU3U4oid/zCMvDXei/93v5hwyyqwiiY="; "1.17.0".sha256 = "sha256-bUfoSTMiW/GzC1jKFay6DRqGzKPuLOSUsO6/wPSFwNg="; "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; "1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index bffc169a1e99c..d2bb38f8683f5 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -11,7 +11,7 @@ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.1.0") ]; out = "2.1.0"; } { cases = [ (isGe "8.16") "2.0.0" ]; out = "2.0.0"; } - { cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; } + { cases = [ (isGe "8.15") (range "1.15.0" "1.18.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index 093e0ef195ca0..027ca82324f8a 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; version = "v${finalAttrs.version}"; @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; + platforms = platforms.unix; maintainers = [ maintainers.bdd ]; }; }) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index d26c0072265c9..493381842109c 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with licenses; [ bsd0 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ polygon fortuneteller2k ]; + maintainers = with maintainers; [ polygon moni ]; }; } diff --git a/pkgs/development/embedded/openocd-rp2040/default.nix b/pkgs/development/embedded/openocd-rp2040/default.nix index a7e2bb65953c2..688d83ac27e80 100644 --- a/pkgs/development/embedded/openocd-rp2040/default.nix +++ b/pkgs/development/embedded/openocd-rp2040/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchgit -, fetchurl , pkg-config , hidapi , libftdi1 @@ -12,7 +11,7 @@ , automake , texinfo , git -, libgpiod +, libgpiod_1 }: stdenv.mkDerivation { @@ -42,13 +41,7 @@ stdenv.mkDerivation { ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ - lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec { - version = "1.6.4"; - src = fetchurl { - url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; - }; - })); + lib.optional stdenv.isLinux libgpiod_1; configurePhase = '' SKIP_SUBMODULE=1 ./bootstrap diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 954f043a2ade1..39e9edc677228 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -6,7 +6,7 @@ , jimtcl , libjaylink , libusb1 -, libgpiod +, libgpiod_1 , enableFtdi ? true, libftdi1 @@ -27,13 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ] ++ # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/ - lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec { - version = "1.6.4"; - src = fetchurl { - url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo="; - }; - })); + lib.optional stdenv.isLinux libgpiod_1; configureFlags = [ "--disable-werror" diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index edc6d73fffccd..fcb6e8c7a8a5d 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { libffi ]; - env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + env = { + GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 723b8e5efba3c..7fe56b3f13d01 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,7 +20,7 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({ + Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({ Cabal-syntax = self.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible @@ -35,11 +35,11 @@ self: super: { cabalInstallOverlay = cself: csuper: { # Needs to be upgraded compared to Stackage LTS 21 - cabal-install-solver = cself.cabal-install-solver_3_10_1_0; + cabal-install-solver = cself.cabal-install-solver_3_10_2_1; # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_2_0; + Cabal = cself.Cabal_3_10_2_1; Cabal-syntax = cself.Cabal-syntax_3_10_2_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version @@ -57,15 +57,15 @@ self: super: { # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_11_6; - hspec-discover = cself.hspec-discover_2_11_6; - hspec = cself.hspec_2_11_6; + hspec-core = cself.hspec-core_2_11_7; + hspec-discover = cself.hspec-discover_2_11_7; + hspec = cself.hspec_2_11_7; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_11* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_11_6 = dontCheck csuper.hspec-discover_2_11_6; + hspec-discover_2_11_7 = dontCheck csuper.hspec-discover_2_11_7; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -194,7 +194,7 @@ self: super: { # 2023-08-09: Jailbreak because of vector < 0.13 # 2023-11-09: don't check because of https://github.com/tweag/monad-bayes/pull/326 monad-bayes = dontCheck (doJailbreak (super.monad-bayes.override { - hspec = self.hspec_2_11_6; + hspec = self.hspec_2_11_7; })); # Disable tests failing on odd floating point numbers generated by QuickCheck 2.14.3 @@ -295,7 +295,7 @@ self: super: { # Overriding the version pandoc dependency uses as the latest release has version bounds # defined as >= 3.1 && < 3.2, can be removed once pandoc gets bumped by Stackage. - patat = super.patat.override { pandoc = self.pandoc_3_1_8; }; + patat = super.patat.override { pandoc = self.pandoc_3_1_9; }; # http2 also overridden in all-packages.nix for mailctl. # twain is currently only used by mailctl, so the .overrideScope shouldn't @@ -498,7 +498,7 @@ self: super: { structures = dontCheck super.structures; # Requires alex >= 3.4 - jacinda = super.jacinda.override { alex = self.alex_3_4_0_0; }; + jacinda = super.jacinda.override { alex = self.alex_3_4_0_1; }; # Disable test suites to fix the build. acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw @@ -1046,13 +1046,19 @@ self: super: { # test suite requires git and does a bunch of git operations restless-git = dontCheck super.restless-git; - # requires git at test-time *and* runtime, but we'll just rely on users to - # bring their own git at runtime. Additionally, sensei passes `-package - # hspec-meta` to GHC in the tests, but doesn't depend on it itself. - sensei = overrideCabal (drv: { + # patch out a flaky test that depends on output from hspec >= v2.11.7. + # https://github.com/hspec/sensei/issues/125 + sensei = appendPatch (fetchpatch { + url = "https://github.com/hspec/sensei/commit/5c11026fa48e13ea1c351ab882765eb0966f2e97.patch"; + hash = "sha256-eUCDvypj2bxTRnHLzrcembLMKHg5c3W3quNfclBDsso="; + }) (overrideCabal (drv: { + # sensei passes `-package hspec-meta` to GHC in the tests, but doesn't + # depend on it itself. testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta ]; + # requires git at test-time *and* runtime, but we'll just rely on users to + # bring their own git at runtime. testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; - }) super.sensei; + }) super.sensei); # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; @@ -1176,7 +1182,7 @@ self: super: { # stack-2.13.1 requires a bunch of the latest packages. (drv: drv.overrideScope (hfinal: hprev: { ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 - crypton = hprev.crypton_0_33; # needs crypton >= 0.33 + crypton = hprev.crypton_0_34; # needs crypton >= 0.33 hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 @@ -1671,19 +1677,19 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give latest hspec correct dependency versions without overrideScope - hspec_2_11_6 = doDistribute (super.hspec_2_11_6.override { - hspec-discover = self.hspec-discover_2_11_6; - hspec-core = self.hspec-core_2_11_6; + hspec_2_11_7 = doDistribute (super.hspec_2_11_7.override { + hspec-discover = self.hspec-discover_2_11_7; + hspec-core = self.hspec-core_2_11_7; }); - hspec-meta_2_11_6 = doDistribute (super.hspec-meta_2_11_6.override { + hspec-meta_2_11_7 = doDistribute (super.hspec-meta_2_11_7.override { hspec-expectations = self.hspec-expectations_0_8_4; }); - hspec-discover_2_11_6 = doDistribute (super.hspec-discover_2_11_6.override { - hspec-meta = self.hspec-meta_2_11_6; + hspec-discover_2_11_7 = doDistribute (super.hspec-discover_2_11_7.override { + hspec-meta = self.hspec-meta_2_11_7; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_6 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_7 # is overlayed to hspec-core. - hspec-core_2_11_6 = doDistribute (dontCheck (super.hspec-core_2_11_6.override { + hspec-core_2_11_7 = doDistribute (dontCheck (super.hspec-core_2_11_7.override { hspec-expectations = self.hspec-expectations_0_8_4; })); @@ -1841,7 +1847,7 @@ self: super: { inherit (let pandoc-cli-overlay = self: super: { # pandoc-cli requires pandoc >= 3.1 - pandoc = self.pandoc_3_1_8; + pandoc = self.pandoc_3_1_9; # pandoc depends on http-client-tls, which only starts depending # on crypton-connection in http-client-tls-0.3.6.2. @@ -1853,11 +1859,11 @@ self: super: { }; in { pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay; - pandoc_3_1_8 = doDistribute (super.pandoc_3_1_8.overrideScope pandoc-cli-overlay); + pandoc_3_1_9 = doDistribute (super.pandoc_3_1_9.overrideScope pandoc-cli-overlay); pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay; }) pandoc-cli - pandoc_3_1_8 + pandoc_3_1_9 pandoc-lua-engine ; @@ -2685,4 +2691,26 @@ self: super: { sdl2-gfx = overrideCabal { __propagatePkgConfigDepends = false; } super.sdl2-gfx; sdl2-ttf = overrideCabal { __onlyPropagateKnownPkgConfigModules = true; } super.sdl2-ttf; + # Needs git for compile-time insertion of commit hash into --version string. + kmonad = overrideCabal (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; + }) super.kmonad; + + # Both of these need specific versions of ghc-lib-parser, the minor releases + # seem to be tied. + ghc-syntax-highlighter_0_0_10_0 = super.ghc-syntax-highlighter_0_0_10_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_6_3_20231014; + }); + ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231009; + }); + + # Needs a matching version of ipython-kernel and a + # ghc-syntax-highlighter compatible with a newer ghc-lib-parser it + # transitively pulls in + ihaskell = super.ihaskell.overrideScope (self: super: { + ipython-kernel = self.ipython-kernel_0_11_0_0; + ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5964e0d78972d..c541c852df362 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -125,6 +125,9 @@ self: super: { algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1; }); + # Overly-strict bounds introducted by a revision in version 0.3.2. + text-metrics = doJailbreak super.text-metrics; + # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 OneTuple = addBuildDepends [ self.foldable1-classes-compat diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 207697356f974..acde3041b1fa1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -148,6 +148,9 @@ self: super: { # has a restrictive lower bound on Cabal fourmolu = doJailbreak super.fourmolu; + # Overly-strict bounds introducted by a revision in version 0.3.2. + text-metrics = doJailbreak super.text-metrics; + # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 OneTuple = addBuildDepends [ self.foldable1-classes-compat diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 453526274094f..de1412f4c0eed 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -171,4 +171,6 @@ self: super: { # Requires GHC < 9.4 ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); + + hspec-megaparsec = super.hspec-megaparsec_2_2_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 24e722a9913eb..803e34163f9d9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -67,14 +67,14 @@ self: super: { doctest = doDistribute super.doctest_0_22_2; http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18 - some = doDistribute self.some_1_0_5; + some = doDistribute self.some_1_0_6; th-abstraction = doDistribute self.th-abstraction_0_6_0_0; - th-desugar = doDistribute self.th-desugar_1_15; + th-desugar = doDistribute self.th-desugar_1_16; semigroupoids = doDistribute self.semigroupoids_6_0_0_1; bifunctors = doDistribute self.bifunctors_5_6_1; base-compat = doDistribute self.base-compat_0_13_1; base-compat-batteries = doDistribute self.base-compat-batteries_0_13_1; - fgl = doDistribute self.fgl_5_8_1_1; + fgl = doDistribute self.fgl_5_8_2_0; # Because we bumped the version of th-abstraction above.^ aeson = doJailbreak super.aeson; @@ -249,7 +249,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -259,8 +261,9 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5723167b408d0..839b3c1bee5bf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -363,6 +363,7 @@ broken-packages: - bech32 # failure in job https://hydra.nixos.org/build/233194823 at 2023-09-02 - bed-and-breakfast # failure in job https://hydra.nixos.org/build/233221152 at 2023-09-02 - Befunge93 # failure in job https://hydra.nixos.org/build/233226751 at 2023-09-02 + - benc # failure in job https://hydra.nixos.org/build/241434046 at 2023-11-19 - bench-graph # failure in job https://hydra.nixos.org/build/233239830 at 2023-09-02 - BenchmarkHistory # failure in job https://hydra.nixos.org/build/233213179 at 2023-09-02 - bench-show # failure in job https://hydra.nixos.org/build/233245858 at 2023-09-02 @@ -955,6 +956,7 @@ broken-packages: - courier # failure in job https://hydra.nixos.org/build/233215760 at 2023-09-02 - court # failure in job https://hydra.nixos.org/build/233192047 at 2023-09-02 - coverage # failure in job https://hydra.nixos.org/build/233199365 at 2023-09-02 + - cozo-hs # failure in job https://hydra.nixos.org/build/241432654 at 2023-11-19 - cparsing # failure in job https://hydra.nixos.org/build/233192377 at 2023-09-02 - cpio-conduit # failure in job https://hydra.nixos.org/build/233220518 at 2023-09-02 - cplusplus-th # failure in job https://hydra.nixos.org/build/233204461 at 2023-09-02 @@ -1029,7 +1031,6 @@ broken-packages: - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02 - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02 - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02 - - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 - dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02 @@ -1356,6 +1357,7 @@ broken-packages: - ec2-unikernel # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237245061 at 2023-10-21 - eccrypto-ed25519-bindings # failure in job https://hydra.nixos.org/build/233217399 at 2023-09-02 - ecma262 # failure in job https://hydra.nixos.org/build/233260026 at 2023-09-02 + - ecta # failure in job https://hydra.nixos.org/build/241421274 at 2023-11-19 - ecta-plugin # failure in job https://hydra.nixos.org/build/233224764 at 2023-09-02 - ecu # failure in job https://hydra.nixos.org/build/233230797 at 2023-09-02 - eddie # failure in job https://hydra.nixos.org/build/233254499 at 2023-09-02 @@ -1677,6 +1679,8 @@ broken-packages: - fractals # failure in job https://hydra.nixos.org/build/233205969 at 2023-09-02 - fraction # failure in job https://hydra.nixos.org/build/233204186 at 2023-09-02 - frag # failure in job https://hydra.nixos.org/build/234458411 at 2023-09-13 + - Frames-beam # failure in job https://hydra.nixos.org/build/241429730 at 2023-11-19 + - Frames-streamly # failure in job https://hydra.nixos.org/build/241420906 at 2023-11-19 - franchise # failure in job https://hydra.nixos.org/build/233256790 at 2023-09-02 - fraxl # failure in job https://hydra.nixos.org/build/233219345 at 2023-09-02 - freddy # failure in job https://hydra.nixos.org/build/233208999 at 2023-09-02 @@ -1935,6 +1939,7 @@ broken-packages: - googlepolyline # failure in job https://hydra.nixos.org/build/233209674 at 2023-09-02 - google-search # failure in job https://hydra.nixos.org/build/233214524 at 2023-09-02 - google-server-api # failure in job https://hydra.nixos.org/build/233218521 at 2023-09-02 + - google-static-maps # failure in job https://hydra.nixos.org/build/241418035 at 2023-11-19 - google-translate # failure in job https://hydra.nixos.org/build/233234076 at 2023-09-02 - gopherbot # failure in job https://hydra.nixos.org/build/233207680 at 2023-09-02 - gopro-plus # failure in job https://hydra.nixos.org/build/233225073 at 2023-09-02 @@ -2179,6 +2184,7 @@ broken-packages: - haskell-rules # failure in job https://hydra.nixos.org/build/233225854 at 2023-09-02 - haskellscrabble # failure in job https://hydra.nixos.org/build/233251248 at 2023-09-02 - haskellscript # failure in job https://hydra.nixos.org/build/233193435 at 2023-09-02 + - haskell-snake # failure in job https://hydra.nixos.org/build/241433525 at 2023-11-19 - haskell-spacegoo # failure in job https://hydra.nixos.org/build/233206108 at 2023-09-02 - haskell-src-exts-prisms # failure in job https://hydra.nixos.org/build/233197742 at 2023-09-02 - haskell-src-exts-qq # failure in job https://hydra.nixos.org/build/233234764 at 2023-09-02 @@ -2792,12 +2798,11 @@ broken-packages: - ignore # failure in job https://hydra.nixos.org/build/233238874 at 2023-09-02 - igraph # failure in job https://hydra.nixos.org/build/233192875 at 2023-09-02 - ihaskell-charts # failure in job https://hydra.nixos.org/build/233193328 at 2023-09-02 - - ihaskell-diagrams # failure in job https://hydra.nixos.org/build/233230959 at 2023-09-02 - ihaskell-gnuplot # failure in job https://hydra.nixos.org/build/233223675 at 2023-09-02 - ihaskell-graphviz # failure in job https://hydra.nixos.org/build/233200671 at 2023-09-02 + - ihaskell-hvega # failure in job https://hydra.nixos.org/build/241514418 at 2023-11-20 - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02 - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02 - - ihaskell-widgets # failure in job https://hydra.nixos.org/build/233198849 at 2023-09-02 - ihp-hsx # failure in job https://hydra.nixos.org/build/233211401 at 2023-09-02 - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02 - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02 @@ -2982,6 +2987,7 @@ broken-packages: - json-qq # failure in job https://hydra.nixos.org/build/233196259 at 2023-09-02 - jsonresume # failure in job https://hydra.nixos.org/build/233202350 at 2023-09-02 - jsonrpc-conduit # failure in job https://hydra.nixos.org/build/233195089 at 2023-09-02 + - json-rpc # failure in job https://hydra.nixos.org/build/241430941 at 2023-11-19 - json-rpc-generic # failure in job https://hydra.nixos.org/build/233201371 at 2023-09-02 - json-rpc-server # failure in job https://hydra.nixos.org/build/233201284 at 2023-09-02 - jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02 @@ -3050,7 +3056,6 @@ broken-packages: - kind-integer # failure in job https://hydra.nixos.org/build/233250066 at 2023-09-02 - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - - kmonad # failure in job https://hydra.nixos.org/build/233239997 at 2023-09-02 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 @@ -3097,6 +3102,7 @@ broken-packages: - lambdatwit # failure in job https://hydra.nixos.org/build/233219603 at 2023-09-02 - Lambdaya # failure in job https://hydra.nixos.org/build/233227702 at 2023-09-02 - lame # failure in job https://hydra.nixos.org/build/233250932 at 2023-09-02 + - laminar # failure in job https://hydra.nixos.org/build/241426331 at 2023-11-19 - language-asn # failure in job https://hydra.nixos.org/build/233227929 at 2023-09-02 - language-c-comments # failure in job https://hydra.nixos.org/build/233234112 at 2023-09-02 - language-c-inline # failure in job https://hydra.nixos.org/build/233245990 at 2023-09-02 @@ -3258,6 +3264,7 @@ broken-packages: - listlike-instances # failure in job https://hydra.nixos.org/build/233238303 at 2023-09-02 - list-mux # failure in job https://hydra.nixos.org/build/233206407 at 2023-09-02 - list-prompt # failure in job https://hydra.nixos.org/build/233235855 at 2023-09-02 + - list-shuffle # failure in job https://hydra.nixos.org/build/241416196 at 2023-11-19 - list-t-http-client # failure in job https://hydra.nixos.org/build/233239262 at 2023-09-02 - list-t-libcurl # failure in job https://hydra.nixos.org/build/233237389 at 2023-09-02 - list-tries # failure in job https://hydra.nixos.org/build/233250041 at 2023-09-02 @@ -3380,6 +3387,7 @@ broken-packages: - mapalgebra # failure in job https://hydra.nixos.org/build/233215542 at 2023-09-02 - map-exts # failure in job https://hydra.nixos.org/build/233247423 at 2023-09-02 - Mapping # failure in job https://hydra.nixos.org/build/233248158 at 2023-09-02 + - mappings # failure in job https://hydra.nixos.org/build/241435621 at 2023-11-19 - mappy # failure in job https://hydra.nixos.org/build/233250202 at 2023-09-02 - map-reduce-folds # failure in job https://hydra.nixos.org/build/233245163 at 2023-09-02 - MapWith # failure in job https://hydra.nixos.org/build/233237146 at 2023-09-02 @@ -3608,6 +3616,7 @@ broken-packages: - motor-reflection # failure in job https://hydra.nixos.org/build/233247530 at 2023-09-02 - mount # failure in job https://hydra.nixos.org/build/233220302 at 2023-09-02 - movie-monad # failure in job https://hydra.nixos.org/build/233215402 at 2023-09-02 + - mpd-current-json # failure in job https://hydra.nixos.org/build/241424468 at 2023-11-19 - mpppc # failure in job https://hydra.nixos.org/build/233223008 at 2023-09-02 - mpris # failure in job https://hydra.nixos.org/build/233259241 at 2023-09-02 - mpvguihs # failure in job https://hydra.nixos.org/build/233196650 at 2023-09-02 @@ -3931,6 +3940,7 @@ broken-packages: - orion-hs # failure in job https://hydra.nixos.org/build/233210586 at 2023-09-02 - orizentic # failure in job https://hydra.nixos.org/build/233197904 at 2023-09-02 - OrPatterns # failure in job https://hydra.nixos.org/build/233191538 at 2023-09-02 + - orville-postgresql # failure in job https://hydra.nixos.org/build/241433010 at 2023-11-19 - ory-hydra-client # failure in job https://hydra.nixos.org/build/233197456 at 2023-09-02 - ory-kratos # failure in job https://hydra.nixos.org/build/233191249 at 2023-09-02 - osc # failure in job https://hydra.nixos.org/build/233250062 at 2023-09-02 @@ -4193,6 +4203,7 @@ broken-packages: - platinum-parsing # failure in job https://hydra.nixos.org/build/233225071 at 2023-09-02 - PlayingCards # failure in job https://hydra.nixos.org/build/233239100 at 2023-09-02 - playlists # failure in job https://hydra.nixos.org/build/233240151 at 2023-09-02 + - plex # failure in job https://hydra.nixos.org/build/241435308 at 2023-11-19 - plist-buddy # failure in job https://hydra.nixos.org/build/233199181 at 2023-09-02 - plist # failure in job https://hydra.nixos.org/build/233233906 at 2023-09-02 - plivo # failure in job https://hydra.nixos.org/build/233256647 at 2023-09-02 @@ -4627,7 +4638,6 @@ broken-packages: - reify # failure in job https://hydra.nixos.org/build/233247509 at 2023-09-02 - relacion # failure in job https://hydra.nixos.org/build/233241624 at 2023-09-02 - relation # failure in job https://hydra.nixos.org/build/233244581 at 2023-09-02 - - releaser # failure in job https://hydra.nixos.org/build/233239420 at 2023-09-02 - relevant-time # failure in job https://hydra.nixos.org/build/233190794 at 2023-09-02 - reload # failure in job https://hydra.nixos.org/build/233212925 at 2023-09-02 - remark # failure in job https://hydra.nixos.org/build/233240981 at 2023-09-02 @@ -5893,6 +5903,7 @@ broken-packages: - vty-examples # failure in job https://hydra.nixos.org/build/233235872 at 2023-09-02 - vty-menu # failure in job https://hydra.nixos.org/build/233232391 at 2023-09-02 - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 + - vty-unix # failure in job https://hydra.nixos.org/build/241443107 at 2023-11-19 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - wai-git-http # failure in job https://hydra.nixos.org/build/233191513 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b500247fd090d..eb323003ef345 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -60,6 +60,9 @@ default-package-overrides: # hls-floskell-plugin 2.4 does not yet support floskell 0.11 - floskell < 0.11 + # Newer daemons requires GHC 9.6 + - daemons == 0.3.0 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -103,6 +106,7 @@ extra-packages: - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4 - ghc-lib-parser-ex == 9.6.* # 2023-10-24: preserve for GHC 9.6 + - ghc-syntax-highlighter == 0.0.10.* # 2023-11-20: - gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages) - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x @@ -114,6 +118,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - http2 < 3.3 # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5> @@ -127,7 +132,9 @@ extra-packages: - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 + - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 + - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 @@ -666,6 +673,7 @@ unsupported-platforms: netlink: [ platforms.darwin ] notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu oculus: [ platforms.darwin ] + ostree-pin: [ platforms.darwin ] # depends on gi-ostree pam: [ platforms.darwin ] parport: [ platforms.darwin ] persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 @@ -678,6 +686,7 @@ unsupported-platforms: reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] reflex-dom: [ platforms.darwin ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] + rsi-break: [ platforms.darwin ] # depends on monomer rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] SDL-mixer: [ platforms.darwin ] # depends on mesa @@ -774,6 +783,7 @@ supported-platforms: systemd-api: [ platforms.linux ] tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] + vty-windows: [ platforms.windows ] # depends on Win32 Win32-console: [ platforms.windows ] Win32-dhcp-server: [ platforms.windows ] Win32-errors: [ platforms.windows ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8be7c0fe44f32..c93590d0980c5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 21.16 +# Stackage LTS 21.19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -134,7 +134,7 @@ default-package-overrides: - aws-xray-client-wai ==0.1.0.2 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.9 - - barbies ==2.0.4.0 + - barbies ==2.0.5.0 - base16 ==0.3.2.1 - base16-bytestring ==1.0.2.0 - base32 ==0.3.1.0 @@ -161,7 +161,7 @@ default-package-overrides: - bech32 ==1.1.3 - bech32-th ==1.1.1 - bench ==1.0.12 - - benchpress ==0.2.2.22 + - benchpress ==0.2.2.23 - bencode ==0.6.1.1 - bencoding ==0.4.5.4 - benri-hspec ==0.1.0.1 @@ -267,14 +267,14 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.7 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.10 + - bytestring-tree-builder ==0.2.7.11 - bytestring-trie ==0.2.7.2 - bz2 ==1.0.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.3 - c2hs ==0.28.8 - cabal2spec ==2.7.0 - - cabal-appimage ==0.4.0.1 + - cabal-appimage ==0.4.0.2 - cabal-clean ==0.2.20230609 - cabal-doctest ==1.0.9 - cabal-file ==0.1.1 @@ -319,13 +319,13 @@ default-package-overrides: - character-cases ==0.1.0.6 - charset ==0.3.10 - charsetdetect-ae ==1.1.0.4 - - Chart ==1.9.4 - - Chart-diagrams ==1.9.4 + - Chart ==1.9.5 + - Chart-diagrams ==1.9.5.1 - ChasingBottoms ==1.3.1.12 - check-email ==1.0.2 - checkers ==0.6.0 - checksum ==0.0.0.1 - - chimera ==0.3.3.0 + - chimera ==0.3.4.0 - choice ==0.2.3 - chronologique ==0.3.1.3 - chronos ==1.1.5.1 @@ -356,7 +356,7 @@ default-package-overrides: - cointracking-imports ==0.1.0.2 - collect-errors ==0.1.5.0 - co-log-concurrent ==0.5.1.0 - - co-log-core ==0.3.2.0 + - co-log-core ==0.3.2.1 - colonnade ==1.2.0.2 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 @@ -371,15 +371,15 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.3 - - commonmark-extensions ==0.2.3.6 + - commonmark ==0.2.4 + - commonmark-extensions ==0.2.4 - commonmark-pandoc ==0.2.1.3 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.1 - comonad ==5.0.8 - comonad-extras ==4.0.1 - compactmap ==0.1.4.3 - - compdata ==0.13.0 + - compdata ==0.13.1 - compensated ==0.8.3 - compiler-warnings ==0.1.0 - componentm ==0.0.0.2 @@ -422,7 +422,7 @@ default-package-overrides: - context-wai-middleware ==0.2.0.2 - contiguous ==0.6.3.0 - contravariant ==1.5.5 - - contravariant-extras ==0.3.5.3 + - contravariant-extras ==0.3.5.4 - control-bool ==0.2.1 - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 @@ -587,7 +587,7 @@ default-package-overrides: - digits ==0.3.1 - di-handle ==1.0.1 - dimensional ==1.5 - - di-monad ==1.3.2 + - di-monad ==1.3.5 - directory-tree ==0.12.1 - direct-sqlite ==2.3.28 - dirichlet ==0.1.0.7 @@ -614,7 +614,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1.1.1 - doctest-lib ==0.1 - - doctest-parallel ==0.3.0.1 + - doctest-parallel ==0.3.1 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.4 @@ -701,7 +701,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.13 - - esqueleto ==3.5.10.3 + - esqueleto ==3.5.11.0 - event-list ==0.1.2.1 - eventstore ==1.4.2 - every ==0.0.1 @@ -778,7 +778,7 @@ default-package-overrides: - fixed-vector ==1.2.2.1 - fixed-vector-hetero ==0.6.1.1 - fix-whitespace ==0.0.11 - - flac ==0.2.0 + - flac ==0.2.1 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 - flat ==0.6 @@ -791,7 +791,7 @@ default-package-overrides: - fmlist ==0.9.4 - fmt ==0.6.3.0 - fn ==0.3.0.2 - - focus ==1.0.3.1 + - focus ==1.0.3.2 - focuslist ==0.1.1.0 - foldable1-classes-compat ==0.1 - fold-debounce ==0.2.0.11 @@ -936,7 +936,7 @@ default-package-overrides: - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 - - gitlab-haskell ==1.0.0.1 + - gitlab-haskell ==1.0.0.3 - gitlib ==3.1.3 - gitrev ==1.3.1 - gi-vte ==2.91.31 @@ -1021,7 +1021,7 @@ default-package-overrides: - haskoin-node ==0.18.1 - haskoin-store-data ==0.65.5 - hasktags ==0.72.0 - - hasql ==1.6.3.2 + - hasql ==1.6.3.3 - hasql-dynamic-statements ==0.3.1.2 - hasql-implicits ==0.1.1 - hasql-interpolate ==0.1.0.4 @@ -1056,7 +1056,7 @@ default-package-overrides: - hedgehog-quickcheck ==0.1.1 - hedis ==0.15.2 - hedn ==0.3.0.4 - - heist ==1.1.1.1 + - heist ==1.1.1.2 - here ==1.2.14 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.7 @@ -1075,11 +1075,11 @@ default-package-overrides: - hindent ==6.0.0 - hinfo ==0.0.3.0 - hinotify ==0.4.1 - - hint ==0.9.0.7 + - hint ==0.9.0.8 - histogram-fill ==0.9.1.0 - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - - hkgr ==0.4.3.1 + - hkgr ==0.4.3.2 - hledger ==1.30.1 - hledger-interest ==1.6.6 - hledger-lib ==1.30 @@ -1116,7 +1116,7 @@ default-package-overrides: - hpp ==0.6.5 - hpqtypes ==1.11.1.1 - hpqtypes-extras ==1.16.4.4 - - hreader ==1.1.0 + - hreader ==1.1.1 - hreader-lens ==0.1.3.0 - hruby ==0.5.0.0 - hsass ==0.8.0 @@ -1167,7 +1167,7 @@ default-package-overrides: - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.1.0.2 - hspec-leancheck ==0.0.6 - - hspec-megaparsec ==2.2.0 + - hspec-megaparsec ==2.2.1 - hspec-meta ==2.10.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 @@ -1181,10 +1181,10 @@ default-package-overrides: - HSvm ==0.1.1.3.25 - hsx2hs ==0.14.1.11 - hsx-jmacro ==7.3.8.2 - - HsYAML ==0.2.1.2 + - HsYAML ==0.2.1.3 - HsYAML-aeson ==0.2.0.1 - hsyslog ==5.0.2 - - htaglib ==1.2.0 + - htaglib ==1.2.1 - HTF ==0.15.0.1 - html ==1.0.1.2 - html-conduit ==1.3.2.2 @@ -1197,7 +1197,7 @@ default-package-overrides: - HTTP ==4000.4.1 - http-api-data ==0.5 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.14 + - http-client ==0.7.15 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.0.5 @@ -1208,12 +1208,12 @@ default-package-overrides: - http-directory ==0.1.10 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - - http-io-streams ==0.1.6.2 + - http-io-streams ==0.1.6.3 - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - http-reverse-proxy ==0.6.0.1 - - http-streams ==0.8.9.8 + - http-streams ==0.8.9.9 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1333,7 +1333,7 @@ default-package-overrides: - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - isocline ==1.0.9 - - isomorphism-class ==0.1.0.10 + - isomorphism-class ==0.1.0.11 - iterable ==3.0 - ix-shapable ==0.1.0 - jack ==0.7.2.2 @@ -1342,7 +1342,7 @@ default-package-overrides: - jira-wiki-markup ==1.5.1 - jl ==0.1.0 - jmacro ==0.6.18 - - jose ==0.10 + - jose ==0.10.0.1 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.5 - js-chart ==2.9.4.1 @@ -1388,14 +1388,14 @@ default-package-overrides: - krank ==0.3.0 - labels ==0.3.3 - lackey ==2.0.0.6 - - LambdaHack ==0.11.0.0 - - lame ==0.2.1 + - LambdaHack ==0.11.0.1 + - lame ==0.2.2 - language-avro ==0.1.4.0 - language-bash ==0.9.2 - language-c ==0.9.2 - language-c-quote ==0.13.0.1 - language-docker ==12.1.0 - - language-dot ==0.1.1 + - language-dot ==0.1.2 - language-glsl ==0.3.0 - language-java ==0.2.9 - language-javascript ==0.7.1.0 @@ -1515,7 +1515,7 @@ default-package-overrides: - matchable ==0.1.2.1 - mathexpr ==0.3.1.0 - math-extras ==0.1.1.0 - - math-functions ==0.3.4.2 + - math-functions ==0.3.4.3 - mathlist ==0.2.0.0 - matplotlib ==0.7.7 - matrices ==0.5.0 @@ -1562,7 +1562,7 @@ default-package-overrides: - mighty-metropolis ==2.0.0 - mime-mail ==0.5.1 - mime-mail-ses ==0.4.3 - - mime-types ==0.1.1.0 + - mime-types ==0.1.2.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minio-hs ==1.7.0 @@ -1619,7 +1619,7 @@ default-package-overrides: - mongoDB ==2.7.1.2 - monoidal-containers ==0.6.4.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.4 + - monoid-subclasses ==1.2.4.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 @@ -1823,7 +1823,7 @@ default-package-overrides: - password ==3.0.2.1 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - path ==0.9.2 + - path ==0.9.5 - path-binary-instance ==0.1.0.1 - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 @@ -1848,7 +1848,7 @@ default-package-overrides: - pdf-toolbox-content ==0.1.1 - pdf-toolbox-core ==0.1.1 - pdf-toolbox-document ==0.1.2 - - peano ==0.1.0.1 + - peano ==0.1.0.2 - pedersen-commitment ==0.2.0 - pem ==0.2.4 - percent-format ==0.0.4 @@ -1921,7 +1921,7 @@ default-package-overrides: - posix-pty ==0.2.2 - possibly ==1.0.0.0 - postgres-options ==0.2.1.0 - - postgresql-binary ==0.13.1 + - postgresql-binary ==0.13.1.1 - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.7 @@ -1956,7 +1956,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1.8 + - primitive-extras ==0.10.1.10 - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.2 - primitive-unlifted ==0.1.3.1 @@ -1985,17 +1985,17 @@ default-package-overrides: - proxied ==0.3.1 - psql-helpers ==0.1.0.0 - PSQueue ==1.2.0 - - psqueues ==0.2.7.3 + - psqueues ==0.2.8.0 - pthread ==0.2.1 - ptr ==0.16.8.4 - ptr-poker ==0.1.2.13 - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.15.0.0 - - pusher-http-haskell ==2.1.0.16 + - pusher-http-haskell ==2.1.0.17 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - - PyF ==0.11.1.1 + - PyF ==0.11.2.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.9 @@ -2048,7 +2048,7 @@ default-package-overrides: - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.0.3 - - Rattus ==0.5.1 + - Rattus ==0.5.1.1 - rawfilepath ==1.0.1 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -2067,7 +2067,7 @@ default-package-overrides: - rec-def ==0.2.2 - record-dot-preprocessor ==0.2.16 - record-hasfield ==1.0 - - recursion-schemes ==5.2.2.4 + - recursion-schemes ==5.2.2.5 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 @@ -2284,7 +2284,7 @@ default-package-overrides: - simple-expr ==0.1.1.0 - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - - simple-prompt ==0.2.1 + - simple-prompt ==0.2.2 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 @@ -2299,7 +2299,7 @@ default-package-overrides: - singletons-th ==3.1.1 - Sit ==0.2022.3.18 - sitemap-gen ==0.1.0.0 - - size-based ==0.1.3.1 + - size-based ==0.1.3.2 - sized ==1.1.0.0 - skein ==1.0.9.4 - skews ==0.1.0.3 @@ -2311,7 +2311,7 @@ default-package-overrides: - skylighting-format-context ==0.1.0.2 - skylighting-format-latex ==0.1 - slack-progressbar ==0.1.0.1 - - slave-thread ==1.1.0.2 + - slave-thread ==1.1.0.3 - slick ==1.2.1.0 - slist ==0.2.1.0 - slynx ==0.7.2.2 @@ -2376,10 +2376,10 @@ default-package-overrides: - stitch ==0.6.0.0 - stm-chans ==3.0.0.9 - stm-conduit ==4.0.1 - - stm-containers ==1.2.0.2 + - stm-containers ==1.2.0.3 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.13 + - stm-hamt ==1.2.0.14 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.7 - stm-split ==0.0.2.1 @@ -2410,7 +2410,7 @@ default-package-overrides: - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - strict-list ==0.1.7.2 - - strict-tuple ==0.1.5.2 + - strict-tuple ==0.1.5.3 - strict-wrapper ==0.0.0.0 - stringable ==0.1.3 - stringbuilder ==0.5.1 @@ -2512,7 +2512,7 @@ default-package-overrides: - tasty-program ==1.1.0 - tasty-quickcheck ==0.10.2 - tasty-rerun ==1.1.19 - - tasty-silver ==3.3.1.2 + - tasty-silver ==3.3.1.3 - tasty-smallcheck ==0.8.2 - tasty-tap ==0.1.0 - tasty-th ==0.1.7 @@ -2523,17 +2523,17 @@ default-package-overrides: - teardown ==0.5.0.1 - telegram-bot-api ==6.7.1 - telegram-bot-simple ==0.12 - - template-haskell-compat-v0208 ==0.1.9.2 + - template-haskell-compat-v0208 ==0.1.9.3 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 - tensors ==0.1.5 - - termbox ==1.1.0.1 + - termbox ==1.1.0.2 - termbox-banana ==1.0.0 - termbox-bindings-c ==0.1.0 - termbox-bindings-hs ==0.1.0 - - termbox-tea ==0.1.0 + - termbox-tea ==0.1.0.1 - terminal-progress-bar ==0.4.2 - terminal-size ==0.3.4 - termonad ==4.5.0.0 @@ -2545,7 +2545,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8.3 + - texmath ==0.12.8.4 - text-ansi ==0.2.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7 @@ -2789,7 +2789,7 @@ default-package-overrides: - vector-stream ==0.1.0.0 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==6.0.2 + - versions ==6.0.3 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -2834,7 +2834,7 @@ default-package-overrides: - warp ==3.3.25 - warp-tls ==3.3.6 - warp-tls-uid ==0.2.0.6 - - wave ==0.2.0 + - wave ==0.2.1 - wcwidth ==0.0.2 - webdriver ==0.11.0.0 - webex-teams-api ==0.2.0.1 @@ -2852,7 +2852,7 @@ default-package-overrides: - websockets ==0.12.7.3 - weigh ==0.0.16 - welford-online-mean-variance ==0.2.0.0 - - wide-word ==0.1.5.0 + - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==1.2.0.2 @@ -2925,10 +2925,10 @@ default-package-overrides: - yesod-auth ==1.6.11.2 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.1.1 + - yesod-auth-oauth2 ==0.7.1.2 - yesod-auth-oidc ==0.1.4 - yesod-bin ==1.6.2.2 - - yesod-core ==1.6.24.5 + - yesod-core ==1.6.25.0 - yesod-eventsource ==1.6.0.1 - yesod-fb ==0.6.1 - yesod-form ==1.7.6 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9eaabf6c8a137..e3525ba907601 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -121,11 +121,8 @@ dont-distribute-packages: - Forestry - FormalGrammars - Foster - - Frames - - Frames-beam - Frames-dsv - Frames-map-reduce - - Frames-streamly - Frank - GLFW-OGL - GLFW-task @@ -706,6 +703,7 @@ dont-distribute-packages: - borel - both - breakout + - brick_2_1_1 - bricks - bricks-internal-test - bricks-parsec @@ -1019,6 +1017,8 @@ dont-distribute-packages: - curryer-rpc - cv-combinators - cypher + - dahdit-network + - dahdit-test - daino - dapi - darcs-benchmark @@ -1726,6 +1726,7 @@ dont-distribute-packages: - gogol-youtube-reporting - google-drive - google-mail-filters + - google-maps-geocoding - googleplus - gore-and-ash-actor - gore-and-ash-async @@ -2031,7 +2032,7 @@ dont-distribute-packages: - hesql - heterolist - hetzner - - hetzner_0_5_0_0 + - hetzner_0_6_0_0 - hevolisa - hevolisa-dph - hexpat-conduit @@ -2173,6 +2174,9 @@ dont-distribute-packages: - hsql-odbc - hsql-postgresql - hsql-sqlite3 + - hsqml-datamodel-vinyl + - hsqml-demo-morris + - hsqml-morris - hsreadability - hssqlppp-th - hstar @@ -2678,6 +2682,12 @@ dont-distribute-packages: - micro-gateway - microformats2-types - midimory + - mig + - mig-client + - mig-extra + - mig-server + - mig-swagger-ui + - mig-wai - mighttpd - minecraft-data - minesweeper @@ -2810,6 +2820,7 @@ dont-distribute-packages: - named-servant-client - named-servant-server - nanq + - national-australia-bank - nats-queue - natural-number - nemesis-titan @@ -3504,6 +3515,7 @@ dont-distribute-packages: - selda-sqlite - selenium-server - semantic-source + - semantic-version - semi-iso - semialign-extras - semiring @@ -4103,6 +4115,7 @@ dont-distribute-packages: - voicebase - vorbiscomment - vpq + - vty-crossplatform - vty-ui-extras - waargonaut - wahsp diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7001e4220bae8..1819b29da460c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -811,5 +811,18 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != []) { inherit postPhases; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } + +# Implicit pointer to integer conversions are errors by default since clang 15. +# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; +} + +# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`. +# Works around https://github.com/NixOS/nixpkgs/issues/166205. +# This can be dropped once a fix has been committed to cc-wrapper. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; +} ) ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7377db003b191..2507663441ffc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2853,15 +2853,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_2_0" = callPackage + "Cabal_3_10_2_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.2.0"; - sha256 = "0nsnf14ja30vhsqf2scaqb1a4wjr8491i83nxi4r9m47m40yw8sc"; + version = "3.10.2.1"; + sha256 = "0jgm3q9dl6lrczwcc0mzqfqwxwdnk2m2lr6zkhygn2w982c651w8"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -3111,10 +3111,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.9.4"; - sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; - revision = "3"; - editedCabalFile = "0yppwi2cqy46dzasbdvq2120m8zrak1lj1qhlv5x7dzbdrji0529"; + version = "1.9.5"; + sha256 = "0nyzdag9p56vknrphdnqjsf19fmw9abs81avdm2vjgh9cnw2y7hc"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -3129,10 +3127,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.9.3"; - sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f"; - revision = "4"; - editedCabalFile = "1slarc4f1803psmikq79x81cx4kwfyhwdclyjwx4ax1xbmdh0vsx"; + version = "1.9.4.1"; + sha256 = "0x10l9y38bscx88n849k9ybn7axp4j9hlivc1jv9wwvv4gqw5jr7"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -3149,10 +3145,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.9.4"; - sha256 = "0rkkmyfszzpnbw1s6lqg2fadkbvgqrxrp1rvj9v45ihzwnpbg758"; - revision = "1"; - editedCabalFile = "11q3hx4fprmkjp0v4m2c2fzvwqym5aa9wv2lbbr6vxq0wnigp7zz"; + version = "1.9.5.1"; + sha256 = "1pk2fsmjl2dsabzpdwk3190nw0nwy581c4qsl93npx764qcxkp7q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -3238,21 +3232,20 @@ self: { , Chart-diagrams, Chart-gtk, colour, containers, data-default-class , diagrams-cairo, diagrams-core, diagrams-lib, diagrams-postscript , diagrams-svg, doctest, gtk, lens, mtl, old-locale, old-time - , random, svg-builder, time + , QuickCheck, random, svg-builder, time, vector }: mkDerivation { pname = "Chart-tests"; - version = "1.9.3"; - sha256 = "1xhjd400xf235m345mhn98hjrvvv5qdr90paq4kixh2g0aswnhrd"; - revision = "2"; - editedCabalFile = "1i8dxpy504mnf7phg40i5v1p31hbj5xdx0ldz5a5y6irjwy9mawf"; + version = "1.9.4"; + sha256 = "1sy31dl4mwm25ajpgr0pgkr85py5raf7h76bnz06ybygjbnmc4fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring cairo Chart Chart-cairo Chart-diagrams Chart-gtk colour containers data-default-class diagrams-cairo diagrams-core diagrams-lib diagrams-postscript diagrams-svg gtk - lens mtl old-locale old-time random svg-builder time + lens mtl old-locale old-time QuickCheck random svg-builder time + vector ]; testHaskellDepends = [ base doctest ]; description = "Tests of the Charts library"; @@ -4756,6 +4749,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "Diff_0_5" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.5"; + sha256 = "0la5npl3zglzbsnlbksp0s6khb79cm6hbdxhy29sd3xivzg89k03"; + revision = "1"; + editedCabalFile = "1fxg0ibi80dq68draxfh1p0n4mkmyn7gm0b51jwpkq6rx8p9g2lw"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "Diff algorithm in pure Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "DifferenceLogic" = callPackage ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }: mkDerivation { @@ -6671,16 +6684,16 @@ self: { "Frames" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , contravariant, criterion, deepseq, directory, discrimination - , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes + , foldl, ghc-prim, hashable, hspec, HUnit, lens, pipes , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty , primitive, readable, regex-applicative, template-haskell - , temporary, text, transformers, unordered-containers, vector - , vector-th-unbox, vinyl + , temporary, text, tomland, transformers, unordered-containers + , validation-selective, vector, vector-th-unbox, vinyl }: mkDerivation { pname = "Frames"; - version = "0.7.3"; - sha256 = "0pn2i7qbjbmnzvj2ns3sh2m8i1yhc5w0y6lbzc4dsn2lqv5zpi0c"; + version = "0.7.4.2"; + sha256 = "0211qph0yc79al3dp43m12wnd5hxg9cpap0d5xh124zmaji0dq1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6690,14 +6703,13 @@ self: { vector vector-th-unbox vinyl ]; testHaskellDepends = [ - attoparsec base bytestring directory foldl hspec htoml HUnit lens - pipes pretty regex-applicative template-haskell temporary text - unordered-containers vinyl + attoparsec base bytestring directory foldl hspec HUnit lens pipes + pretty regex-applicative template-haskell temporary text tomland + unordered-containers validation-selective vinyl ]; benchmarkHaskellDepends = [ base criterion pipes transformers ]; - description = "Data frames For working with tabular data files"; + description = "Data frames for working with tabular data files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "Frames-beam" = callPackage @@ -6722,6 +6734,7 @@ self: { description = "A library for accessing Postgres tables as in-memory data structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Frames-dsv" = callPackage @@ -6802,6 +6815,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "Demo"; + broken = true; }) {}; "Frank" = callPackage @@ -9731,8 +9745,8 @@ self: { pname = "HStringTemplate"; version = "0.8.8"; sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; - revision = "5"; - editedCabalFile = "14hl3nz13sdqyh4650wf4wh94c1kh8hrq2hxq9ykbippn10c3wlc"; + revision = "6"; + editedCabalFile = "1pwsga0ymdmd5ig9nzy3z4z61d0blgnybll7ik409x1wc4y2w692"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -11377,27 +11391,6 @@ self: { }: mkDerivation { pname = "HsYAML"; - version = "0.2.1.2"; - sha256 = "1k8azk85jqwqcfbw9bcpj3vqy3y0xd525c9pwm2hjppna8jkxm86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq mtl parsec text transformers - ]; - testHaskellDepends = [ - base bytestring containers mtl QuickCheck tasty tasty-quickcheck - text - ]; - description = "Pure Haskell YAML 1.2 processor"; - license = lib.licenses.gpl2Only; - }) {}; - - "HsYAML_0_2_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec - , QuickCheck, tasty, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HsYAML"; version = "0.2.1.3"; sha256 = "144xixvi6nfhg1rjq5aglj0vmvpf482rxzn5vlv19n4gbfnaj9p0"; isLibrary = true; @@ -11411,7 +11404,6 @@ self: { ]; description = "Pure Haskell YAML 1.2 processor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "HsYAML-aeson" = callPackage @@ -12208,6 +12200,8 @@ self: { pname = "JuicyPixels"; version = "3.3.8"; sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; + revision = "1"; + editedCabalFile = "1gbmls58qdlip8nsysy1qsnf7wrw8cgss7i7vmbxxnf9ni0iawn9"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -12926,8 +12920,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.11.0.0"; - sha256 = "19dmcbx0clzmblk3kh367dx3bbvmargjq1zkjhy2i1ixfpfcs9jm"; + version = "0.11.0.1"; + sha256 = "1qmjcz59qcvfwqpqqfy6xqmzkqx415xr5y5sdvrk0g8l8kdi30bm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17163,8 +17157,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.11.1.1"; - sha256 = "091k5lk0yd1nf4k25fb6948x2cxq0b3k8c0vpy9wwyrmyfcp0q7k"; + version = "0.11.2.1"; + sha256 = "02i2h8dj228w0d4vsjrllrc25hgmx7wys2jzlgq61z13jddc8rg8"; libraryHaskellDepends = [ base bytestring ghc mtl parsec template-haskell text time ]; @@ -17665,6 +17659,8 @@ self: { pname = "RSA"; version = "2.4.1"; sha256 = "0hchsqrxpfw7mqrqwscfy8ig1w2di6w3nxpzi873w0gibv2diibj"; + revision = "2"; + editedCabalFile = "090yzm99fmh7c6z4m9hbkasqhc3xlw104g2b6wnk77n1abd13ryj"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types SHA ]; @@ -17869,23 +17865,6 @@ self: { }) {}; "Rattus" = callPackage - ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space, transformers - }: - mkDerivation { - pname = "Rattus"; - version = "0.5.1"; - sha256 = "1bj5ca55s9b9dgv9svc082zplbcxgaj33ybh1kybx01qxa2phh74"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space transformers - ]; - testHaskellDepends = [ base containers ]; - description = "A modal FRP language"; - license = lib.licenses.bsd3; - }) {}; - - "Rattus_0_5_1_1" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, simple-affine-space , transformers }: @@ -17900,7 +17879,6 @@ self: { testHaskellDepends = [ base containers ]; description = "A modal FRP language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -22100,8 +22078,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "WeakSets"; - version = "1.5.0.0"; - sha256 = "1h6n8z1f097rgzymx4ivqbkwiv7c9ignkpbybp342rw3k6cd7rk3"; + version = "1.6.1.0"; + sha256 = "0i8n2cmh1fdi2x18lpq8fpzcdnjpa186s27ilfm6sprg5l8nhfqx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Simple set types. Useful to create sets of arbitrary types and nested sets."; @@ -22540,8 +22518,8 @@ self: { pname = "Workflow"; version = "0.8.3"; sha256 = "08r1s840771z1gy44dj3xc6ary7gk3ka3zvji5pmgzi998x4p6y8"; - revision = "1"; - editedCabalFile = "0jy6hn1lx9wpq44ld96msgb6a2hb6cvryn1a39b4rq4iy3m45r8v"; + revision = "2"; + editedCabalFile = "0ijq5nxvlwzw9lpwi7r281mjlwkb7mpp6f318fij9g2hk034z0j7"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions extensible-exceptions mtl old-time RefSerialize stm TCache vector @@ -26653,8 +26631,8 @@ self: { }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.2.2"; - sha256 = "1p2w19gmlrcdsni7dj2bs3ajzn8a5460gwas97yl930gwiwivyif"; + version = "0.0.2.3"; + sha256 = "16yb6q4yaw3spwvcyd2vrdfsrdgib6cjbi2yjh8afdr4866afpik"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26820,8 +26798,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.1"; sha256 = "06x1l0a0dvzf8n2xmqny5qpsgdsl03xlh2z9x7wdxiykl8p4xd24"; - revision = "3"; - editedCabalFile = "11srm7kkslnicqvbk728kzpy58am8rz680f7l6axn2nfh5ykx8n6"; + revision = "4"; + editedCabalFile = "0yz6nml8lnd94iks9m0ma7x3sjs17djqh9h6krr52ikg69c4j2cy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27074,23 +27052,25 @@ self: { }) {}; "agda2hs" = callPackage - ({ mkDerivation, Agda, base, containers, deepseq, directory - , filepath, haskell-src-exts, mtl, syb, text, unordered-containers + ({ mkDerivation, Agda, base, bytestring, containers, deepseq + , directory, filepath, haskell-src-exts, mtl, process, syb, text + , unordered-containers, yaml-light }: mkDerivation { pname = "agda2hs"; - version = "1.0"; - sha256 = "1r2ac4sqm86w88hk3fwkv0zviv7zy9nykw6cayg0240k1sw6j4qb"; + version = "1.1"; + sha256 = "1wwrvsbpa0hmmqv5d4k348v3j67v46qv8hyx31y01ycxlz2dz72v"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - Agda base containers deepseq directory filepath haskell-src-exts - mtl syb text unordered-containers + Agda base bytestring containers deepseq directory filepath + haskell-src-exts mtl process syb text unordered-containers + yaml-light ]; description = "Compiling Agda code to readable Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "agda2hs"; broken = true; }) {}; @@ -27166,8 +27146,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "agreeing"; - version = "0.2.0.0"; - sha256 = "1zhxzhxhqanchr64rkbwzrn9q7lhmylsggf6ax0zai0zg9sk56yc"; + version = "0.2.2.0"; + sha256 = "07db486ki3bd9cn57icnhb53497a8i2vzw9p4pp5q34780p6k4i6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Idiomatic data structure for agreement"; @@ -27374,8 +27354,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "6.0.0"; - sha256 = "1pqib3g333zhzpra22qxilwbw6v54dnzciqwi5668rhwnv66a8h4"; + version = "6.1"; + sha256 = "16f4vp2xfkb7y62kcb3rmfs8ksj1hrn92add446pi6lsrcrz4pk6"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -27538,8 +27518,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "6.0.0"; - sha256 = "1fr6zrf401sg5a8w3k0fman4d6qg9cfy9j1vsw58l5z609ma79jx"; + version = "6.1"; + sha256 = "14x2ddny5a68bm66w29nzsmvmwhxj37yf4jl60wp4h5bvf3k7s3j"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -27676,13 +27656,13 @@ self: { mainProgram = "alex"; }) {}; - "alex_3_4_0_0" = callPackage + "alex_3_4_0_1" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { pname = "alex"; - version = "3.4.0.0"; - sha256 = "13p3mcmjcz0sgpr5rsbw8fw492b972zh671d6ylhxi4r2gid873s"; + version = "3.4.0.1"; + sha256 = "0dlz0izzawy1x9p2xpfblkma7w20f280r44h67kfggclx3yfcf2c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -27995,8 +27975,8 @@ self: { pname = "algebraic-graphs"; version = "0.7"; sha256 = "0s75h92qb9jdfdyzh0fraxpzj0jl4xvcbqq9cwgba2k9306rl5ai"; - revision = "1"; - editedCabalFile = "1z9xls7riv3rlp1vjymvj7z64y8w0x3865d2ad2dzrwsdgzcsndf"; + revision = "2"; + editedCabalFile = "1psgkw2qcdv91cij564jzlsyx7qjs8z7y7y6lfhciilbzkzvpy3m"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -28458,8 +28438,8 @@ self: { }: mkDerivation { pname = "alphachar"; - version = "0.0.4"; - sha256 = "02r11cm50zhi0rnc251i8cfg0kb8lxanwm6472v55f8q60y9b4g0"; + version = "0.0.5"; + sha256 = "0dj1cyfp82sn8fj9zx4471fxfnnzwgfzx5y4xg8sxa719nyq7d29"; libraryHaskellDepends = [ base lens parsers semigroups ]; testHaskellDepends = [ ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty @@ -35927,6 +35907,34 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "ansi-terminal-game_1_9_2_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal + , clock, colour, containers, exceptions, file-embed, hspec + , hspec-discover, linebreak, mintty, mtl, QuickCheck, random, split + , terminal-size, timers-tick, unidecode + }: + mkDerivation { + pname = "ansi-terminal-game"; + version = "1.9.2.0"; + sha256 = "16j4da1q6vhdy90byadm4bkai4h59qxpdi00skffn3krk5wdv3hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions file-embed linebreak mintty mtl QuickCheck random split + terminal-size timers-tick unidecode + ]; + testHaskellDepends = [ + ansi-terminal array base bytestring cereal clock colour containers + exceptions file-embed hspec linebreak mintty mtl QuickCheck random + split terminal-size timers-tick unidecode + ]; + testToolDepends = [ hspec-discover ]; + description = "cross-platform library for terminal games"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "ansi-terminal-types" = callPackage ({ mkDerivation, base, colour }: mkDerivation { @@ -36725,10 +36733,8 @@ self: { }: mkDerivation { pname = "apecs-stm"; - version = "0.1.5"; - sha256 = "10zfmc1zgmw5fkrrcs0mnsb2h44b0zfn2y7w1ld47skvmz580dxp"; - revision = "1"; - editedCabalFile = "01rhwqs69bx09p2nqp9c01jhcqnfdfiisw6kck9gjq0h68j2rdib"; + version = "0.2"; + sha256 = "03r20w5q6c8z4cv8z60v66hd9w831g3qsa6n5m96mdwi6vjxh1nl"; libraryHaskellDepends = [ apecs base containers list-t stm stm-containers template-haskell vector @@ -42072,6 +42078,22 @@ self: { mainProgram = "autoexporter"; }) {}; + "autoexporter_2_0_0_9" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "2.0.0.9"; + sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "autoexporter"; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -44363,22 +44385,6 @@ self: { }: mkDerivation { pname = "barbies"; - version = "2.0.4.0"; - sha256 = "0v8bckxi58fkqgf1i1xd3100wp792pzd319xlfvmmw8z0ii1g872"; - libraryHaskellDepends = [ base distributive transformers ]; - testHaskellDepends = [ - base distributive QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Classes for working with types that can change clothes"; - license = lib.licenses.bsd3; - }) {}; - - "barbies_2_0_5_0" = callPackage - ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers - }: - mkDerivation { - pname = "barbies"; version = "2.0.5.0"; sha256 = "1j8c45k1x9vi9w44qnc8nyy0y4p97clvbq07vby7wn26zdawl8nm"; libraryHaskellDepends = [ base distributive transformers ]; @@ -44387,7 +44393,6 @@ self: { ]; description = "Classes for working with types that can change clothes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "barbies-layered" = callPackage @@ -45068,8 +45073,8 @@ self: { pname = "base64"; version = "0.4.2.4"; sha256 = "119mpqcv1rwkhwm69ga2b4f7hr825fa5wfm1w3i1szmhzh52s2k4"; - revision = "3"; - editedCabalFile = "1mcr0pp5b7xnj68m8d42pw9pgjj6p5v1p0g93s78n0nm605kl40h"; + revision = "4"; + editedCabalFile = "1lc32d5nxk0ry1pfn3ss55hi4cv6qj5nkkdn3j4y3lrdwyv7kbw2"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -45426,8 +45431,8 @@ self: { ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { pname = "basic-sop"; - version = "0.2.0.3"; - sha256 = "1aa3iwfbhqczmnnribz79nns5ppc397pwv4hx277jbfdxx0m8ks8"; + version = "0.3.0"; + sha256 = "1swyphr1vnk2nvjadvscxm5xb9vlkja0jardd8nzagfb1jm2b0f7"; libraryHaskellDepends = [ base deepseq generics-sop QuickCheck text ]; @@ -46288,8 +46293,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.4"; - sha256 = "0bdz64rq6vri2kri5c6rja6x3dn4k62d0id462ar2dxwqaj8cqjc"; + version = "0.14.5"; + sha256 = "1ai026mhk42pw96v3p0imlrz9hfnr7cv21019bkqakrc3pmc0y6n"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -46502,6 +46507,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "benc" = callPackage + ({ mkDerivation, AttoBencode, base, bencode, bencoding, bytestring + , containers, deepseq, primitive, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "benc"; + version = "0.1.0.0"; + sha256 = "1nwzd89kgzc7zcswicrv848igf7p1gpgli1pj8h1dc5jnlikz3ka"; + libraryHaskellDepends = [ + base bytestring containers primitive text transformers vector + ]; + testHaskellDepends = [ + base bytestring containers tasty tasty-hunit tasty-quickcheck text + vector + ]; + benchmarkHaskellDepends = [ + AttoBencode base bencode bencoding bytestring containers deepseq + tasty tasty-bench tasty-hunit text transformers vector + ]; + description = "Bencode encoding and decoding library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bench" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, process , silently, text, turtle @@ -46582,8 +46613,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.22"; - sha256 = "1ygyx4dc6b7qkyjvrfd55kbknp2yp8srk0lw2fwdig29qhq6m8f6"; + version = "0.2.2.23"; + sha256 = "0fys04n01484hf4gxgxkwr890d6psaphw0j4vnq82p36fa5zdjkc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -47388,6 +47419,8 @@ self: { pname = "bin"; version = "0.1.3"; sha256 = "14kd29szzpngyvibylkwh6yfyrpyhxhnjf6590kq0dkfpmrzg77v"; + revision = "1"; + editedCabalFile = "0schv2ilmkd37wsw777lx44x4nfs5pn0d7n8wkamzi8m8h0qi5l9"; libraryHaskellDepends = [ base boring dec deepseq fin hashable QuickCheck some ]; @@ -47908,8 +47941,8 @@ self: { pname = "binary-tagged"; version = "0.3.1"; sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; - revision = "3"; - editedCabalFile = "1r8bwv9jkjl7ygmyhzbh9knsfzc8sd8lvkzvh00rn7dibs0kid1q"; + revision = "4"; + editedCabalFile = "0x847prfb54pb5wz244krky58ahs698vlvj4bk5fksr5h7fzxds6"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -52731,8 +52764,8 @@ self: { pname = "bound-extras"; version = "0.0.2"; sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; - revision = "2"; - editedCabalFile = "1735mxrj5f05b3dikhj1c2vz2a5hl5plnx2wa71bizwnc6p6qa7d"; + revision = "3"; + editedCabalFile = "0b5zywbbps0j7m3cndgwvg8d8kgcyvi4rnmnv2shavlhwnjlbawa"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -53253,6 +53286,8 @@ self: { pname = "brick"; version = "1.9"; sha256 = "023fmgq8bgv05jpsr5saisz1jpkimkjycm1xza9gx5sxf6z6sjz3"; + revision = "1"; + editedCabalFile = "07kpxpxizmifl7jpavv6ahars3hm7jbs93i2hl81ri93h6ac69i1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53267,25 +53302,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_1_10" = callPackage + "brick_2_1_1" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , data-clist, deepseq, directory, exceptions, filepath, microlens , microlens-mtl, microlens-th, mtl, QuickCheck, stm - , template-haskell, text, text-zipper, unix, vector, vty, word-wrap + , template-haskell, text, text-zipper, unix-compat, vector, vty + , vty-crossplatform, vty-unix, word-wrap }: mkDerivation { pname = "brick"; - version = "1.10"; - sha256 = "13s5vy5q450v4aynf35sdhl9idnyy96gz27x869yfrqpghb0q6br"; + version = "2.1.1"; + sha256 = "07mk68sw5bl333lv5lrnnnf1c9d80rd4cmaspxn3xsrhf5phsa1h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap bytestring config-ini containers data-clist deepseq directory exceptions filepath microlens microlens-mtl microlens-th - mtl stm template-haskell text text-zipper unix vector vty word-wrap + mtl stm template-haskell text text-zipper unix-compat vector vty + vty-crossplatform word-wrap ]; testHaskellDepends = [ - base containers microlens QuickCheck vector vty + base containers microlens QuickCheck vector vty vty-unix ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; @@ -53352,8 +53389,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.6"; - sha256 = "0m4m6sw4fhfy75dirnwchg3jr175d9c7splkhfkb6p4i8995m5kl"; + version = "0.1.1.8"; + sha256 = "0zaqyhvzw5mw5xj3n71578nslg5h3i5k354xck3f2si2sp73kzxm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -53425,8 +53462,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.4"; - sha256 = "1mjwzkh6236y09h8xqzcgddypyipr2h8b4x308lh51cqb07rjczq"; + version = "2.2.0.6"; + sha256 = "1ba3g0qx0hgybj9yiy7afrxfj6nyfqqhj8pwf7lcb5jpm5sqn91d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53923,8 +53960,8 @@ self: { pname = "bsb-http-chunked"; version = "0.0.0.4"; sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; - revision = "3"; - editedCabalFile = "15hg352id2f4x0dnvv47bdiz6gv5hp5a2mki9yzmhc7ajpk31mdd"; + revision = "4"; + editedCabalFile = "0fx431lgf3mhlg4fg9yqs49c43pwrypf4mdi7vx3q78vqdqp7khw"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ attoparsec base blaze-builder bytestring doctest hedgehog tasty @@ -54818,6 +54855,27 @@ self: { license = lib.licenses.mit; }) {}; + "burrito_2_0_1_7" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.7"; + sha256 = "1b7xijr8ry4q1k3ix2nzbrvaiwrk4gdzbl79kxl3d7s2zxgnngww"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -55910,27 +55968,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.10"; - sha256 = "0g9npnp691v34yyfhsz95r8jahvnxdcadv0xl8amq36n9hi2la19"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_11" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -55946,7 +55983,6 @@ self: { benchmarkHaskellDepends = [ base-prelude bytestring criterion ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -56472,8 +56508,8 @@ self: { ({ mkDerivation, base, Cabal, filepath }: mkDerivation { pname = "cabal-appimage"; - version = "0.4.0.1"; - sha256 = "1fk5dz1gnd5rkf58m9m1ynildmajv1if3ymr2xg2gylvnygwr4rn"; + version = "0.4.0.2"; + sha256 = "0hgf5zbidg0nwiyxiskjxpn1dll6zabry4miy06awqwx8zjf24hn"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; license = lib.licenses.agpl3Only; @@ -57065,35 +57101,32 @@ self: { }) {}; "cabal-install" = callPackage - ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, Cabal-described, cabal-install-solver - , Cabal-QuickCheck, Cabal-syntax, Cabal-tree-diff, containers - , cryptohash-sha256, directory, echo, edit-distance, exceptions - , filepath, hackage-security, hashable, HTTP, lukko, mtl - , network-uri, parsec, pretty, pretty-show, process, QuickCheck - , random, regex-base, regex-posix, resolv, safe-exceptions, stm - , tagged, tar, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unix, zlib + ({ mkDerivation, array, async, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, Cabal-described + , cabal-install-solver, Cabal-QuickCheck, Cabal-syntax + , Cabal-tree-diff, containers, cryptohash-sha256, directory, echo + , edit-distance, exceptions, filepath, hackage-security, hashable + , HTTP, lukko, mtl, network-uri, parsec, pretty, pretty-show + , process, QuickCheck, random, regex-base, regex-posix, resolv + , safe-exceptions, stm, tagged, tar, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.10.1.0"; - sha256 = "13c3qx0qw7kizaj2dpgl2y3pj86pgqvmkck20w726jalamlf6pcr"; - revision = "1"; - editedCabalFile = "0h1ra9kw7mk70202whiphbdyvknm7jbhqhkgw4h8abb1sgffhs3n"; + version = "3.10.2.1"; + sha256 = "0i42ky2p12cnrsx9fljfbcgdri3xbpzgj0xg4prdfh1dyz2j0dnm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - cabal-install-solver Cabal-syntax containers cryptohash-sha256 - directory echo edit-distance exceptions filepath hackage-security - hashable HTTP lukko mtl network-uri parsec pretty process random - regex-base regex-posix resolv safe-exceptions stm tar text time - unix zlib - ]; - executableHaskellDepends = [ - base Cabal Cabal-syntax directory filepath + array async base base16-bytestring base64-bytestring binary + bytestring Cabal cabal-install-solver Cabal-syntax containers + cryptohash-sha256 directory echo edit-distance exceptions filepath + hackage-security hashable HTTP lukko mtl network-uri parsec pretty + process random regex-base regex-posix resolv safe-exceptions stm + tar text time unix zlib ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ array base bytestring Cabal Cabal-described cabal-install-solver Cabal-QuickCheck Cabal-syntax Cabal-tree-diff containers directory @@ -57232,17 +57265,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "cabal-install-solver_3_10_1_0" = callPackage + "cabal-install-solver_3_10_2_1" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax , containers, edit-distance, filepath, mtl, pretty, tasty , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "cabal-install-solver"; - version = "3.10.1.0"; - sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c"; - revision = "1"; - editedCabalFile = "1l3qhaiv0m2xc5vscggd2drinam1k4x0l3vfvvz15xrpvxypdv4d"; + version = "3.10.2.1"; + sha256 = "02nllpg35i44chs5hi3kmv2kisxqlh27l5vs9aips2abphl0gl4i"; libraryHaskellDepends = [ array base bytestring Cabal Cabal-syntax containers edit-distance filepath mtl pretty transformers @@ -57414,8 +57445,8 @@ self: { }: mkDerivation { pname = "cabal-plan-bounds"; - version = "0.1.5"; - sha256 = "0585mjv6vj8iggkazc53ccl8nvv35vk6m9r2y0zs47ifijdzl2f5"; + version = "0.1.5.1"; + sha256 = "11b0k5hm9hf4bnlyapb7a5r3gi1lgfn9pmsvb7b9asbkqyllf01a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57485,6 +57516,30 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-rpm_2_1_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file + , directory, extra, filepath, http-client, http-client-tls + , http-conduit, http-query, optparse-applicative, process + , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.1.4"; + sha256 = "059vqbh97cydybvbwbn5cgrpw3bx7rkizy8j0nsqfyaxjvvj8lvg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring Cabal cached-json-file directory extra + filepath http-client http-client-tls http-conduit http-query + optparse-applicative process simple-cabal simple-cmd + simple-cmd-args text time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-rpm"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58059,6 +58114,8 @@ self: { pname = "cached"; version = "0.1.0.0"; sha256 = "19x5pwcdkhmk32w9ccb2ixc73k2hhqki61yi39lahda5k86jisdv"; + revision = "1"; + editedCabalFile = "07hav3nr26pkpcvhqhgz915gsl59gx5sarmk27v5zv4682zzqzpq"; libraryHaskellDepends = [ base containers protolude shake text ]; testHaskellDepends = [ base containers directory doctest filepath protolude QuickCheck @@ -60705,30 +60762,34 @@ self: { "cattrap" = callPackage ({ mkDerivation, balkon, base, bytestring, containers, css-syntax - , fontconfig-pure, gl, GLUT, harfbuzz-pure, hspec, QuickCheck - , scientific, stylist-traits, text, unordered-containers, xml + , data-array-byte, deepseq, directory, file-embed, fontconfig-pure + , harfbuzz-pure, hspec, html-conduit, hurl, hurl-xml, network-uri + , parallel, QuickCheck, scientific, sdl2, stylist, stylist-traits + , text, unordered-containers, xml, xml-conduit, xml-conduit-stylist }: mkDerivation { pname = "cattrap"; - version = "0.2.0.0"; - sha256 = "1xl4nv2p1qcxijpvd4lgxx5qggzxf75jv2lz51yqw6wj6237c09s"; + version = "0.4.0.0"; + sha256 = "0j9pkj5lnyxmi9bvmbkaf73hfy923hz3s20lpaljh092cfw5dh31"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - balkon base bytestring containers css-syntax fontconfig-pure - harfbuzz-pure scientific stylist-traits text unordered-containers + balkon base bytestring containers css-syntax data-array-byte + deepseq fontconfig-pure harfbuzz-pure parallel scientific + stylist-traits text unordered-containers ]; executableHaskellDepends = [ - base css-syntax gl GLUT stylist-traits text xml + base bytestring containers css-syntax deepseq directory file-embed + fontconfig-pure html-conduit hurl hurl-xml network-uri sdl2 stylist + stylist-traits text xml xml-conduit xml-conduit-stylist ]; testHaskellDepends = [ - base css-syntax hspec QuickCheck stylist-traits - unordered-containers + balkon base css-syntax harfbuzz-pure hspec QuickCheck + stylist-traits unordered-containers ]; description = "Lays out boxes according to the CSS Box Model"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - mainProgram = "cattrap"; }) {}; "cautious" = callPackage @@ -60931,8 +60992,8 @@ self: { pname = "cborg-json"; version = "0.2.5.0"; sha256 = "1m3w0yyp6xb07fx04g5c52pb0b46vpkgpi32w1c8bz867x2p7hsq"; - revision = "1"; - editedCabalFile = "0zzn2p6yl9mqw7agm5w7iiz105078gv66vxr8bqazilgssqk5wyg"; + revision = "2"; + editedCabalFile = "1bd2s7dr9jl88pd2wwllb8badhshafnnkq6lmds93sxavv4i92r8"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -62057,6 +62118,18 @@ self: { broken = true; }) {}; + "character-ps" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "character-ps"; + version = "0.1"; + sha256 = "172jq74b9cs7yyyng1h2yjs1ypg7w6sk5a38j4z6s8wbwgyp3pi2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Pattern synonyms for ASCII characters for Word8, Word16 etc"; + license = lib.licenses.bsd3; + }) {}; + "charade" = callPackage ({ mkDerivation, base, configurator, containers, filepath, heist , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras @@ -62847,29 +62920,6 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, adjunctions, base, distributive, mtl, primitive - , QuickCheck, random, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, transformers, vector - }: - mkDerivation { - pname = "chimera"; - version = "0.3.3.0"; - sha256 = "1cy38pgdlgz4f1fglm70w3dlqbnd0lzpckr7j065nnpp0ljlwlpx"; - revision = "1"; - editedCabalFile = "197xa0hgf2w4yhifnkqck6biipz8ffjg61y59plamb9rjv62k0bv"; - libraryHaskellDepends = [ - adjunctions base distributive mtl primitive transformers vector - ]; - testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck - vector - ]; - benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; - description = "Lazy infinite streams with O(1) indexing and applications for memoization"; - license = lib.licenses.bsd3; - }) {}; - - "chimera_0_3_4_0" = callPackage ({ mkDerivation, adjunctions, base, distributive, infinite-list , mtl, primitive, QuickCheck, random, tasty, tasty-bench , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -62890,7 +62940,6 @@ self: { benchmarkHaskellDepends = [ base mtl random tasty tasty-bench ]; description = "Lazy infinite streams with O(1) indexing and applications for memoization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "chiphunk" = callPackage @@ -63249,6 +63298,8 @@ self: { pname = "chronos"; version = "1.1.5.1"; sha256 = "0nld5xfqgihqf2lichd5ym60knwsfp40l4mn8qg6pxvydgwdcsw8"; + revision = "1"; + editedCabalFile = "13iikpg8m61b56q8h74dhql01yb8jmc52c9chr8kkr7q6knzyw1f"; libraryHaskellDepends = [ aeson attoparsec base bytebuild byteslice bytesmith bytestring deepseq hashable natural-arithmetic primitive semigroups text @@ -64358,14 +64409,14 @@ self: { , deepseq, directory, exceptions, extra, filepath, ghc, ghc-bignum , ghc-boot, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, ghci, hashable, haskeline, lens, mtl - , primitive, process, reflection, split, template-haskell, text - , time, transformers, uniplate, unix, unordered-containers - , utf8-string, vector + , primitive, process, reflection, split, string-interpolate + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "clash-ghc"; - version = "1.6.6"; - sha256 = "0hzcqkbmpwybvi5rvzhkf3n7rdbimbqzyi1ijagfsivjvfkxs1m5"; + version = "1.8.0"; + sha256 = "1cjqm23d2977aiya81i9q1npyd4zxmbv81k4agqggdkl8h9rcn8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64374,8 +64425,8 @@ self: { exceptions extra filepath ghc ghc-bignum ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable haskeline lens mtl primitive process reflection split - template-haskell text time transformers uniplate unix - unordered-containers utf8-string vector + string-interpolate template-haskell text time transformers uniplate + unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ base ]; description = "Clash: a functional hardware description language - GHC frontend"; @@ -64388,19 +64439,20 @@ self: { , attoparsec, attoparsec-aeson, base, base16-bytestring, binary , bytestring, clash-prelude, concurrent-supply, containers , cryptohash-sha256, data-binary-ieee754, data-default, deepseq - , directory, dlist, exceptions, extra, filepath, ghc, ghc-bignum - , ghc-boot-th, ghc-typelits-knownnat, Glob, hashable - , haskell-src-exts, haskell-src-meta, hint, interpolate, lens, mtl - , ordered-containers, pretty-show, prettyprinter, primitive - , quickcheck-text, stringsearch, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, time, transformers, trifecta, unordered-containers, vector - , vector-binary-instances, yaml + , directory, dlist, doctest-parallel, exceptions, extra, filepath + , ghc, ghc-bignum, ghc-boot-th, ghc-typelits-knownnat, Glob + , hashable, haskell-src-exts, haskell-src-meta, hint, infinite-list + , lens, mtl, ordered-containers, pretty-show, prettyprinter + , prettyprinter-interp, primitive, quickcheck-text + , string-interpolate, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, temporary + , terminal-size, text, time, transformers, trifecta + , unordered-containers, vector, vector-binary-instances, yaml }: mkDerivation { pname = "clash-lib"; - version = "1.6.6"; - sha256 = "0v31cp9f6bciag31f5zdxmz1cdlk2aw3skrgam40psaxmksih6ns"; + version = "1.8.0"; + sha256 = "1f2kmgasgbpnw0gd308mhzc7qb4ng36js7l9gvk0xgm425lxavq0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64410,10 +64462,10 @@ self: { clash-prelude concurrent-supply containers cryptohash-sha256 data-binary-ieee754 data-default deepseq directory dlist exceptions extra filepath ghc ghc-bignum ghc-boot-th hashable haskell-src-meta - hint interpolate lens mtl ordered-containers pretty-show - prettyprinter primitive template-haskell temporary terminal-size - text time transformers trifecta unordered-containers vector - vector-binary-instances yaml + hint infinite-list lens mtl ordered-containers pretty-show + prettyprinter prettyprinter-interp primitive string-interpolate + template-haskell temporary terminal-size text time transformers + trifecta unordered-containers vector vector-binary-instances yaml ]; executableHaskellDepends = [ aeson attoparsec-aeson base bytestring containers deepseq directory @@ -64422,9 +64474,10 @@ self: { testHaskellDepends = [ aeson aeson-pretty attoparsec-aeson base base16-bytestring bytestring clash-prelude concurrent-supply containers data-default - deepseq ghc ghc-typelits-knownnat haskell-src-exts lens pretty-show - quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell - text transformers unordered-containers + deepseq doctest-parallel filepath ghc ghc-typelits-knownnat + haskell-src-exts lens pretty-show quickcheck-text tasty tasty-hunit + tasty-quickcheck tasty-th template-haskell text transformers + unordered-containers ]; description = "Clash: a functional hardware description language - As a library"; license = lib.licenses.bsd2; @@ -64440,8 +64493,8 @@ self: { }: mkDerivation { pname = "clash-lib-hedgehog"; - version = "1.6.6"; - sha256 = "1hnhlkimgrhcn26y78xpf4f3p5dix4qp0cjlvpp1vz1w9fl2va6v"; + version = "1.8.0"; + sha256 = "0bmlrwwm5hp67fm8a9d089fwmrcnknvd2gijriwzk1kxbvfyhynk"; libraryHaskellDepends = [ base clash-lib containers data-binary-ieee754 fakedata ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog @@ -64474,24 +64527,25 @@ self: { , data-default-class, deepseq, directory, doctest-parallel, extra , filepath, ghc-bignum, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, half, hashable - , hedgehog, hint, interpolate, lens, QuickCheck + , hedgehog, hint, infinite-list, lens, mtl, QuickCheck , quickcheck-classes-base, recursion-schemes, reflection - , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, th-abstraction, th-lift - , th-orphans, time, transformers, type-errors, uniplate, vector + , singletons, string-interpolate, tasty, tasty-hedgehog + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text + , th-abstraction, th-lift, th-orphans, time, transformers + , type-errors, uniplate, vector }: mkDerivation { pname = "clash-prelude"; - version = "1.6.6"; - sha256 = "06dwpyf4f9i2l7gqd67by3j5jjzj5wd5rs8bqbw0b718idmcga8z"; + version = "1.8.0"; + sha256 = "01psmi229lgpfc10p0p4gvpqfklwfmgvjwvqifnv77d4jbqjimiq"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise half hashable interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - th-abstraction th-lift th-orphans time transformers type-errors - uniplate vector + ghc-typelits-natnormalise half hashable infinite-list lens mtl + QuickCheck recursion-schemes reflection singletons + string-interpolate template-haskell text th-abstraction th-lift + th-orphans time transformers type-errors uniplate vector ]; testHaskellDepends = [ base bytestring deepseq doctest-parallel filepath @@ -64514,8 +64568,8 @@ self: { }: mkDerivation { pname = "clash-prelude-hedgehog"; - version = "1.6.6"; - sha256 = "0li04hy6jj92wcp9j5gr92a71w1pbzj87hv75m66i94ifj6ybq39"; + version = "1.8.0"; + sha256 = "0vll5ff7dhjx2q9xpj3q961dmhgi306w577kxfm11sccvjix2pbh"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog text @@ -66039,8 +66093,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.6"; - sha256 = "07231ywvygmkdlyy64lp3ad7m4m4mfymf9swl4j57pgwyg7dp8z5"; + version = "2.0.7"; + sha256 = "0pvpfp283pjyb4cyingc3b77yjyh76i9jv5k282hkng14am0j0wf"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -66820,27 +66874,12 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.0"; - sha256 = "1r8yq4wan48mm37p32vsym44icdx4c5dyc5wkm5vz8f4l39yv59l"; - revision = "2"; - editedCabalFile = "0zfmgjdp2hp7x9a1kma1mvn51mm4kdhvrzq450mk0ysh026xfjls"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = lib.licenses.mpl20; - }) {}; - - "co-log-core_0_3_2_1" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "co-log-core"; version = "0.3.2.1"; sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "co-log-json" = callPackage @@ -66976,8 +67015,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.5.1"; - sha256 = "0k26qzrd1j744dg5is26gmh99xawf25wzlj72wmlc56nx5rc6cfx"; + version = "0.1.5.2"; + sha256 = "1pyr9f30bc3nl777a41ddnfb78bx4y44rbrs3kcxrd5j7nn5n3gv"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers data-msgpack deepseq filepath http-conduit hyraxAbif lens linear @@ -67619,6 +67658,32 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) clp;}; + "coinor-clp_0_0_0_1" = callPackage + ({ mkDerivation, base, clp, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, linear-programming + , non-empty, QuickCheck, random, transformers, utility-ht + }: + mkDerivation { + pname = "coinor-clp"; + version = "0.0.0.1"; + sha256 = "02jrmb0fbgwzhgcnhv4hh1flz87rvs1xq3sbjrjac7cxxyl3inba"; + libraryHaskellDepends = [ + base comfort-array deepseq linear-programming non-empty QuickCheck + transformers utility-ht + ]; + libraryPkgconfigDepends = [ clp ]; + testHaskellDepends = [ + base comfort-array doctest-exitcode-stdio doctest-lib + linear-programming non-empty QuickCheck random transformers + utility-ht + ]; + description = "Linear Programming using COIN-OR/CLP and comfort-array"; + license = lib.licenses.bsd3; + badPlatforms = [ "aarch64-linux" ]; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; + }) {inherit (pkgs) clp;}; + "cointracking-imports" = callPackage ({ mkDerivation, base, base-compat-batteries, bytestring, cassava , filepath, hedgehog, lens, scientific, tasty, tasty-hedgehog @@ -68694,8 +68759,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2.3"; - sha256 = "01fr1227qlajzxbzai7msxgigqfmcc1ydhyr70asdn3wij8dwnkl"; + version = "0.2.4"; + sha256 = "0mhxk8znkjmc17dr7ssikijjgis19mrp4xwc0r1c3vki4vwwwzsm"; libraryHaskellDepends = [ base bytestring containers parsec text transformers unicode-data unicode-transforms @@ -68759,8 +68824,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.3.6"; - sha256 = "0b26h9fmr5pqv0d66az3af38ha07jkxrf5874m0k7i9ymaxwbckg"; + version = "0.2.4"; + sha256 = "1yrz32lbipzwvxmy4i3vkvs735jfd9jvlhfzh6xm2nx2rjapnx9n"; libraryHaskellDepends = [ base commonmark containers emojis filepath network-uri parsec text transformers @@ -69242,33 +69307,6 @@ self: { }: mkDerivation { pname = "compdata"; - version = "0.13.0"; - sha256 = "0lngdcswabyby3glzd8nn7cx35wl0hv1xpzc16j0bc0qfg09vkfi"; - libraryHaskellDepends = [ - base containers deepseq mtl QuickCheck template-haskell - th-expand-syns transformers tree-view - ]; - testHaskellDepends = [ - base containers deepseq HUnit mtl QuickCheck template-haskell - test-framework test-framework-hunit test-framework-quickcheck2 - th-expand-syns transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq mtl QuickCheck random - template-haskell th-expand-syns transformers uniplate - ]; - description = "Compositional Data Types"; - license = lib.licenses.bsd3; - }) {}; - - "compdata_0_13_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl - , QuickCheck, random, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, th-expand-syns - , transformers, tree-view, uniplate - }: - mkDerivation { - pname = "compdata"; version = "0.13.1"; sha256 = "001k1pd28cgbspd2n74p29hc69ch9mmkqfazki7qj17kzcaq5n2l"; revision = "1"; @@ -69288,7 +69326,6 @@ self: { ]; description = "Compositional Data Types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -71776,6 +71813,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "config-ini_0_2_7_0" = callPackage + ({ mkDerivation, base, containers, directory, hedgehog, ini + , megaparsec, text, transformers, unordered-containers + }: + mkDerivation { + pname = "config-ini"; + version = "0.2.7.0"; + sha256 = "00b9b590566hrxrjn31jkq70768dnrzzsjrasrnhdvd6p92iq5rs"; + libraryHaskellDepends = [ + base containers megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + base containers directory hedgehog ini text unordered-containers + ]; + description = "A library for simple INI-based configuration files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -72075,6 +72131,32 @@ self: { broken = true; }) {}; + "conformance" = callPackage + ({ mkDerivation, base, mtl }: + mkDerivation { + pname = "conformance"; + version = "0.1.0.0"; + sha256 = "18dzj2arhpmh6g8l7h5hd89i4v5f4001vfzcssnh5r2y29cgyljc"; + libraryHaskellDepends = [ base mtl ]; + license = lib.licenses.mit; + }) {}; + + "conformance-gen" = callPackage + ({ mkDerivation, base, conformance, genvalidity-sydtest, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "conformance-gen"; + version = "0.0.0.0"; + sha256 = "0nj4fn2x9dr2pd3cxznwlh05gn7m9279mbr0nw73qixz01vyx7mj"; + libraryHaskellDepends = [ base conformance sydtest ]; + testHaskellDepends = [ + base conformance genvalidity-sydtest sydtest + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + }) {}; + "confsolve" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio , system-filepath, text, time, unordered-containers @@ -73292,21 +73374,6 @@ self: { }: mkDerivation { pname = "contravariant-extras"; - version = "0.3.5.3"; - sha256 = "0r4bnl4gi6zd46h6fjkr33hw37rjxwwr00m08vgbzgkdp853g1ba"; - libraryHaskellDepends = [ - base contravariant template-haskell template-haskell-compat-v0208 - ]; - description = "Extras for the \"contravariant\" package"; - license = lib.licenses.mit; - }) {}; - - "contravariant-extras_0_3_5_4" = callPackage - ({ mkDerivation, base, contravariant, template-haskell - , template-haskell-compat-v0208 - }: - mkDerivation { - pname = "contravariant-extras"; version = "0.3.5.4"; sha256 = "13i9cip0qb8piib2sfq35qvb978npra2w53zvc28fxxnik9icfig"; libraryHaskellDepends = [ @@ -73314,7 +73381,6 @@ self: { ]; description = "Extras for the \"contravariant\" package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "control" = callPackage @@ -73866,8 +73932,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.16.1"; - sha256 = "1rbr9wq2ag8qzq696i833qzqhnl634dkssvvnz3ig0i0c8qai2c7"; + version = "3.17"; + sha256 = "1vam9nwkpdh43p34ni6kwjpzbdrw16d6wyq02kc2s513zkh46755"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73888,8 +73954,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.16.1"; - sha256 = "028alpcppzcpj6vhbqmay9jvpw7p2ycw5ck92330zjh03iky51lf"; + version = "3.17"; + sha256 = "1zq87sj9s7n6cgsgdz3sk9fjpkns25w8f6f2f6036f972l204vl3"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -73927,8 +73993,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.16.1"; - sha256 = "09z4ar0rip79gzf7a8bm6l2lx71y4cvh1dxpr4qjvys2mql7kb1k"; + version = "3.17"; + sha256 = "1hzvcvla69y13qwbaq52qb20hk7sln7fv7gz07n36827bp1swjbc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -73962,8 +74028,8 @@ self: { }: mkDerivation { pname = "copilot-interpreter"; - version = "3.16.1"; - sha256 = "0lklzprscm02dhd78ny5i34c7820571k78abjblcbjnwrkd6hm8h"; + version = "3.17"; + sha256 = "1ywh4pnr69dd2h3siiwgvbbs9na2l125lipd93y5lhm6ziylm3n5"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ base copilot-core copilot-prettyprinter pretty QuickCheck @@ -73981,8 +74047,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.16.1"; - sha256 = "0yvc23x49ajc0mzcxcsxkx3gyqx3jivlhcsh8898c9wf1rqkwb51"; + version = "3.17"; + sha256 = "1z4d6ryg1i47w7cj4awm9iml2fg4bsjfdxmw6zx9i8fbwifz27rs"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter copilot-theorem data-reify mtl @@ -74000,8 +74066,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.16.1"; - sha256 = "05admi6aiz96ly898wgpzxfp21h8s7q1x2fy2hb3ya5a1z6vz6r3"; + version = "3.17"; + sha256 = "1ma1yz0n2437y1yzmy9xa77y1739q6jh2203wbmdpk844yac4ki2"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -74014,8 +74080,8 @@ self: { ({ mkDerivation, base, copilot-core, pretty }: mkDerivation { pname = "copilot-prettyprinter"; - version = "3.16.1"; - sha256 = "1gacx9j3ngsv590qqx35la0n2y58898qki4hr3ynj4l63b7566m4"; + version = "3.17"; + sha256 = "1mafaidkcw1a0726drkwn6w6vvw3sxyjpg9d9hdxbqszva1hr1nw"; libraryHaskellDepends = [ base copilot-core pretty ]; description = "A prettyprinter of Copilot Specifications"; license = lib.licenses.bsd3; @@ -74045,8 +74111,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.16.1"; - sha256 = "0j8pvc0w512cnh8af3vkcdf651nbz2g84frccam24aiy38ikvnmp"; + version = "3.17"; + sha256 = "1541x96dkdndc0v2g50h27bg887bx4lxdpq8gh5sd878laqm785m"; libraryHaskellDepends = [ base bimap bv-sized containers copilot-core copilot-prettyprinter data-default directory libBF mtl panic parameterized-utils parsec @@ -74793,6 +74859,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "cozo-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, libcozo_c, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "cozo-hs"; + version = "0.1.0.0"; + sha256 = "02ylbrqcqji0mz657iia7fx7vxri20ifmhywf9fihsdrx44yrd0g"; + libraryHaskellDepends = [ aeson base bytestring text ]; + libraryPkgconfigDepends = [ libcozo_c ]; + testHaskellDepends = [ + aeson base bytestring tasty tasty-hunit text + ]; + description = "Haskell bindings to the CozoDB C API"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libcozo_c = null;}; + "cparsing" = callPackage ({ mkDerivation, base, containers, directory, either, filepath , HUnit, lens, mtl, parsec, split, template-haskell, transformers @@ -74842,8 +74927,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.7"; - sha256 = "17rr2cffn5ncpiskicgrmg1w7d0axgavf86336ij05fvvc3gzpgi"; + version = "0.2.5.8"; + sha256 = "1ghc5ga4nn0hhr12ig90nbh2g8igqln6n6n9nyv2m8z5kvc16rw1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74985,8 +75070,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.2"; - sha256 = "0yrrrwm69j3k0fwcdrhdzq49zin4jqn5xcl603dr9zfaxfrjw4js"; + version = "4.4.3"; + sha256 = "0pkxwpkiaj4aydifj45wqbhqzqrm92sspgc7m4j1dlxdsj6sbl6h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -76217,8 +76302,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "9"; - editedCabalFile = "0039frsfxhs50rnixiq8kmfw91ar9qigmkzz0wrpds6xvr47ri53"; + revision = "10"; + editedCabalFile = "138wc2zxb9bfprp9z76xij8jxcc4539bs1kka6n6s8x1y8j52g7n"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -76969,15 +77054,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_0_33" = callPackage + "crypton_0_34" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "0.33"; - sha256 = "0805ws7yadwyscr1cm8nh56sj7yk0mplk7yz0n919ziabjks0vz6"; + version = "0.34"; + sha256 = "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -77994,8 +78079,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "1"; - editedCabalFile = "14w4r8y871fkvvak9lklncchlnq3cb6gy4qy1124g9hsnf75mgg4"; + revision = "2"; + editedCabalFile = "0qri8cm9spcpc0g782b0liq9bv350n6cgblnni2dr3q8m6jvkfxx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -78311,8 +78396,8 @@ self: { }: mkDerivation { pname = "curryer-rpc"; - version = "0.3.0"; - sha256 = "15mzhygmsa7581lgrz5hyd8lsj5fdrlnbd7zzs7f9ksmdr5sxdzy"; + version = "0.3.1"; + sha256 = "0kw2xsiyrpi2qg5fhb2zl7b593qksqpkmb3j28wf39xm7k2gw1m0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78840,6 +78925,34 @@ self: { }: mkDerivation { pname = "daemons"; + version = "0.3.0"; + sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring cereal data-default directory filepath ghc-prim + network pipes transformers unix + ]; + executableHaskellDepends = [ + base bytestring cereal containers data-default ghc-prim network + pipes transformers + ]; + testHaskellDepends = [ + base data-default directory ghc-prim HUnit test-framework + test-framework-hunit unix + ]; + description = "Daemons in Haskell made fun and easy"; + license = lib.licenses.gpl3Only; + }) {}; + + "daemons_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-default + , directory, filepath, ghc-prim, HUnit, network, pipes + , test-framework, test-framework-hunit, transformers, unix + }: + mkDerivation { + pname = "daemons"; version = "0.4.0"; sha256 = "10fcxk749q90mlwgknqn6l5mff8b09acmikxzh5jkk5sr6bj86hz"; isLibrary = true; @@ -78860,7 +78973,6 @@ self: { description = "Daemons in Haskell made fun and easy"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dag" = callPackage @@ -78883,20 +78995,21 @@ self: { "dahdit" = callPackage ({ mkDerivation, base, bytestring, containers, data-default - , data-sword, free, mtl, primitive, tasty, tasty-hunit - , transformers, vector + , data-sword, falsify, free, ghc-typelits-knownnat, mtl, primitive + , tasty, tasty-hunit, text, transformers, vector }: mkDerivation { pname = "dahdit"; - version = "0.3.0"; - sha256 = "0c95v3n7x7z6jgppd8l9x8xqhx6nqx34j66q52k746b0aam5wf2i"; + version = "0.5.0"; + sha256 = "15w57xbiqdcyl51g4lcvwknhn8qwmpcipjgg7zkf44hi12dq77qj"; libraryHaskellDepends = [ - base bytestring containers data-default data-sword free mtl - primitive transformers vector + base bytestring containers data-default data-sword free + ghc-typelits-knownnat mtl primitive text transformers vector ]; testHaskellDepends = [ - base bytestring containers data-default data-sword free mtl - primitive tasty tasty-hunit transformers vector + base bytestring containers data-default data-sword falsify free + ghc-typelits-knownnat mtl primitive tasty tasty-hunit text + transformers vector ]; description = "Binary parsing and serialization with integrated size"; license = lib.licenses.bsd3; @@ -78904,6 +79017,46 @@ self: { broken = true; }) {}; + "dahdit-network" = callPackage + ({ mkDerivation, async, base, bytestring, dahdit, network + , resourcet, stm, tasty, tasty-hunit, unliftio-core + }: + mkDerivation { + pname = "dahdit-network"; + version = "0.5.0"; + sha256 = "0f732x98bv0n39j4dvgyiac4vv37pi7fp6fasjrpgqmpzlq4ww18"; + libraryHaskellDepends = [ + base bytestring dahdit network resourcet unliftio-core + ]; + testHaskellDepends = [ + async base bytestring dahdit network resourcet stm tasty + tasty-hunit unliftio-core + ]; + description = "Network protocol helpers for Dahdit"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "dahdit-test" = callPackage + ({ mkDerivation, base, bytestring, containers, dahdit, daytripper + , directory, falsify, tasty, text + }: + mkDerivation { + pname = "dahdit-test"; + version = "0.5.0"; + sha256 = "0hvdicx4m339i1hfzvbjpgnhkcv223ci9m2iggrccx3wv96hxgbl"; + libraryHaskellDepends = [ + base bytestring containers dahdit daytripper directory falsify text + ]; + testHaskellDepends = [ + base bytestring containers dahdit daytripper directory falsify + tasty text + ]; + description = "Test utils for Dahdit serde"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "daino" = callPackage ({ mkDerivation, base, data-default-class, deepseq, dir-traverse , filepath, pandoc, pandoc-sidenote, path, path-io, ReplaceUmlaut @@ -80455,8 +80608,8 @@ self: { pname = "data-functor-logistic"; version = "0.0"; sha256 = "0k2r4jpm7sa3hgd6i08sg9xbgjzkgzx44z5ai5zpw32b7pqr9xqm"; - revision = "1"; - editedCabalFile = "135950pg0gxqhzmvzq9lmvvy5qnsd3q8963fslasgj01bixb3k0f"; + revision = "2"; + editedCabalFile = "0477ky1j44cval3f9nnakz946haxs4477rzbl0i3asc4qwkpi2xl"; libraryHaskellDepends = [ base distributive ]; description = "Updatable analogue of Distributive functors"; license = lib.licenses.bsd3; @@ -81914,8 +82067,8 @@ self: { }: mkDerivation { pname = "daytripper"; - version = "0.2.1"; - sha256 = "15bx4hla164cv328hv26fghpwjay3h96flfl7yajcfs9vfyamjyq"; + version = "0.3.0"; + sha256 = "0m5xhr7rngkxl4n1rzwh6fq192mk0c63css72xirjrm0hhpp9jwl"; libraryHaskellDepends = [ base bytestring directory falsify optparse-applicative tagged tasty tasty-hunit @@ -82999,8 +83152,8 @@ self: { pname = "dec"; version = "0.0.5"; sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; - revision = "1"; - editedCabalFile = "1vng67drg2y9vjg6106q4lcz0kf2f2kl4qrrnl76kmk6z9a9kakh"; + revision = "2"; + editedCabalFile = "1vdnjlhbvh140ml0z4r2w5hl4x4c3fa0cnw68fl65l2mqld44i0h"; libraryHaskellDepends = [ base boring ]; description = "Decidable propositions"; license = lib.licenses.bsd3; @@ -83166,17 +83319,12 @@ self: { }) {}; "deep-map" = callPackage - ({ mkDerivation, base, containers, hedgehog, indexed-traversable - , text, time, time-compat - }: + ({ mkDerivation, base, containers, indexed-traversable }: mkDerivation { pname = "deep-map"; - version = "0.1.1.0"; - sha256 = "0hb5wvdmjbxpa92p2zjxvnx1fxwq3gmalm18k6zkwyamk2isyb33"; + version = "0.2.0"; + sha256 = "1qbrhmwd3r7767nqcvmlkl44g852xyh4yaspcym1d5jxpbzgcbpy"; libraryHaskellDepends = [ base containers indexed-traversable ]; - testHaskellDepends = [ - base containers hedgehog text time time-compat - ]; description = "Deeply-nested, multiple key type maps"; license = lib.licenses.bsd3; }) {}; @@ -83187,8 +83335,8 @@ self: { }: mkDerivation { pname = "deep-transformations"; - version = "0.2.1.2"; - sha256 = "0g4544w9x2djwl3r7nl7lvg5w36hlzh2r7q3xahxs3wc4yyn4q7z"; + version = "0.2.2"; + sha256 = "1sjqvpbb3b90fpxmj0i7zarkj97m6q259l77kgdzjlbcnnd980ws"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base generic-lens rank2classes template-haskell transformers @@ -83751,6 +83899,30 @@ self: { broken = true; }) {}; + "demangler" = callPackage + ({ mkDerivation, base, containers, hspec, lens, prettyprinter + , process, sayable, tasty, tasty-hspec, template-haskell, text + , transformers + }: + mkDerivation { + pname = "demangler"; + version = "1.2.0.0"; + sha256 = "1pv4qhmn5hmksrv868f2mdln938hin917s856xmfpmlnc9zgp6ml"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens sayable template-haskell text + ]; + executableHaskellDepends = [ base sayable text transformers ]; + testHaskellDepends = [ + base hspec prettyprinter process sayable tasty tasty-hspec text + transformers + ]; + description = "Demangler for C++ mangled names"; + license = lib.licenses.bsd3; + mainProgram = "demangle"; + }) {}; + "demarcate" = callPackage ({ mkDerivation, base, free, hspec, transformers }: mkDerivation { @@ -84281,6 +84453,21 @@ self: { license = lib.licenses.mit; }) {}; + "deque_0_4_4_1" = callPackage + ({ mkDerivation, base, deepseq, hashable, mtl, rerebase + , strict-list, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "deque"; + version = "0.4.4.1"; + sha256 = "0gyyhkjmz2m4n1wmg3gd13vxwqg2lgf7fh5cnfnypzjbaag5yxys"; + libraryHaskellDepends = [ base deepseq hashable mtl strict-list ]; + testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; + description = "Double-ended queues"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -84795,8 +84982,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.3.2.0"; - sha256 = "0xl8bib8wsnf8ylmmpln25fnw48zq0js7r9blb0km6sskwdvx6kw"; + version = "0.4.0.0"; + sha256 = "1h3qrswrlpfd0f6h3fknx47zpii5w1mq026yad5ym3ryp3xs2591"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory modern-uri network random text unix @@ -85313,7 +85500,7 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; - "dhall_1_42_0" = callPackage + "dhall_1_42_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, base16-bytestring, bytestring, case-insensitive, cborg , cborg-json, containers, contravariant, cryptohash-sha256 @@ -85328,14 +85515,13 @@ self: { , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit , tasty-quickcheck, tasty-silver, template-haskell, temporary, text , text-manipulate, text-short, th-lift-instances, time - , transformers, turtle, unix-compat, unordered-containers, vector + , transformers, turtle, unix, unix-compat, unordered-containers + , vector }: mkDerivation { pname = "dhall"; - version = "1.42.0"; - sha256 = "0yykf7va25pqf3pxm4zx3jsjsvdxy9q6dmzxdwhbag31h8isif4w"; - revision = "2"; - editedCabalFile = "06p5paqqzgrbymagkvj8jr983g08qg004f73y63x8ar6xmgaldsw"; + version = "1.42.1"; + sha256 = "0n4773s7l9sfqi00fnh4h92mpifbh0m6vsvpghg834c0jx2gm36f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -85349,7 +85535,7 @@ self: { optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; executableHaskellDepends = [ @@ -85361,7 +85547,7 @@ self: { network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; testHaskellDepends = [ @@ -85376,8 +85562,8 @@ self: { quickcheck-instances repline scientific serialise special-values spoon tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-silver template-haskell temporary text text-manipulate - text-short th-lift-instances time transformers turtle unix-compat - unordered-containers vector + text-short th-lift-instances time transformers turtle unix + unix-compat unordered-containers vector ]; benchmarkHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base @@ -85388,7 +85574,7 @@ self: { network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate - text-short th-lift-instances time transformers unix-compat + text-short th-lift-instances time transformers unix unix-compat unordered-containers vector ]; doCheck = false; @@ -86113,22 +86299,6 @@ self: { }) {}; "di-monad" = callPackage - ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes - , stm, streaming, transformers, unliftio-core - }: - mkDerivation { - pname = "di-monad"; - version = "1.3.2"; - sha256 = "1j8s44kg2r5s59vjy7g8d7pg14nkafpdsg4xn17p3v26jyfzcsmh"; - libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm streaming - transformers unliftio-core - ]; - description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = lib.licenses.bsd3; - }) {}; - - "di-monad_1_3_5" = callPackage ({ mkDerivation, base, conduit, containers, di-core, exceptions , monad-control, mtl, pipes, pipes-safe, primitive, resourcet, stm , streaming, transformers, transformers-base, unliftio-core @@ -86144,7 +86314,6 @@ self: { ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "di-polysemy" = callPackage @@ -87481,8 +87650,8 @@ self: { }: mkDerivation { pname = "digit"; - version = "0.12"; - sha256 = "1z765d5rsz3gh0rq8601gq5fhzm3yvk175vchw9qnanv7zn596wx"; + version = "0.15"; + sha256 = "1j8f9kq51lszzdfh9xdngjpxwcqnbkg5d4xa2ljzp7hd7xqnwnai"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -89675,6 +89844,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.3"; sha256 = "0iypfrnjj9qaiv1xicr310jcham5kym4yr6myy6vbi8nbgwl82kp"; + revision = "1"; + editedCabalFile = "10fjp19b7kpfavsaxpfpq479yfki6s2y7s5791w3yawpnlbj7g3v"; libraryHaskellDepends = [ base deepseq dlist foldable1-classes-compat semigroupoids ]; @@ -90710,34 +90881,6 @@ self: { }: mkDerivation { pname = "doctest-parallel"; - version = "0.3.0.1"; - sha256 = "17azfkx2hl48gfxhln710lngzbcwfmxv24jqj8h59ydrah9cba11"; - revision = "1"; - editedCabalFile = "0n2kfbqkbxb8mshvxlsc9kg7klgdp9i0raq56x15vdif8sji82qw"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions filepath ghc ghc-paths Glob process random syb - template-haskell transformers unordered-containers - ]; - testHaskellDepends = [ - base base-compat code-page containers deepseq directory exceptions - filepath ghc ghc-paths hspec hspec-core HUnit mockery process - QuickCheck setenv silently stringbuilder syb transformers - ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - }) {}; - - "doctest-parallel_0_3_1" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, filepath, ghc, ghc-paths, Glob - , hspec, hspec-core, HUnit, mockery, process, QuickCheck, random - , setenv, silently, stringbuilder, syb, template-haskell - , transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; version = "0.3.1"; sha256 = "0lbiwi2jc6d68hhkvsgwhrwrbhw9f56r2mqnp7l6i779gpzdriqd"; libraryHaskellDepends = [ @@ -90753,7 +90896,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -92665,6 +92807,20 @@ self: { license = lib.licenses.publicDomain; }) {}; + "duckdb-haskell" = callPackage + ({ mkDerivation, base, mtl, system-cxx-std-lib, tasty, tasty-hunit + , vector + }: + mkDerivation { + pname = "duckdb-haskell"; + version = "0.1.0.0"; + sha256 = "0q1p4zx8ccz800938mi7z96agvffmw07wsi8ac3ii9h74jcx6lb0"; + libraryHaskellDepends = [ base mtl system-cxx-std-lib ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; + description = "Haskell bindings for duckdb"; + license = lib.licenses.mit; + }) {}; + "duckling" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, bytestring , containers, deepseq, dependent-sum, directory, extra, filepath @@ -92804,6 +92960,26 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_12_0" = callPackage + ({ mkDerivation, base, criterion, filepath, MonadRandom + , simple-affine-space, tasty, tasty-hunit, time, transformers + , transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.12.0"; + sha256 = "019332zb3c6abwxpw6qxd6pr0v379aadgd9p9li2la7x8a8qmc00"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + benchmarkHaskellDepends = [ base criterion filepath time ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -92824,8 +93000,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.11.2"; - sha256 = "18f45db2n45khn2vxs1wpqsyapy6iivbmv86snx1d0hd2f9bfmx1"; + version = "0.12.0"; + sha256 = "0wzzkqky1bn5kvr23wwax7p7hklal1b80hdy627wr6h39czia391"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -94206,7 +94382,9 @@ self: { pretty-simple text time unordered-containers vector ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hectare"; + broken = true; }) {}; "ecta-plugin" = callPackage @@ -94250,8 +94428,8 @@ self: { pname = "ed25519"; version = "0.0.5.0"; sha256 = "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"; - revision = "7"; - editedCabalFile = "0gpp3v411c76r282466xb24j87jyl3n7xypkxsjqprmr31y4vc1x"; + revision = "8"; + editedCabalFile = "0x8wx1mp6lf9cgz0p326m76p181r14fyxwwq8iicrx8sha4kff28"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck @@ -96580,7 +96758,7 @@ self: { license = lib.licenses.asl20; }) {}; - "emacs-module_0_2" = callPackage + "emacs-module_0_2_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, filepath , monad-control, monad-interleave, mtl, prettyprinter , prettyprinter-combinators, primitive, template-haskell, text @@ -96588,8 +96766,8 @@ self: { }: mkDerivation { pname = "emacs-module"; - version = "0.2"; - sha256 = "1jrc031zgd418jfdfp9mgbc8vvdij5rfq0255va5mk1a1xfzyis4"; + version = "0.2.1"; + sha256 = "0xmydwd9b78943cqxwx3pk71lp9chr879rpkf2fhfl2g6xvhrf86"; libraryHaskellDepends = [ base bytestring deepseq exceptions filepath monad-control monad-interleave mtl prettyprinter prettyprinter-combinators @@ -97068,8 +97246,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.8"; - sha256 = "13b73zv9g2m2qriwjccf44bx5jywnqv72fjkhg89zv22ncgsf1fh"; + version = "0.8.9"; + sha256 = "0czqdh5bkbp1hy1kwhhmiqml5fr4n6iv0bk84slj6ym9ryrjdrf8"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -98785,8 +98963,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.10.3"; - sha256 = "0amvg1857gnqi4g8x3dcig3l1mfvqxsfm4l61kjixbfb7zfksn0i"; + version = "3.5.11.0"; + sha256 = "03vk49q87m85qkld89d1gxf17mah7xkhk0m5y84d4mv1c5is530y"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -101144,8 +101322,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "1.6.0.1"; - sha256 = "0r26dvc4dc865x84pz8y4yh43pzzgdy524aggwn3q2m3frdc7zba"; + version = "1.6.0.2"; + sha256 = "17hq0ywafh72cskqh7mbfbq6lgc4j3szvfnz4sf6m84llzzvbdv9"; libraryHaskellDepends = [ base ghc incipit-base parsec template-haskell ]; @@ -102699,8 +102877,8 @@ self: { }: mkDerivation { pname = "falsify"; - version = "0.1.1"; - sha256 = "0srhrrx6iw6d8zc0ikikdg1j8yd6x845ja0z5sj340gxr1nvyq3h"; + version = "0.2.0"; + sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -104008,8 +104186,8 @@ self: { }: mkDerivation { pname = "fedora-repoquery"; - version = "0.2"; - sha256 = "1vbjwz98bmax8l535ip2n2500y431n87rf0p5gx8bff7qv68l3j6"; + version = "0.3"; + sha256 = "020jsrlhb4dfn4kjkzxm8ix72m3c9ihsr85h23nf1f1kdv15cinv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105065,8 +105243,8 @@ self: { pname = "file-embed-lzma"; version = "0.0.1"; sha256 = "19l1gdjhsn4zh96mzbjsa5rn0acwrx1w3jy25cm23xv6jl8z28i9"; - revision = "1"; - editedCabalFile = "1zhbka04bbb7y1bslnxf8p145dwc48m3jmk5gighky8smjrzjjzr"; + revision = "2"; + editedCabalFile = "1l1gkqljzm8v35in335rxzc548x06qdis6617gpl09lv81c7k12l"; libraryHaskellDepends = [ base bytestring directory filepath lzma template-haskell text transformers @@ -105562,8 +105740,8 @@ self: { pname = "fin"; version = "0.3"; sha256 = "0dqwwd940pws4dpcaimbzxvxj7crncdcnslvjl2npa69x5vh63g2"; - revision = "1"; - editedCabalFile = "14f3mg6hjwy8yycrkj8p925kwb6hjzy2hm6yb4fwl243w92yf5qa"; + revision = "2"; + editedCabalFile = "1b5icwiklwf6rxgbx88yg6hhcnzm8697jcd64nhk048dyiyw19df"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -105871,8 +106049,8 @@ self: { }: mkDerivation { pname = "finite-fields"; - version = "0.2"; - sha256 = "158qc6q8ppisjxhipcvfjha8iklg0x6jpf0cb8wgsz2456wzm2s8"; + version = "0.2.0.1"; + sha256 = "0rn5c0dsxx07y37zy5ckhr4q6s2hg56skfbj00cizrxch3z7r54y"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base containers random vector ]; testHaskellDepends = [ @@ -105884,6 +106062,20 @@ self: { broken = true; }) {}; + "finite-semigroups" = callPackage + ({ mkDerivation, base, containers, HUnit, safe }: + mkDerivation { + pname = "finite-semigroups"; + version = "0.1.0.0"; + sha256 = "0xvqnafhqhv17jr0pl9r4fxj5rcp8q18pymmbckrq1dc7hffdqq2"; + revision = "1"; + editedCabalFile = "1hb2f392007ks1vcvhs6rd82piwmbz5n0v477lv9kja2ww90i4y5"; + libraryHaskellDepends = [ base containers safe ]; + testHaskellDepends = [ base containers HUnit ]; + description = "Operations and classification for finite semigroups"; + license = lib.licenses.mit; + }) {}; + "finite-table" = callPackage ({ mkDerivation, adjunctions, base, cereal, data-default-class , deepseq, distributive, fin-int, indexed-traversable, lens @@ -106446,6 +106638,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-vector_1_2_3_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "1.2.3.0"; + sha256 = "0cbz734dccsy3jvhszszyrnls6bbys4gaq326dksaabwv6mn58vc"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -106738,23 +106943,20 @@ self: { "flac" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, flac, hspec, hspec-discover, mtl, temporary - , text, transformers, vector, wave + , text, vector, wave }: mkDerivation { pname = "flac"; - version = "0.2.0"; - sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; - revision = "4"; - editedCabalFile = "0vgc21i3srxq6is8c05qghrz71nmv3mlvcy3aincsvsgib852kk3"; + version = "0.2.1"; + sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text - transformers vector wave + vector wave ]; librarySystemDepends = [ flac ]; testHaskellDepends = [ - base bytestring directory filepath hspec temporary transformers - vector wave + base bytestring directory filepath hspec temporary vector wave ]; testToolDepends = [ hspec-discover ]; description = "Complete high-level binding to libFLAC"; @@ -107495,6 +107697,19 @@ self: { license = lib.licenses.mit; }) {}; + "flow_2_0_0_4" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "flow"; + version = "2.0.0.4"; + sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Write more understandable Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -108123,26 +108338,12 @@ self: { }: mkDerivation { pname = "focus"; - version = "1.0.3.1"; - sha256 = "164hg9n1mwx0kpil4hqcw2l2y4c1zj52vkygsbffv5yr9cmwwc9x"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ rerebase tasty tasty-hunit ]; - description = "A general abstraction for manipulating elements of container data structures"; - license = lib.licenses.mit; - }) {}; - - "focus_1_0_3_2" = callPackage - ({ mkDerivation, base, rerebase, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "focus"; version = "1.0.3.2"; sha256 = "11n2dh0ilc2hqh96ivy1k2y3pi8y1ll11awp4r3h40w17023yjz2"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ rerebase tasty tasty-hunit ]; description = "A general abstraction for manipulating elements of container data structures"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "focuslist" = callPackage @@ -108269,6 +108470,8 @@ self: { pname = "foldl"; version = "1.4.15"; sha256 = "1bn00vv60kfwqcn1xv4yi5k2dm8kdksai034wv3cp20p2h2z3clw"; + revision = "1"; + editedCabalFile = "1qgydj1q78bxx59ad62jw19iikr8nkq74rzr9mfpk3vpiw0v7lk5"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -108714,8 +108917,8 @@ self: { }: mkDerivation { pname = "foreign"; - version = "0.2.0.1"; - sha256 = "0jdp0firbgjsgfzwsxw2yr9lj08bibhngcfwamj0sh3asrb6ryws"; + version = "0.2.1.0"; + sha256 = "0xgxw4yik1dw6r6zp3w50wazpglvwxvgyxhgj01sfkh275nfh7yw"; libraryHaskellDepends = [ base bytestring ghc-prim primitive primitive-unlifted ]; @@ -108871,8 +109074,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "1"; - editedCabalFile = "12336x0g41hp6brl4ynw0m32kj3n191945qfgp8xaabm5qrchinj"; + revision = "2"; + editedCabalFile = "1wm2zqhdzx5qawlqm74kpfivfhp3bmlagxc63xz7vm4pr17cisyq"; libraryHaskellDepends = [ aeson base containers mtl text ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; @@ -109469,6 +109672,41 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_14_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.14.1.0"; + sha256 = "1wqrs5fl72br5mlkf1dyna0946kxscjfgb4956mksr2fgcdqmdxl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fp-ieee" = callPackage ({ mkDerivation, base, doctest, ghc-bignum, hspec, hspec-core , integer-logarithms, QuickCheck, random, tasty-bench @@ -109863,8 +110101,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.10.2.0"; - sha256 = "18d8594pz123kbhvw3igazs5ngd8rrs050ivb1hmksr6x2r6b6mm"; + version = "1.10.4.0"; + sha256 = "113nkqv47v2fkn6dpvx6dl58192jsr79c9yc8bfqjkxkbqg72py1"; libraryHaskellDepends = [ aeson aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit @@ -111213,18 +111451,18 @@ self: { }) {}; "fswatcher" = callPackage - ({ mkDerivation, base, directory, fsnotify, optparse-applicative - , process, regex-pcre-builtin, system-filepath, unix + ({ mkDerivation, base, directory, filepath, fsnotify + , optparse-applicative, process, regex-pcre-builtin, unix }: mkDerivation { pname = "fswatcher"; - version = "0.3.0"; - sha256 = "0bn3pnk7jra4p20hm4ydvnqibfh3h9kc5lswvs8s02wlzf5z5a9f"; + version = "0.4.0"; + sha256 = "1gqfdr1ad2ag0hdhdi2qyz6vji93zyrb6sv2kjhfizbwacqh8gbd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory fsnotify optparse-applicative process - regex-pcre-builtin system-filepath unix + base directory filepath fsnotify optparse-applicative process + regex-pcre-builtin unix ]; description = "Watch a file/directory and run a command when it's modified"; license = lib.licenses.bsd3; @@ -111747,8 +111985,8 @@ self: { pname = "functor-classes-compat"; version = "2.0.0.2"; sha256 = "02jamibwyr8hvf432m761v94xmwhbflrp6hd01jyv7fm95f5ki6h"; - revision = "2"; - editedCabalFile = "1vzh1hwg815pv64nbv8hvwbb91qg0fbq2xkdrn0d1m6li2h5k6q7"; + revision = "3"; + editedCabalFile = "0lkp1rggfhx8n3925f2iaxm8iznl2vb24m9b974nzid6565gx96k"; libraryHaskellDepends = [ base containers ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; @@ -112252,6 +112490,23 @@ self: { license = lib.licenses.asl20; }) {}; + "fusion-plugin_0_2_7" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: + mkDerivation { + pname = "fusion-plugin"; + version = "0.2.7"; + sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; + description = "GHC plugin to make stream fusion more predictable"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fusion-plugin-types" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -112279,8 +112534,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.5"; - sha256 = "1jikcawlhx0529dvdikz52qyb3q1hp1avagzdmgdggj5yik9wc38"; + version = "0.25.7"; + sha256 = "1dj0xyk83kkb7zay23rqy92kkmq0rqiyrm3nhw246mhf7swn1rkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117455,8 +117710,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-parser"; - version = "0.2.5.0"; - sha256 = "17ms9zyh5mczqpxhs2p2y3sa4zda39lzl66dkb18a79c5p36id0r"; + version = "0.2.6.0"; + sha256 = "177glyhd9qr4z19zl8ycdy2302k8jzyhrkh14dp92dp86iydlxp6"; libraryHaskellDepends = [ base ghc ]; description = "Haskell source parser from GHC"; license = lib.licenses.mit; @@ -117792,6 +118047,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_10_0" = callPackage + ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.10.0"; + sha256 = "145xjyraqd62k5amyqi9028rr9v2lgz3irmgz5v2hppza1i5qy72"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc-lib-parser text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using the lexer of GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-syntax-highlighter_0_0_11_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: @@ -120317,13 +120588,18 @@ self: { }) {}; "gigaparsec" = callPackage - ({ mkDerivation, base, containers, selective, tasty, tasty-hunit }: + ({ mkDerivation, base, containers, deepseq, gauge, selective, tasty + , tasty-expected-failure, tasty-hunit + }: mkDerivation { pname = "gigaparsec"; - version = "0.1.0.0"; - sha256 = "177y3rnsg4zy94j2snpcnqdq754b33ni7m07fs7srbyarpm6kd21"; + version = "0.2.0.0"; + sha256 = "0x2chdfcnc914dbjjgyxkjnwanmmdl9p0a6pfsnyncv6j1x6bcsz"; libraryHaskellDepends = [ base containers selective ]; - testHaskellDepends = [ base containers tasty tasty-hunit ]; + testHaskellDepends = [ + base containers tasty tasty-expected-failure tasty-hunit + ]; + benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Refreshed parsec-style library for compatiblity with Scala parsley"; license = lib.licenses.bsd3; }) {}; @@ -121279,6 +121555,31 @@ self: { mainProgram = "github-release"; }) {}; + "github-release_2_0_0_9" = callPackage + ({ mkDerivation, aeson, base, burrito, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers + }: + mkDerivation { + pname = "github-release"; + version = "2.0.0.9"; + sha256 = "0lhaz92jr6ssl1mq5nmcwv6n43wda6mjv2qdzm8rg5275xqpa7jv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + executableHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + description = "Upload files to GitHub releases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "github-release"; + }) {}; + "github-rest" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty @@ -121517,31 +121818,6 @@ self: { "gitlab-haskell" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring - , connection, http-client, http-conduit, http-types, tasty - , tasty-hunit, temporary, text, time, transformers, tree-diff, unix - , unordered-containers, vector - }: - mkDerivation { - pname = "gitlab-haskell"; - version = "1.0.0.1"; - sha256 = "1spd989dpqjx7m39fdzdkirp3pgh5cf57dqv756x51r4qkcs4hh1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring connection http-client http-conduit - http-types temporary text time transformers unix - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring tasty tasty-hunit tree-diff - unordered-containers vector - ]; - description = "A Haskell library for the GitLab web API"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "gitlab-haskell_1_0_0_3" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring , connection, http-client, http-conduit, http-types, mtl, tasty , tasty-hunit, temporary, text, time, transformers, tree-diff, unix , unordered-containers, vector @@ -125624,8 +125900,8 @@ self: { pname = "goldplate"; version = "0.2.1.1"; sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "4"; - editedCabalFile = "03jfrffs2ip7i4qqxhy8cjynygnaahpw1z19xg4j2fh32h669i53"; + revision = "5"; + editedCabalFile = "1nd5li3w3brca187j40mcx1dgd02fs5snj7pf21ib23qcznfnh1n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125776,6 +126052,7 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "google-oauth2" = callPackage @@ -125910,6 +126187,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -131356,8 +131635,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "2"; - editedCabalFile = "04hvk5q2x8j75z1yknfxa1607hwb8xx4k5bgdq8qmw2a5zkb5fyy"; + revision = "3"; + editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -132566,10 +132845,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "halfsplit"; - version = "0.3.0.0"; - sha256 = "0yxi29jai57jgvw67c305lcmnyyh58a8pjz1yvmbmk5q20cmbkdc"; + version = "0.4.1.0"; + sha256 = "0mas6a53p44cnfzb26lpsrpgy1zh7vm5i2lxk0invmf35sbaq0w9"; libraryHaskellDepends = [ base ]; - description = "A library to provide special kind of two-column terminal output for Phladiprelio"; + description = "A library to provide special kind of two-column output for Phladiprelio"; license = lib.licenses.mit; }) {}; @@ -133902,6 +134181,8 @@ self: { pname = "happstack-server"; version = "7.8.0.2"; sha256 = "15cp6w5xh5rv2fg9rv1fd0y938280gbcpziv7kmq78zywar56mis"; + revision = "1"; + editedCabalFile = "088n68k51jya68drknmywm60f22igrpidh2dmyj74mfp554jfhg2"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -136922,7 +137203,9 @@ self: { description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "haskell-snake"; + broken = true; }) {}; "haskell-spacegoo" = callPackage @@ -139679,34 +139962,6 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, network-ip - , postgresql-binary, postgresql-libpq, profunctors, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, time, transformers, uuid - , vector - }: - mkDerivation { - pname = "hasql"; - version = "1.6.3.2"; - sha256 = "0b5sawrcbyqin48vfg2nyrk55qdsxpdn4gmdj3mdb30vnrkns9pq"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-strict-builder - contravariant dlist hashable hashtables mtl network-ip - postgresql-binary postgresql-libpq profunctors scientific text - text-builder time transformers uuid vector - ]; - testHaskellDepends = [ - contravariant-extras QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ gauge rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = lib.licenses.mit; - }) {}; - - "hasql_1_6_3_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , dlist, gauge, hashable, hashtables, mtl, network-ip , postgresql-binary, postgresql-libpq, profunctors , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers, uuid @@ -139729,7 +139984,6 @@ self: { benchmarkHaskellDepends = [ gauge rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -141013,8 +141267,8 @@ self: { pname = "haxr"; version = "3000.11.5"; sha256 = "1n2q7r0a6c24xbvdnl7ql5cc25sbbalmdc75rmlpazhkazq8jy99"; - revision = "1"; - editedCabalFile = "01sswar7mybdjl7ry5acwslg30kh1cjv7lxbyvav1cv0d9irkjv6"; + revision = "2"; + editedCabalFile = "0nra68lczd019nxcgdxh82k6h846dwjd14k9ql1ngh6g35sq9hdq"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -141430,12 +141684,17 @@ self: { }) {}; "hcdt" = callPackage - ({ mkDerivation, base, containers, indexed-traversable }: + ({ mkDerivation, base, containers, hashable, indexed-traversable + , system-cxx-std-lib, witherable + }: mkDerivation { pname = "hcdt"; - version = "0.1.0.5"; - sha256 = "18hd8x7g615cgafgni27x914kqvashdicd1alaj02mha4jl0380a"; - libraryHaskellDepends = [ base containers indexed-traversable ]; + version = "0.1.1.1"; + sha256 = "1kjy5mn1rrz9dbx0cs8f6y8n3bf7sc1nyz70k2bcm9sv8sxhabq4"; + libraryHaskellDepends = [ + base containers hashable indexed-traversable system-cxx-std-lib + witherable + ]; description = "2d Delaunay triangulation"; license = lib.licenses.bsd3; }) {}; @@ -143213,21 +143472,20 @@ self: { }) {}; "hegg" = callPackage - ({ mkDerivation, base, containers, tasty, tasty-bench, tasty-hunit - , tasty-quickcheck, transformers + ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "hegg"; - version = "0.4.0.0"; - sha256 = "1nhxmf90965752skn3wcyjavi2amfxhlyrh60lmslm08w2wk14sk"; - revision = "1"; - editedCabalFile = "11c6ls164lr2bwjk0bbkzy8wiaazi8gd60pqyhf0in376ar2f6z5"; + version = "0.5.0.0"; + sha256 = "0xwxmkkvx0aj8h2vqxv3n1vi94sp1kyh02yrh3mwr24d7xjq1qzs"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ - base containers tasty tasty-bench tasty-hunit tasty-quickcheck + base containers deepseq tasty tasty-bench tasty-hunit + tasty-quickcheck ]; description = "Fast equality saturation in Haskell"; license = lib.licenses.bsd3; @@ -143293,10 +143551,8 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.1.1.1"; - sha256 = "0s6ydncib0g4mdmx4vzwmp1cnbvxrb2pngvkd5jc5kn5vb3g929l"; - revision = "3"; - editedCabalFile = "0lqh0qjphsfv65k8jgjrgnfln7c7wh8gqzmn9qa8s5m4viz6fkqs"; + version = "1.1.1.2"; + sha256 = "1377740si611j0szp64axy0xj1fi2a6w8i9s3xij89h34m7rb3rz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -144558,15 +144814,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "hetzner_0_5_0_0" = callPackage + "hetzner_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, country, directory, http-conduit, ip, megaparsec , scientific, text, time, yaml }: mkDerivation { pname = "hetzner"; - version = "0.5.0.0"; - sha256 = "0xrmbjv52w0gzdfvkgc6mxmq7887qsywz2xb8yrls1szw938x6q8"; + version = "0.6.0.0"; + sha256 = "1p8sxknssdjxr7bszxcld8rk40hm70cm58qkimjs5adz2hrimn14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144600,43 +144856,44 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, aeson-optics, ansi-wl-pprint - , array, async, base, base16, binary, brick, bytestring, cereal - , containers, cryptonite, data-dword, Decimal, deepseq, directory - , filemanip, filepath, filepattern, free, githash, gmp, haskeline - , here, HUnit, libff, megaparsec, memory, monad-par, mtl, multiset - , operational, optics-core, optics-extra, optics-th - , optparse-generic, process, QuickCheck, quickcheck-instances + ({ mkDerivation, abstract-par, aeson, aeson-optics, array, async + , base, base16, binary, brick, bytestring, cereal, containers + , cryptonite, data-dword, Decimal, deepseq, directory, filemanip + , filepath, filepattern, free, githash, gmp, haskeline, here, HUnit + , libff, megaparsec, memory, monad-par, mtl, multiset, operational + , optics-core, optics-extra, optics-th, optparse-generic + , pretty-hex, process, QuickCheck, quickcheck-instances , quickcheck-text, regex, regex-tdfa, restless-git, rosezipper - , scientific, secp256k1, smt2-parser, spawn, spool, stm, tasty - , tasty-bench, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, temporary, text, time, transformers, tree-view - , tuple, unordered-containers, vector, vty, witch, witherable - , word-wrap, wreq + , scientific, secp256k1, smt2-parser, spawn, spool, stm + , system-cxx-std-lib, tasty, tasty-bench, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, temporary, text, time + , transformers, tree-view, unordered-containers, vector, vty, witch + , witherable, word-wrap, wreq }: mkDerivation { pname = "hevm"; - version = "0.51.3"; - sha256 = "0cfy72vxihyw12a2b8nqzpqxcwc1r1ssja4j5qk0c68cq6n7djqb"; + version = "0.52.0"; + sha256 = "1l534d084fybklkc69j8c2bmpmsfi5q01rjhq7y4c6699igb72py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - abstract-par aeson aeson-optics ansi-wl-pprint array async base - base16 binary brick bytestring cereal containers cryptonite - data-dword Decimal deepseq directory filemanip filepath filepattern - free haskeline here HUnit megaparsec memory monad-par mtl multiset - operational optics-core optics-extra optics-th optparse-generic + abstract-par aeson aeson-optics array async base base16 binary + brick bytestring cereal containers cryptonite data-dword Decimal + deepseq directory filemanip filepath filepattern free haskeline + here HUnit megaparsec memory monad-par mtl multiset operational + optics-core optics-extra optics-th optparse-generic pretty-hex process QuickCheck quickcheck-instances quickcheck-text regex regex-tdfa restless-git rosezipper scientific smt2-parser spawn - spool stm tasty tasty-bench tasty-expected-failure tasty-hunit - tasty-quickcheck temporary text time transformers tree-view tuple - unordered-containers vector vty witch witherable word-wrap wreq + spool stm system-cxx-std-lib tasty tasty-bench + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time transformers tree-view unordered-containers vector vty witch + witherable word-wrap wreq ]; librarySystemDepends = [ gmp libff secp256k1 ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async base base16 binary brick bytestring - containers cryptonite data-dword deepseq directory filepath free - githash memory mtl operational optics-core optparse-generic process + aeson async base base16 binary brick bytestring containers + cryptonite data-dword deepseq directory filepath free githash + memory mtl operational optics-core optparse-generic process QuickCheck quickcheck-text regex-tdfa spawn stm temporary text unordered-containers vector vty witch ]; @@ -144648,13 +144905,12 @@ self: { tasty-expected-failure tasty-hunit tasty-quickcheck temporary text time vector witch witherable ]; - testSystemDepends = [ secp256k1 ]; benchmarkHaskellDepends = [ base bytestring containers filemanip filepath here mtl tasty tasty-bench text ]; doHaddock = false; - description = "Ethereum virtual machine evaluator"; + description = "Symbolic EVM Evaluator"; license = lib.licenses.agpl3Only; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; @@ -145972,6 +146228,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_6_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.6.0"; + sha256 = "1b13lbgmdb50fw3jkbvj2wq19zmklhxam7rfn7k8bqra2z4kbp2r"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio text vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -147158,27 +147433,6 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.9.0.7"; - sha256 = "1pq1va24vnizw79c3k0f432srfplx5lbmndqhhw3xzvxc1m48q96"; - libraryHaskellDepends = [ - base containers directory exceptions filepath ghc ghc-boot - ghc-paths random temporary transformers unix - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath HUnit stm - text typed-process unix - ]; - description = "A Haskell interpreter built on top of the GHC API"; - license = lib.licenses.bsd3; - }) {}; - - "hint_0_9_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit, random - , stm, temporary, text, transformers, typed-process, unix - }: - mkDerivation { - pname = "hint"; version = "0.9.0.8"; sha256 = "19xvi3g35983vhvq467d8gxx23zq7zbd4d6awh2ijb84vgbff7zf"; libraryHaskellDepends = [ @@ -147191,7 +147445,6 @@ self: { ]; description = "A Haskell interpreter built on top of the GHC API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hint-server" = callPackage @@ -148114,27 +148367,6 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.4.3.1"; - sha256 = "0ls5g6xm8kyqk9yrwkbxqck8l14ij0zsmkscl6h7cicq3b0ar5vj"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring directory extra filepath simple-cabal - simple-cmd-args simple-prompt typed-process xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3Only; - mainProgram = "hkgr"; - }) {}; - - "hkgr_0_4_3_2" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , simple-cabal, simple-cmd-args, simple-prompt, typed-process - , xdg-basedir - }: - mkDerivation { - pname = "hkgr"; version = "0.4.3.2"; sha256 = "1c87hpd4p4mq3cx5m52c7hkwp18f5klkkfx342q2zmkks97lf1zb"; isLibrary = false; @@ -148146,7 +148378,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hkgr"; }) {}; @@ -150981,7 +151212,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_8_1" = callPackage + "hoauth2_2_9_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, cryptonite, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -150989,14 +151220,14 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.8.1"; - sha256 = "134fvq9aasp3dmwj50wr8y7i3i292q68pr41dapdqq5mx4b77w8r"; + version = "2.9.0"; + sha256 = "1y8nrn4f4029imrxa215hrgv5cysdg7rcg9vwwxanavq1wfvlxfa"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers cryptonite data-default exceptions http-conduit http-types memory microlens text transformers uri-bytestring uri-bytestring-aeson ]; - testHaskellDepends = [ aeson base hspec ]; + testHaskellDepends = [ aeson base hspec uri-bytestring ]; testToolDepends = [ hspec-discover ]; description = "Haskell OAuth2 authentication client"; license = lib.licenses.mit; @@ -151006,22 +151237,21 @@ self: { "hoauth2-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, hoauth2, hoauth2-providers, http-conduit, http-types - , jose-jwt, microlens, mustache, parsec, scotty, text, transformers - , unordered-containers, uri-bytestring, wai, wai-middleware-static - , warp + , jose-jwt, mustache, parsec, scotty, text, transformers + , uri-bytestring, wai, wai-middleware-static, warp }: mkDerivation { pname = "hoauth2-demo"; - version = "1.6.0"; - sha256 = "1ypqbx19f25r1g3msj02h74zndl0bflc1y45gh4hfj3a0rz931gq"; + version = "1.7.0"; + sha256 = "19dnblzibmjzv01sgzbq35bx20d8yqarqyimjqqz9jmmqg368iv9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring containers data-default directory hoauth2 - hoauth2-providers http-conduit http-types jose-jwt microlens - mustache parsec scotty text transformers unordered-containers - uri-bytestring wai wai-middleware-static warp + hoauth2-providers http-conduit http-types jose-jwt mustache parsec + scotty text transformers uri-bytestring wai wai-middleware-static + warp ]; description = "hoauth2 demo application"; license = lib.licenses.mit; @@ -151031,19 +151261,21 @@ self: { "hoauth2-providers" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite - , data-default, directory, hoauth2, HsOpenSSL, http-conduit - , http-types, jose-jwt, mtl, parsec, text, time, transformers - , unordered-containers, uri-bytestring + , hoauth2, HsOpenSSL, hspec, hspec-discover, http-conduit + , http-types, jose-jwt, mtl, text, time, transformers + , uri-bytestring, uri-bytestring-aeson }: mkDerivation { pname = "hoauth2-providers"; - version = "0.2"; - sha256 = "1d53byy7gfp02dily3xas0aav2a63s32maanl9ba3pbpzlic9lvp"; + version = "0.3.0"; + sha256 = "0g87adfnr528vb2iy9rpc405h7x7j79fqly55d6x9i7dqhz73g7d"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite data-default directory - hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl parsec text - time transformers unordered-containers uri-bytestring + aeson base bytestring containers cryptonite hoauth2 HsOpenSSL + http-conduit http-types jose-jwt mtl text time transformers + uri-bytestring uri-bytestring-aeson ]; + testHaskellDepends = [ aeson base hspec uri-bytestring ]; + testToolDepends = [ hspec-discover ]; description = "OAuth2 Identity Providers"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -151051,20 +151283,19 @@ self: { }) {}; "hoauth2-providers-tutorial" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hoauth2 + ({ mkDerivation, base, bytestring, containers, hoauth2 , hoauth2-providers, http-conduit, http-types, scotty, text - , transformers, uri-bytestring, wai, warp + , transformers, uri-bytestring }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.2"; - sha256 = "1xb25d83qq8bmvx89nhzjcak406110j3id44y4ab6rqaccmgl5xf"; + version = "0.3.0"; + sha256 = "125lkxiijc8n480m2rpzgihr4j2cywgnm67zn90l1b8fwfsgm9hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers hoauth2 hoauth2-providers - http-conduit http-types scotty text transformers uri-bytestring wai - warp + base bytestring containers hoauth2 hoauth2-providers http-conduit + http-types scotty text transformers uri-bytestring ]; executableHaskellDepends = [ base ]; description = "tutorial for hoauth2-providers module"; @@ -151074,24 +151305,23 @@ self: { }) {}; "hoauth2-tutorial" = callPackage - ({ mkDerivation, aeson, base, bytestring, hoauth2, http-conduit - , http-types, scotty, text, transformers, uri-bytestring, wai, warp + ({ mkDerivation, aeson, base, bytestring, containers, hoauth2 + , http-conduit, http-types, scotty, text, transformers + , uri-bytestring }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.2"; - sha256 = "18mapdfx6ws3477bm63pcg4nvs1brsh75xc7jy3h4zyn99ci8ipv"; - isLibrary = true; + version = "0.3.0"; + sha256 = "1alnzhmgsijzv466mqbmvcalh100nqbh1pm59774q34kxxnrrjmc"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring hoauth2 http-conduit http-types scotty text - transformers uri-bytestring wai warp + executableHaskellDepends = [ + aeson base bytestring containers hoauth2 http-conduit http-types + scotty text transformers uri-bytestring ]; - executableHaskellDepends = [ base ]; description = "Tutorial for using hoauth2"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - mainProgram = "hoauth2-tutorial"; broken = true; }) {}; @@ -153339,14 +153569,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_4_2_0" = callPackage + "hpc-codecov_0_5_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, hpc, process, tasty, tasty-hunit, time + , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.4.2.0"; - sha256 = "1vfx7x9w72lca9zv489fb5h0jqc50ijmikjij6hkb3flbyskdzqd"; + version = "0.5.0.0"; + sha256 = "1hf73yj2dl5scrw3xqgin8zl555iv2byik88aih1mz5x6635rk55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153354,9 +153584,9 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory filepath process tasty tasty-hunit + base directory filepath hpc process tasty tasty-golden tasty-hunit ]; - description = "Generate codecov report from hpc data"; + description = "Generate reports from hpc data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "hpc-codecov"; @@ -153646,6 +153876,36 @@ self: { broken = true; }) {libpq = null;}; + "hpqtypes_1_11_1_2" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, HUnit, libpq, lifted-base, monad-control, mtl + , QuickCheck, random, resource-pool, scientific, semigroups, stm + , test-framework, test-framework-hunit, text, text-show, time + , transformers, transformers-base, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.11.1.2"; + sha256 = "0zdxk11akkl6l260jlywq2fjfv68angqaxdj577m9fk5yllxwswy"; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups stm text text-show time + transformers transformers-base uuid-types vector + ]; + libraryPkgconfigDepends = [ libpq ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers uuid-types vector + ]; + description = "Haskell bindings to libpqtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libpq = null;}; + "hpqtypes-effectful" = callPackage ({ mkDerivation, base, effectful-core, exceptions, hpqtypes , resource-pool, tasty, tasty-hunit, text @@ -154029,25 +154289,6 @@ self: { }: mkDerivation { pname = "hreader"; - version = "1.1.0"; - sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara"; - revision = "1"; - editedCabalFile = "0kz3yzah7m4c2r9yaawhljcgb579masx3lx4mrr4lmqy39kmsvcb"; - libraryHaskellDepends = [ - base exceptions hset mmorph monad-control mtl tagged transformers - transformers-base - ]; - testHaskellDepends = [ base hset transformers-base ]; - description = "Generalization of MonadReader and ReaderT using hset"; - license = lib.licenses.bsd3; - }) {}; - - "hreader_1_1_1" = callPackage - ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl - , tagged, transformers, transformers-base - }: - mkDerivation { - pname = "hreader"; version = "1.1.1"; sha256 = "0am8kyy046l9laqxx60nm3v6haz00wbrs1naxg0yq8z8yqcn4qvv"; libraryHaskellDepends = [ @@ -154057,7 +154298,6 @@ self: { testHaskellDepends = [ base hset transformers-base ]; description = "Generalization of MonadReader and ReaderT using hset"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hreader-lens" = callPackage @@ -154231,6 +154471,28 @@ self: { broken = true; }) {inherit (pkgs) ruby;}; + "hruby_0_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck + , ruby, scientific, stm, text, unordered-containers, vector + }: + mkDerivation { + pname = "hruby"; + version = "0.5.1.0"; + sha256 = "0m3n1nz1bmm8fpfrq82mhnkrx86adw0m3192smx2rw6iqvzk92hd"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring scientific stm text + unordered-containers vector + ]; + libraryPkgconfigDepends = [ ruby ]; + testHaskellDepends = [ + aeson attoparsec base QuickCheck text vector + ]; + description = "Embed a Ruby intepreter in your Haskell program !"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) ruby;}; + "hs" = callPackage ({ mkDerivation, base, containers, data-default, directory , enum-text, filepath, fmt, optparse-applicative, possibly, text @@ -155353,8 +155615,8 @@ self: { }: mkDerivation { pname = "hs-samtools"; - version = "0.7.0.0"; - sha256 = "0fkvq2bg8q0ikg8hwb4lmdjss7jis9ghwnykds6rpa3mlkg22m5g"; + version = "0.9.0.0"; + sha256 = "184axvqq1laryqy22a07d88rm4h1r5lk3mdr14v1ka94na45lh9c"; libraryHaskellDepends = [ ascii attoparsec base bitvec bytestring containers crypton generic-deriving parser-combinators pcre-heavy regex-tdfa streamly @@ -158268,14 +158530,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_11_6" = callPackage + "hspec_2_11_7" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.11.6"; - sha256 = "0czsm39vizhm8fjr09sb8652haxb0f81zprr8k7yjpk1kyq5582p"; + version = "2.11.7"; + sha256 = "15ihdrs1jiy1skk7gcr5y7rpfk2fbqpg470kjqzi794vpn510gia"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -158290,8 +158552,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.6"; - sha256 = "0il6vaxkw7d6shjvhj0dp6fhrixwh4aspcqpa0myf8m4vmlp9alb"; + version = "2.11.7"; + sha256 = "1i9i9hislxh6drza9ban2xg0vby2bcnvfwzhzijpipcj450qi7mj"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -158400,6 +158662,8 @@ self: { pname = "hspec-core"; version = "2.10.10"; sha256 = "1djmiy5xjnx71bjagmvipc5dsnvhakm03y72g3vyg7iggxqr6iv4"; + revision = "1"; + editedCabalFile = "0v8byijhsb93ql72n80p6m78yij1axa53fbbnbx1949p5nlzbnnh"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -158417,7 +158681,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_11_6" = callPackage + "hspec-core_2_11_7" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -158426,8 +158690,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.6"; - sha256 = "1j6pzpmkxrjv7ady2vlf7bx9ayphm2l3bls3fycs9h1lv3k0cni3"; + version = "2.11.7"; + sha256 = "0d5i67vm1skqyign9mi711vhyl72l98cii27vvlbg6x7p239pykg"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -158510,14 +158774,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_11_6" = callPackage + "hspec-discover_2_11_7" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.11.6"; - sha256 = "0i87w82gfzkl0dzcg1mvw8jr7ccqd25gq55zbqala8fqanplp7xp"; + version = "2.11.7"; + sha256 = "0anq2b6sg9jmhlwqivgld7w9ipl2nj0rnrc5v46k5ss5pcqb4qi8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -158579,6 +158843,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-expectations-json_1_0_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec + , HUnit, QuickCheck, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "hspec-expectations-json"; + version = "1.0.2.1"; + sha256 = "15bxyq5hdnr0pqmsj79n2q284fky9h6r8l26q8l4gjf5b5z99gj1"; + libraryHaskellDepends = [ + aeson aeson-pretty base Diff HUnit scientific text + unordered-containers vector + ]; + testHaskellDepends = [ aeson aeson-qq base hspec QuickCheck ]; + description = "Hspec expectations for JSON Values"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -158763,14 +159045,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-hedgehog_0_1_0_0" = callPackage + "hspec-hedgehog_0_1_1_0" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-core, QuickCheck , splitmix }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.1.0.0"; - sha256 = "0jlz6niac56v4x3dxd56cmgzxhirsabgyicc39b8iv7b97lc1pkm"; + version = "0.1.1.0"; + sha256 = "1hikvg6y5znxrm9qa4rcn10pghhm5igzvqd35k7k58g30zv5n9z6"; libraryHaskellDepends = [ base hedgehog hspec hspec-core QuickCheck splitmix ]; @@ -158842,7 +159124,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hspec-megaparsec" = callPackage + "hspec-megaparsec_2_2_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -158856,6 +159138,19 @@ self: { testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hspec-megaparsec" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.2.1"; + sha256 = "0bbajckrjxynjmd8ax2xv4k5fbjgrypnmbg8amgwwpy0jrzzbx35"; + libraryHaskellDepends = [ base hspec-expectations megaparsec ]; + testHaskellDepends = [ base hspec megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = lib.licenses.bsd3; }) {}; "hspec-meta_2_7_8" = callPackage @@ -158911,7 +159206,7 @@ self: { mainProgram = "hspec-meta-discover"; }) {}; - "hspec-meta_2_11_6" = callPackage + "hspec-meta_2_11_7" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq , directory, filepath, haskell-lexer, hspec-expectations, HUnit , process, QuickCheck, quickcheck-io, random, stm, tf-random, time @@ -158919,8 +159214,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.6"; - sha256 = "0vn0q7a2r1j8ixlwls8q55gyihv9398wga9804qy51f33y345zqm"; + version = "2.11.7"; + sha256 = "0vfwcrg9iydb2mhjgvysmzmrmw7jy4r12f05sggdk7wpiivy4n6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160288,16 +160583,14 @@ self: { "htaglib" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , hspec-discover, taglib, text, transformers + , hspec-discover, taglib, text }: mkDerivation { pname = "htaglib"; - version = "1.2.0"; - sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; - revision = "3"; - editedCabalFile = "199iqhjcznd3xp5qiinmmasz4aynhgpmsij1ajswasnd4ng127lq"; + version = "1.2.1"; + sha256 = "11dv4am3xkdia6aqcy5sx0v11bb339b3gxs9yzv0fvjbpm6hszkg"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring text transformers ]; + libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; testToolDepends = [ hspec-discover ]; @@ -160588,8 +160881,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; - revision = "5"; - editedCabalFile = "1776z73bs1v8z3qwpjvqqmzdlj6gm8qba93f41irhn7swdppfq72"; + revision = "6"; + editedCabalFile = "0xlzcz5mxp5l6dz2ajraylxkgdbj5yflxh3fr019d3fqvr2a2hwz"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -160869,6 +161162,32 @@ self: { broken = true; }) {}; + "htoml-megaparsec_2_1_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, composition-prelude + , containers, criterion, deepseq, file-embed, hspec, megaparsec + , mtl, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml-megaparsec"; + version = "2.1.0.5"; + sha256 = "1g3wblznbg5414s8s6fym7h99wgiv7m05l4whrdfqq663276rsb5"; + libraryHaskellDepends = [ + base composition-prelude containers deepseq megaparsec mtl text + time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec megaparsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ base criterion text ]; + doHaddock = false; + description = "Parser for TOML files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "htoml-parse" = callPackage ({ mkDerivation, base, comonad, containers, dlist, htoml-megaparsec , mtl, prettyprinter, prettyprinter-combinators, text, time @@ -161105,10 +161424,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.14"; - sha256 = "0hgrzy05ynivip7l2lv788y8prma2cb99007jrl6q3hph3w3cbi2"; - revision = "1"; - editedCabalFile = "1w1blf2r8riwibv79rcfxij7j60x0sdiqyf7nr5i5rjqbb0sh2k1"; + version = "0.7.15"; + sha256 = "092pqpd9g66pm0w65xmm4k1j8whnzq9xq22dy7xmxh122dydhflm"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -161793,8 +162110,8 @@ self: { }) {}; "http-io-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-builder, brotli-streams + ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson + , base, base64-bytestring, binary, blaze-builder, brotli-streams , bytestring, case-insensitive, containers, cryptohash-sha1 , directory, HsOpenSSL, hspec, hspec-expectations, HUnit , io-streams, lifted-base, mtl, network, network-uri @@ -161803,10 +162120,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.6.2"; - sha256 = "0nil98dnw0y6g417mr9c9dan071ri3726dv0asgwwplq5mwy780q"; - revision = "2"; - editedCabalFile = "0sgk4mgm1r8nnna0lxjw8daa9784rl91qvh4m2ba675f7a016f5c"; + version = "0.1.6.3"; + sha256 = "0m8g00gjwvbjjnvph93c54dm0s5g34zf1ycjd0v5m3ghgsi79q23"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary blaze-builder brotli-streams bytestring case-insensitive containers @@ -161814,12 +162129,12 @@ self: { network-uri openssl-streams text transformers xor ]; testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive containers directory HsOpenSSL hspec - hspec-expectations HUnit io-streams lifted-base mtl network - network-uri openssl-streams snap snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers + aeson aeson-pretty attoparsec attoparsec-aeson base + base64-bytestring blaze-builder bytestring case-insensitive + containers directory HsOpenSSL hspec hspec-expectations HUnit + io-streams lifted-base mtl network network-uri openssl-streams snap + snap-core snap-server system-fileio system-filepath text + transformers unordered-containers ]; description = "HTTP and WebSocket client based on io-streams"; license = "BSD-3-Clause AND GPL-2.0-or-later"; @@ -161923,6 +162238,8 @@ self: { pname = "http-media"; version = "0.8.1.1"; sha256 = "10zi0c6v0vngxadlbzfp1y1fgyx1ac5gvyvl0gv6gl8m3grss80r"; + revision = "1"; + editedCabalFile = "0vlaxmh1qqli981bwn3hw0hqfy6spkijdywycnhxi0z1qg5837fk"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -162213,35 +162530,6 @@ self: { }) {}; "http-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, filepath, ghc-prim, HsOpenSSL, hspec - , hspec-expectations, http-common, HUnit, io-streams, lifted-base - , mtl, network, network-uri, openssl-streams, random, snap-core - , snap-server, text, transformers, unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.9.8"; - sha256 = "1dfsynqhl7whrbz8hvjdxlnlnywwywjjm7gkii0jl67k7fxm4375"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory filepath HsOpenSSL http-common - io-streams mtl network network-uri openssl-streams text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams random snap-core snap-server - text transformers unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_9_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, attoparsec-aeson , base, base64-bytestring, blaze-builder, bytestring , case-insensitive, directory, filepath, ghc-prim, HsOpenSSL, hspec @@ -162268,7 +162556,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http-test" = callPackage @@ -167204,32 +167491,32 @@ self: { "ihaskell" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , cmdargs, containers, directory, exceptions, filepath, ghc - , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec - , hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, parsec, process, random, raw-strings-qq, setenv - , shelly, split, stm, strict, text, time, transformers, unix - , unordered-containers, utf8-string, vector + , ghc-boot, ghc-parser, ghc-paths, ghc-syntax-highlighter + , haskeline, hlint, hspec, hspec-contrib, http-client + , http-client-tls, HUnit, ipython-kernel, parsec, process, random + , raw-strings-qq, setenv, shelly, split, stm, strict, text, time + , transformers, unix, unordered-containers, utf8-string, vector }: mkDerivation { pname = "ihaskell"; - version = "0.10.4.0"; - sha256 = "0vl6nmr72abf4jijxga9lnhj1w1iz5b4642r8xnqmavz4ds9qpsv"; + version = "0.11.0.0"; + sha256 = "1mjjsmjvapkmj69qzp9sskgxi04fymacvy0la7lr1rcrl9z5x5hd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring cmdargs containers directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths - haskeline hlint http-client http-client-tls ipython-kernel parsec - process random shelly split stm strict text time transformers unix - unordered-containers utf8-string vector + ghc-syntax-highlighter haskeline hlint http-client http-client-tls + ipython-kernel parsec process random shelly split stm strict text + time transformers unix unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers directory ghc ipython-kernel process strict text transformers unix unordered-containers ]; testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit + aeson base directory ghc ghc-paths hspec hspec-contrib HUnit raw-strings-qq setenv shelly text transformers ]; description = "A Haskell backend kernel for the Jupyter project"; @@ -167294,20 +167581,18 @@ self: { "ihaskell-diagrams" = callPackage ({ mkDerivation, active, base, bytestring, diagrams, diagrams-cairo - , diagrams-lib, directory, ihaskell, text + , diagrams-lib, directory, filepath, ihaskell, temporary, text }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.3.2.1"; - sha256 = "0ssczqr41nrbrdr95vz457mwxcpmcrwd1bihzccmici1fvjd13rx"; + version = "0.4.0.0"; + sha256 = "1qx2936iwgqvd8911c9rbxd3g8m5maxfdvdfahzwfyasq9l54662"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib - directory ihaskell text + directory filepath ihaskell temporary text ]; description = "IHaskell display instances for diagram types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-display" = callPackage @@ -167367,6 +167652,8 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -167466,22 +167753,21 @@ self: { }) {}; "ihaskell-widgets" = callPackage - ({ mkDerivation, aeson, base, containers, ihaskell, ipython-kernel - , scientific, singletons, text, unix, unordered-containers, vector - , vinyl + ({ mkDerivation, aeson, base, bytestring, containers, ihaskell + , ipython-kernel, scientific, singletons, singletons-base, text + , unix, unordered-containers, vector, vinyl }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.3.3"; - sha256 = "1b4v8ng9y9n9wkadjj06iab71gbqkfr7plxxn1a9fn6qgnnlmdg8"; + version = "0.4.0.0"; + sha256 = "0wm335hf987h82ndy4jq3m9w0nkn7xbycdz0nyi6sfm47q1k7fw4"; libraryHaskellDepends = [ - aeson base containers ihaskell ipython-kernel scientific singletons - text unix unordered-containers vector vinyl + aeson base bytestring containers ihaskell ipython-kernel scientific + singletons singletons-base text unix unordered-containers vector + vinyl ]; description = "IPython standard widgets for IHaskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihp-hsx" = callPackage @@ -171337,8 +171623,8 @@ self: { ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: mkDerivation { pname = "io-classes"; - version = "1.2.0.0"; - sha256 = "136i6py474i1wv0fvav9qb9wrz3clljxixsd4z42qcrzpyry80nn"; + version = "1.3.0.0"; + sha256 = "1k2ngdrpnczdv9kz79bdb9mzwlshba4zas6kksz1qc7fsm7afnj8"; libraryHaskellDepends = [ array async base bytestring mtl stm time ]; @@ -171350,10 +171636,8 @@ self: { ({ mkDerivation, array, base, io-classes, mtl, si-timers }: mkDerivation { pname = "io-classes-mtl"; - version = "0.1.0.1"; - sha256 = "0kqq14jgpkxaz106ahr20apizgdnxz2q0ih9kwgz0q4l1v106698"; - revision = "2"; - editedCabalFile = "15z9s5gx4z9f9sg7fjgi83ri2hpk970sjjigwpdc7ask4f2j9ff4"; + version = "0.1.0.2"; + sha256 = "06v55dppc3l0kcncigv4gkn0fgdr3rgcf78in618y7jnc1xszb6f"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -171428,21 +171712,20 @@ self: { "io-sim" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , exceptions, io-classes, nothunks, parallel, psqueues, QuickCheck - , quiet, si-timers, strict-stm, tasty, tasty-hunit - , tasty-quickcheck, time + , exceptions, io-classes, nothunks, psqueues, QuickCheck, quiet + , si-timers, strict-stm, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "io-sim"; - version = "1.2.0.0"; - sha256 = "1h765ab2853k5q7pg0f9mp65925xs0j2sfm4c87qmiwgy53ac6gb"; + version = "1.3.0.0"; + sha256 = "0mrq1mxlfkwh49skrdk7c3h3qdyf55mkfn6iii5qd3q5x5y7ggc1"; libraryHaskellDepends = [ - base containers deepseq exceptions io-classes nothunks parallel - psqueues QuickCheck quiet si-timers strict-stm time + base containers deepseq exceptions io-classes nothunks psqueues + QuickCheck quiet si-timers strict-stm time ]; testHaskellDepends = [ - array base containers io-classes parallel QuickCheck si-timers - strict-stm tasty tasty-hunit tasty-quickcheck time + array base containers io-classes QuickCheck si-timers strict-stm + tasty tasty-hunit tasty-quickcheck time ]; benchmarkHaskellDepends = [ base criterion io-classes ]; description = "A pure simulator for monadic concurrency with STM"; @@ -172019,6 +172302,29 @@ self: { license = lib.licenses.mit; }) {}; + "ipython-kernel_0_11_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , cryptonite, directory, filepath, memory, parsec, process + , temporary, text, transformers, unordered-containers, uuid + , zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.11.0.0"; + sha256 = "19r08fb814fp58wik0iihhypa8awxwpbli3n55gdi4a8xzy1yrdr"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary bytestring containers cryptonite directory + filepath memory parsec process temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -172689,27 +172995,6 @@ self: { }: mkDerivation { pname = "isomorphism-class"; - version = "0.1.0.10"; - sha256 = "1017zzav1s00jsxjv419zcrm5i334n9zz42isz6b85hiixqm848v"; - libraryHaskellDepends = [ - base bytestring containers hashable primitive text - unordered-containers vector - ]; - testHaskellDepends = [ - bytestring primitive QuickCheck quickcheck-instances rebase tasty - tasty-quickcheck text vector - ]; - description = "Isomorphism typeclass solving the conversion problem"; - license = lib.licenses.mit; - }) {}; - - "isomorphism-class_0_1_0_11" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, primitive - , QuickCheck, quickcheck-instances, rebase, tasty, tasty-quickcheck - , text, unordered-containers, vector - }: - mkDerivation { - pname = "isomorphism-class"; version = "0.1.0.11"; sha256 = "1z9p9pgqdqcljdmknvxhh3mmlj28i8186mavfi52fkxz05mc85z3"; libraryHaskellDepends = [ @@ -172722,7 +173007,6 @@ self: { ]; description = "Isomorphism typeclass solving the conversion problem"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "isotope" = callPackage @@ -173743,8 +174027,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "jacobi-theta"; - version = "0.2.2.1"; - sha256 = "0gpyaqrfajcxlgxqjd1kk30a571ini6ikw6n6l2ryzw2971z127n"; + version = "0.2.2.2"; + sha256 = "01wax5spwr6qkkbdwdrlprxj0w7i8g7gijy31hzmllgwqcb59pbb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Jacobi Theta Functions"; @@ -174895,8 +175179,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.10"; - sha256 = "0hhj1a6y7c63vka3f0k732clcx80k74syrfv2r996rxfxmlqlj8z"; + version = "0.10.0.1"; + sha256 = "1fbc65dlb5yydcxa4da2plmfyp4136i52zrak4i3vpyf53yfqf1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174907,10 +175191,37 @@ self: { testHaskellDepends = [ aeson base base64-bytestring bytestring concise containers cryptonite hedgehog hspec lens mtl network-uri pem tasty - tasty-hedgehog tasty-hspec text time x509 + tasty-hedgehog tasty-hspec time x509 + ]; + description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library"; + license = lib.licenses.asl20; + }) {}; + + "jose_0_11" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , concise, containers, crypton, crypton-x509, hedgehog, hspec, lens + , memory, monad-time, mtl, network-uri, pem, tasty, tasty-hedgehog + , tasty-hspec, template-haskell, text, time + }: + mkDerivation { + pname = "jose"; + version = "0.11"; + sha256 = "0h0byx4jww4w5k1nl123kr1vgszarjd8ib4cn75xq24ji4yyfx19"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring concise containers crypton + crypton-x509 lens memory monad-time mtl network-uri + template-haskell text time + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring concise containers crypton + crypton-x509 hedgehog hspec lens mtl network-uri pem tasty + tasty-hedgehog tasty-hspec time ]; description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -175633,6 +175944,26 @@ self: { license = lib.licenses.mit; }) {}; + "json-feed_2_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "2.0.0.10"; + sha256 = "0s9fq0yp3svi8jcn2isb4kb5l71hhrahrrflciv1jzbn1kwx8lqj"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -175860,6 +176191,8 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "json-rpc-client" = callPackage @@ -178974,8 +179307,8 @@ self: { }: mkDerivation { pname = "keycloak-hs"; - version = "3.0.1"; - sha256 = "1311rzvib7cbb2j4bjqbd5y03frsqqn32grhypvk0fplrdr1hazn"; + version = "3.0.2"; + sha256 = "077gmrfsffkpli5ws04laz861fd4qikrs4ihi3h7sjsqrljfx512"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179646,9 +179979,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kmonad"; - broken = true; }) {}; "kmp-dfa" = callPackage @@ -180583,6 +180914,19 @@ self: { license = lib.licenses.mit; }) {}; + "lackey_2_0_0_7" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "2.0.0.7"; + sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; + libraryHaskellDepends = [ base servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181531,19 +181875,15 @@ self: { "lame" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath - , hspec, hspec-discover, htaglib, mp3lame, temporary, text - , transformers, wave + , hspec, hspec-discover, htaglib, mp3lame, temporary, text, wave }: mkDerivation { pname = "lame"; - version = "0.2.1"; - sha256 = "1xz98v2kqs69jijza0vyz57lpbs3h2f7fcablihlzprh1sylc3vq"; - revision = "1"; - editedCabalFile = "15jf93rcjwzgl0780c86nn29dif6avwpj3x4xpkq5lmll9zxqj60"; + version = "0.2.2"; + sha256 = "0zfjiyabzzkg9mdy8ynf9sa89zcdpvynzhph7svyjxw6a6h0i0mg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring directory exceptions filepath text transformers - wave + base bytestring directory exceptions filepath text wave ]; librarySystemDepends = [ mp3lame ]; testHaskellDepends = [ @@ -181573,6 +181913,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "laminar" = callPackage + ({ mkDerivation, async, base, containers, random, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "laminar"; + version = "0.1.0.1"; + sha256 = "1cpkj7zmg29cy9ijl74js3agxbmg8crkg7pykg6l9vqiqpczpajh"; + libraryHaskellDepends = [ async base containers random text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Run dependent IO actions asynchronously"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "landlock" = callPackage ({ mkDerivation, async, base, directory, exceptions, filepath , markdown-unlit, optparse-applicative, process, psx, QuickCheck @@ -181782,6 +182138,8 @@ self: { pname = "language-c"; version = "0.9.2"; sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"; + revision = "1"; + editedCabalFile = "03qfp9mf4yrdw3m6sab3np7wjaigg5p3xiiirxin8ihsnnx4rv5l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -182083,13 +182441,13 @@ self: { ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { pname = "language-dot"; - version = "0.1.1"; - sha256 = "176fc2y7j1b5fqa75q38cqfdyjqpc6i40hncc6r2apcbxdriryfn"; + version = "0.1.2"; + sha256 = "1ikhamvrri7hm9qngpz8an3fsc9jkqqkg9h47lylmg3vi8dd4bgc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; executableHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base parsec ]; + testHaskellDepends = [ base parsec pretty ]; description = "A library for the analysis and creation of Graphviz DOT files"; license = lib.licenses.bsd3; mainProgram = "ppdot"; @@ -182703,16 +183061,17 @@ self: { , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filecache, filepath, formatting, Glob , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data - , http-client, lens, megaparsec, memory, mtl, operational - , optparse-applicative, parsec, parser-combinators, pcre-utils - , protolude, random, regex-pcre-builtin, scientific, servant - , servant-client, split, stm, strict-base-types, temporary, text - , time, transformers, unix, unordered-containers, vector, yaml + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml }: mkDerivation { pname = "language-puppet"; - version = "1.4.6.5"; - sha256 = "0j32504iwla8h33h4nycx6gwp46kvlqp1d6c9wirygm8ng3vpz6r"; + version = "1.5.1"; + sha256 = "0bp2kikva16iasmv1mwgm8lkz3srk3mpx37xaphy7jdd50lc5nn5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182720,10 +183079,10 @@ self: { aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring case-insensitive containers cryptonite directory filecache filepath formatting hashable hruby hslogger http-api-data http-client lens - megaparsec memory mtl operational parsec parser-combinators - pcre-utils protolude random regex-pcre-builtin scientific servant - servant-client split stm strict-base-types text time transformers - unix unordered-containers vector yaml + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base bytestring containers Glob hslogger @@ -182996,8 +183355,8 @@ self: { pname = "language-toolkit"; version = "1.1.0.0"; sha256 = "0ffr53jggh3c01v802xywy387jv5wa5vwwyvipiqpxwqcspr4nd7"; - revision = "1"; - editedCabalFile = "129ya22xxv71hv8xxknlpd9ig3xbwld00likf19g7b6psnx60kk0"; + revision = "4"; + editedCabalFile = "13m1qsn04yc4q04xihjivb6pz73gv0sn9d5qxb9q1a4cg63k21c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers deepseq parallel ]; @@ -183627,8 +183986,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.0.0"; - sha256 = "1sq5sl0m2nnzh23rvwknmkbxmrvyiik0rlqh4fhzbirm8h0si44b"; + version = "4.0.1"; + sha256 = "0rmjkdlbayfp3bgwyw0rkpj7cc4fkgsh1f6388v6hhdip3j8r9ni"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -185513,8 +185872,8 @@ self: { pname = "lentil"; version = "1.5.6.0"; sha256 = "0sjhhvrw3xbisg8mi1g67yj5r43wzyhqav61wm0ynb1wakc7das1"; - revision = "2"; - editedCabalFile = "1075p06xxahc00pqvk6025axvbcfyzw41cqgrhizj1kbrs1alrlb"; + revision = "3"; + editedCabalFile = "0zaky33crps113gar0hh2zbi69ijfhhhfp6rg64jnl41vby83dhk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -189340,6 +189699,23 @@ self: { mainProgram = "list-remote-forwards"; }) {}; + "list-shuffle" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, primitive, random + , tasty-bench + }: + mkDerivation { + pname = "list-shuffle"; + version = "1.0.0"; + sha256 = "03qvms9z3jrcz1lswb6kzyk8bw9gafmkz5yil7vi3jirhxxq7491"; + libraryHaskellDepends = [ base primitive random ]; + testHaskellDepends = [ base hedgehog random ]; + benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; + description = "List shuffling and sampling"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "list-singleton" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192993,6 +193369,8 @@ self: { pname = "lucid"; version = "2.11.20230408"; sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"; + revision = "1"; + editedCabalFile = "1gb3b79xf4jp0xvk2anlvpvac6gqcfpffylkwki19lrx6jbd8fqs"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers @@ -193158,6 +193536,8 @@ self: { pname = "lucid2"; version = "0.0.20230706"; sha256 = "165bar5kgdrldg46f743jhf0p2krvrrpsg0my7zbgxyjayrwf8bd"; + revision = "1"; + editedCabalFile = "0h6s6mdvb0n7b8nx5cwks6s9lglazmy8qigbrmnzfm4zbmh7r58m"; libraryHaskellDepends = [ base bytestring containers mtl text transformers ]; @@ -193645,8 +194025,8 @@ self: { }: mkDerivation { pname = "lz4-hs"; - version = "0.1.5.1"; - sha256 = "1kl8zxladsby7y5fk2gdkipjn6kb8kkzdpf8xccnvhmgzn8qj4cn"; + version = "0.1.5.2"; + sha256 = "1lqh2sahmk4z0hw4insknzrs9a80872mfpvqacdi41qggp1b1qlb"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -193700,6 +194080,8 @@ self: { pname = "lzma"; version = "0.0.1.0"; sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; + revision = "1"; + editedCabalFile = "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ @@ -194639,6 +195021,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "mailtrap" = callPackage + ({ mkDerivation, aeson, base, base64, blaze-html, bytestring + , email-validate, filepath, http-conduit, mime-types, text, time + , unordered-containers, uuid-types + }: + mkDerivation { + pname = "mailtrap"; + version = "0.1.1.0"; + sha256 = "177zfswsgg8r51pzjvyf7k4dnvrfq3zj82b54xh5vdpd74k3x2ng"; + libraryHaskellDepends = [ + aeson base base64 blaze-html bytestring email-validate filepath + http-conduit mime-types text time unordered-containers uuid-types + ]; + description = "Mailtrap API library"; + license = lib.licenses.mit; + }) {}; + "main-tester" = callPackage ({ mkDerivation, base, bytestring, directory, hspec, hspec-core , QuickCheck, text @@ -195554,6 +195953,32 @@ self: { broken = true; }) {}; + "mappings" = callPackage + ({ mkDerivation, base, cond, containers, formatting, hspec + , partialord + }: + mkDerivation { + pname = "mappings"; + version = "0.1.0.0"; + sha256 = "0xkb3zqr1iqjz4kfk6pzq17jxywx96lbxs59izg4fc4wwfz08l2w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cond containers formatting partialord + ]; + executableHaskellDepends = [ + base cond containers formatting partialord + ]; + testHaskellDepends = [ + base cond containers formatting hspec partialord + ]; + description = "Types which represent functions k -> v"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "view"; + broken = true; + }) {}; + "mappy" = callPackage ({ mkDerivation, ansi-terminal, base, containers, directory , haskeline, hspec, parsec, QuickCheck @@ -196408,29 +196833,6 @@ self: { }) {}; "math-functions" = callPackage - ({ mkDerivation, base, data-default-class, deepseq, erf, gauge - , primitive, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.3.4.2"; - sha256 = "18y1hlc8p6yyxa14zdbm84aaq58kksbrlfp3rj2bd4ilsb00mrf1"; - libraryHaskellDepends = [ - base data-default-class deepseq primitive vector - ]; - testHaskellDepends = [ - base data-default-class deepseq erf primitive QuickCheck tasty - tasty-hunit tasty-quickcheck vector vector-th-unbox - ]; - benchmarkHaskellDepends = [ - base data-default-class gauge random vector - ]; - description = "Collection of tools for numeric computations"; - license = lib.licenses.bsd2; - }) {}; - - "math-functions_0_3_4_3" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, primitive , QuickCheck, random, tasty, tasty-bench, tasty-hunit , tasty-quickcheck, vector, vector-th-unbox @@ -196451,7 +196853,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "math-grads" = callPackage @@ -197958,17 +198359,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec_9_5_0" = callPackage + "megaparsec_9_6_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text , transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "9.5.0"; - sha256 = "0lnsqdphr3fnxvn87z2ni110wzq60pq6fl407ihddpyavpb0hw38"; - revision = "4"; - editedCabalFile = "0f6g05w18kn34rcjkxfdsg4sibxsz41p2xac7wfc9wqpr0l9kg55"; + version = "9.6.1"; + sha256 = "1zyb1mqa2mjjig5aggndifh6zqlwbw8sn4nm4an73gkxhjz5f8m3"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -198006,17 +198405,15 @@ self: { license = lib.licenses.bsd2; }) {}; - "megaparsec-tests_9_5_0" = callPackage + "megaparsec-tests_9_6_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-megaparsec, megaparsec, mtl , QuickCheck, scientific, temporary, text, transformers }: mkDerivation { pname = "megaparsec-tests"; - version = "9.5.0"; - sha256 = "18ishnklylaiphkz6dd9rfbxnqlrb4fqqd8pr5mk9qb5j0fkbv13"; - revision = "2"; - editedCabalFile = "1zh7ggvc1453b734mmc7yyd8f6qrr34bnvab0507l1nflml7w9bb"; + version = "9.6.1"; + sha256 = "1l3rmg4ymw4czqkkb3502g322ijdg11c1img9l4p6ipy7hdzw52n"; libraryHaskellDepends = [ base bytestring containers hspec hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -199996,20 +200393,118 @@ self: { }) {}; "mig" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , case-insensitive, containers, exceptions, http-api-data - , http-types, mtl, text, wai, warp + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, exceptions, extra, filepath, hspec + , http-api-data, http-media, http-types, insert-ordered-containers + , lens, lrucache, mtl, openapi3, safe, text, transformers }: mkDerivation { pname = "mig"; - version = "0.1.0.3"; - sha256 = "1xkiq1ca2rxxzn8a8y0scc6w78lwqlxfdskjay38i1ghlq7brb5s"; + version = "0.2.0.1"; + sha256 = "15ljws449p8w8rya8frr6zkagryw84lrpxfs1xjxff8vjgg1n6hw"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers + exceptions extra filepath http-api-data http-media http-types + insert-ordered-containers lens lrucache mtl openapi3 safe text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec http-api-data http-types mtl + openapi3 text + ]; + description = "Build lightweight and composable servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-client" = callPackage + ({ mkDerivation, base, bytestring, containers, http-api-data + , http-client, http-media, http-types, mig, mtl, text + }: + mkDerivation { + pname = "mig-client"; + version = "0.1.0.1"; + sha256 = "17zlcryagzb7mv9pbfqp7gy47va4mamkxzf01cavzac1cm23hh3w"; + libraryHaskellDepends = [ + base bytestring containers http-api-data http-client http-media + http-types mig mtl text + ]; + description = "Build http-clients from API definition for mig servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-extra" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring + , case-insensitive, containers, data-default, exceptions, extra + , http-api-data, http-media, http-types, mig, mig-client, openapi3 + , template-haskell, text, time, transformers, yaml + }: + mkDerivation { + pname = "mig-extra"; + version = "0.1.0.1"; + sha256 = "0zwzpicvm8fb3hm6f0g0g0zapijz20yzr8hw7i148cc4ihwdxpl9"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring case-insensitive containers + data-default exceptions extra http-api-data http-media http-types + mig mig-client openapi3 template-haskell text time transformers + yaml + ]; + description = "Extra utils for Mig core library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-server" = callPackage + ({ mkDerivation, aeson, base, blaze-html, data-default + , http-api-data, http-types, mig, mig-extra, mig-swagger-ui + , mig-wai, openapi3, text, transformers, warp + }: + mkDerivation { + pname = "mig-server"; + version = "0.1.0.1"; + sha256 = "0hv58843asha2wqjh6y2pfx6zs3y5azisrdfihd5ml82s92d374d"; libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring case-insensitive - containers exceptions http-api-data http-types mtl text wai warp + aeson base blaze-html data-default http-api-data http-types mig + mig-extra mig-swagger-ui mig-wai openapi3 text transformers warp ]; description = "Build lightweight and composable servers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-swagger-ui" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, blaze-html + , blaze-markup, bytestring, data-default, file-embed-lzma + , http-api-data, lens, mig, openapi3, text + }: + mkDerivation { + pname = "mig-swagger-ui"; + version = "0.1.0.1"; + sha256 = "1hygqx3f9zq2qir5b2a8bz8yfk2irhmql366jf5817873q7kfvc0"; + libraryHaskellDepends = [ + aeson aeson-pretty base blaze-html blaze-markup bytestring + data-default file-embed-lzma http-api-data lens mig openapi3 text + ]; + description = "Swagger servers for mig library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "mig-wai" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , exceptions, mig, text, wai + }: + mkDerivation { + pname = "mig-wai"; + version = "0.1.0.1"; + sha256 = "1jayzfss1kz4fnyadxjpv4v0dms4j2zgbsddnjvgysgp8fwkb1x8"; + libraryHaskellDepends = [ + base bytestring containers data-default exceptions mig text wai + ]; + description = "Render mig-servers as wai-applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "mighttpd" = callPackage @@ -200342,23 +200837,11 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.1.0"; - sha256 = "06z1z5q7c77sdaych0jq1d54vdkrx1gybzyl6crcnhkiwga1xl7b"; - libraryHaskellDepends = [ base bytestring containers text ]; - description = "Basic mime-type handling types and functions"; - license = lib.licenses.mit; - }) {}; - - "mime-types_0_1_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "mime-types"; version = "0.1.2.0"; sha256 = "0qagjx5mxzl62ajlvhdqsjkh7f8zzvrq5s343bws89hp9j5f8fh1"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "min-max-pqueue" = callPackage @@ -204579,27 +205062,6 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.4"; - sha256 = "1ycxv01hf7svhaczsdprklh1r96300zdlkhar8dxwggajs9njyjn"; - libraryHaskellDepends = [ - base bytestring commutative-semigroups containers primes text - vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_2_4_1" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, primes, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; version = "1.2.4.1"; sha256 = "0jpdazjxxfih8zz0myada1728r9103a882904i7cd1y6v2m17wdj"; libraryHaskellDepends = [ @@ -204612,7 +205074,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -205941,6 +206402,27 @@ self: { mainProgram = "mp3driver"; }) {}; + "mpd-current-json" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, libmpd + , optparse-applicative + }: + mkDerivation { + pname = "mpd-current-json"; + version = "1.2.0.0"; + sha256 = "0ih0x53mwgpk87mznhhwhjhgznl6ap8i5skb9lmsfpnpmy27xh7s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base libmpd ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring libmpd optparse-applicative + ]; + description = "Print current MPD song and status as JSON"; + license = lib.licenses.unlicense; + hydraPlatforms = lib.platforms.none; + mainProgram = "mpd-current-json"; + broken = true; + }) {}; + "mpdmate" = callPackage ({ mkDerivation, base, directory, network, powermate, unix }: mkDerivation { @@ -206831,6 +207313,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "mstate_0_2_10" = callPackage + ({ mkDerivation, base, fail, monad-peel, mtl, stm }: + mkDerivation { + pname = "mstate"; + version = "0.2.10"; + sha256 = "1lx50m7hhlpq3i1aha1pixb9xf3rbvdz2pg4hgmz93kkvz0fdpkf"; + libraryHaskellDepends = [ base fail monad-peel mtl stm ]; + description = "MState: A consistent State monad for concurrent applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "msu" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, directory , errors, filepath, hspec, parsec, process, unliftio, yaml @@ -208916,8 +209410,8 @@ self: { pname = "mvc"; version = "1.1.7"; sha256 = "1887z2im418rzkqin2mk7f839qgvv4snnxm2qzlcnym89hspz37w"; - revision = "1"; - editedCabalFile = "0cpffbbyzs6z5wrdk6jmcilnlq746p71x5sdk0pcy1gyklal5kx6"; + revision = "2"; + editedCabalFile = "1w15ngkvw89j81xcl65jl3ryfjanky6l4xsa8yh91zy0imynq874"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -208935,8 +209429,8 @@ self: { pname = "mvc-updates"; version = "1.2.0"; sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; - revision = "1"; - editedCabalFile = "1rnp1y18mrrf05ywj557jmfhjscy8wgjhj2y0wb8xm8ifwccv24a"; + revision = "2"; + editedCabalFile = "1al0sfcnyrrqyxlm3rg1zwg2iyk9am1j80g37x6hcg5prxqx98m0"; libraryHaskellDepends = [ async base foldl mvc ]; description = "Concurrent and combinable updates"; license = lib.licenses.bsd3; @@ -209478,17 +209972,17 @@ self: { }) {}; "mysql-json-table" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, mysql - , mysql-simple + ({ mkDerivation, aeson, base, bytestring, conduit, exceptions + , mysql, mysql-simple }: mkDerivation { pname = "mysql-json-table"; - version = "0.1.0.0"; - sha256 = "1mc4xjgvwj1h687f4rh8sy5q102rg17ppszfyph8h0hkahy6nqxc"; + version = "0.1.2.0"; + sha256 = "0k27jbm1pg07bk633h7zvkgfd28m35vds31ibz5mizll8xwvaz4i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring conduit mysql mysql-simple + aeson base bytestring conduit exceptions mysql mysql-simple ]; executableHaskellDepends = [ base conduit mysql-simple ]; description = "Using MySQL to store id-to-json tables"; @@ -210477,6 +210971,24 @@ self: { broken = true; }) {}; + "national-australia-bank" = callPackage + ({ mkDerivation, base, bytestring, containers, digit, directory + , filepath, lens, mtl, parsec, sv, time, transformers, utf8-string + , validation + }: + mkDerivation { + pname = "national-australia-bank"; + version = "0.0.2"; + sha256 = "1cpswfd21an4w2nmycyqk5sblaifm5rxqlh8lbhnqf55crmk0c3a"; + libraryHaskellDepends = [ + base bytestring containers digit directory filepath lens mtl parsec + sv time transformers utf8-string validation + ]; + description = "Functions for National Australia Bank transactions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nationstates" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, tls, transformers, xml @@ -214250,12 +214762,12 @@ self: { "nix-narinfo" = callPackage ({ mkDerivation, attoparsec, base, containers, filepath, hspec - , QuickCheck, text + , hspec-discover, QuickCheck, text }: mkDerivation { pname = "nix-narinfo"; - version = "0.1.0.1"; - sha256 = "0bw5whywbhcj18y733wqq5cgci4yijrz648sby8r3qihn8man3ch"; + version = "0.1.0.2"; + sha256 = "047qdxq27siwkvhs2sc7p380k8dlzdinkbj3d7g63i3qv0vz4lci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base containers text ]; @@ -214263,6 +214775,7 @@ self: { testHaskellDepends = [ attoparsec base filepath hspec QuickCheck text ]; + testToolDepends = [ hspec-discover ]; description = "Parse and render .narinfo files"; license = lib.licenses.bsd3; mainProgram = "pretty-narinfo"; @@ -214425,16 +214938,16 @@ self: { "nixfmt" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec - , parser-combinators, safe-exceptions, text, unix + , parser-combinators, safe-exceptions, scientific, text, unix }: mkDerivation { pname = "nixfmt"; - version = "0.5.0"; - sha256 = "0rxi8zrd2xr72w673nvgnhb0g3r7rssc1ahlhz8rmdpc6c1a82wl"; + version = "0.6.0"; + sha256 = "0jgg8cp2q6ip15cjw10zk2ff4avqc5nwd8amkrrqm0zka41pc0jz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base megaparsec parser-combinators text + base megaparsec parser-combinators scientific text ]; executableHaskellDepends = [ base cmdargs directory filepath safe-exceptions text unix @@ -215166,6 +215679,8 @@ self: { pname = "nonempty-vector"; version = "0.2.3"; sha256 = "18xcsw2c9gy03dvrlanh799j1ab6dkpd6wwgj8b681r12ha04dqa"; + revision = "1"; + editedCabalFile = "0kn1s5ssan9m4xwf10y2ymba4zw2j18j6dvbpr6iral3rrlgngdw"; libraryHaskellDepends = [ base deepseq primitive vector ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck vector @@ -215500,6 +216015,8 @@ self: { pname = "nothunks"; version = "0.1.4"; sha256 = "0x8km8pmdnjsafchndzxrypldxscj8h080i14hvkj2ypfkmh52l8"; + revision = "1"; + editedCabalFile = "0xv39s948j50ym1fn5h7xfxr6zl4v7h2mc68qrp4zz2mahx9mk7d"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector ]; @@ -215510,6 +216027,25 @@ self: { license = lib.licenses.asl20; }) {}; + "nothunks_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim + , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector + }: + mkDerivation { + pname = "nothunks"; + version = "0.1.5"; + sha256 = "1s5x4g5g62bs3jd44p2p9lvv01gwarm8jmmigm1d3i8ia8w0lz4w"; + libraryHaskellDepends = [ + base bytestring containers ghc-heap stm text time vector + ]; + testHaskellDepends = [ + base containers ghc-prim hedgehog random stm tasty tasty-hedgehog + ]; + description = "Examine values for unexpected thunks"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "notifications-tray-icon" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers, dbus , gi-dbusmenu, gi-gio, gi-glib, github, haskeline, hslogger @@ -215543,8 +216079,8 @@ self: { }: mkDerivation { pname = "notmuch"; - version = "0.3.1"; - sha256 = "1lvxrljzgpc1rgdgrb6x35k3syc9wnnh3acr8dbfj7n2giq5ganr"; + version = "0.3.1.1"; + sha256 = "18z8pbqagdyd5rqv42i6060vv40gv84dx3sf52vvrayga19k1ydw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217164,8 +217700,8 @@ self: { ({ mkDerivation, array, base, deepseq, random, time }: mkDerivation { pname = "oalg-base"; - version = "1.0.0.0"; - sha256 = "1x5k59wj08fr7h1ycwwalf669xia9573hhykl0x09zz50zfjzl41"; + version = "1.1.0.0"; + sha256 = "1zsfbdyz3m9alg1cvsiz64gqivbldgkwg60b6lkl6b7axx6ys4j9"; libraryHaskellDepends = [ array base deepseq random time ]; testHaskellDepends = [ array base deepseq random time ]; description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems"; @@ -221326,6 +221862,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "ordering-duplicates" = callPackage + ({ mkDerivation, base, contravariant, lens, mtl }: + mkDerivation { + pname = "ordering-duplicates"; + version = "0.0.2"; + sha256 = "1c2d2np8dqxsbhkdjk3lzh0ninlzcbdczd0bkq1przcraswxsll5"; + libraryHaskellDepends = [ base contravariant lens mtl ]; + description = "Functions for detecting duplicates"; + license = lib.licenses.bsd3; + }) {}; + "ordering-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -221745,6 +222292,40 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_7_3_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, deepseq, Diff, directory, file-embed + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.3.0"; + sha256 = "1lmzmz8gfh994fmwr4cj955a1mny0cqjrqhc4cp0liy3byla92ks"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + deepseq Diff directory file-embed filepath ghc-lib-parser + megaparsec MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -221776,6 +222357,30 @@ self: { license = lib.licenses.asl20; }) {}; + "orville-postgresql" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, dlist + , hedgehog, network-uri, postgresql-libpq, random, resource-pool + , safe-exceptions, text, time, transformers, unliftio-core, uuid + }: + mkDerivation { + pname = "orville-postgresql"; + version = "1.0.0.0"; + sha256 = "1gri9224fsznbfz4ijawjbn32y88wfnry005dk45qg8mdd5gkn33"; + libraryHaskellDepends = [ + attoparsec base bytestring containers dlist network-uri + postgresql-libpq random resource-pool safe-exceptions text time + transformers unliftio-core uuid + ]; + testHaskellDepends = [ + attoparsec base bytestring containers hedgehog postgresql-libpq + resource-pool safe-exceptions text time uuid + ]; + description = "A Haskell library for PostgreSQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ory-hydra-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, deepseq, exceptions, hspec @@ -221979,6 +222584,23 @@ self: { broken = true; }) {}; + "ostree-pin" = callPackage + ({ mkDerivation, base, gi-gio, gi-ostree, simple-cmd-args, unix }: + mkDerivation { + pname = "ostree-pin"; + version = "0.1.1"; + sha256 = "0335p0a5y6fjspvw7fzxfvfvirl28jvmb5mzi7fl88fixxi4jwng"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base gi-gio gi-ostree simple-cmd-args unix + ]; + description = "Tool to update ostree deployment pin"; + license = lib.licenses.gpl3Only; + badPlatforms = lib.platforms.darwin; + mainProgram = "ostree-pin"; + }) {}; + "osx-ar" = callPackage ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { @@ -222864,6 +223486,8 @@ self: { pname = "pagination"; version = "0.2.2"; sha256 = "0k5rd55ssrk2f4vfzwnz09az6p1d6igbfmyyyjvnwwjrgcsmynig"; + revision = "1"; + editedCabalFile = "0nbf6gck16k6hk9pvzbbwhjdqzd16asa3swjx440m9vp3m6hwqbw"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; description = "Framework-agnostic pagination boilerplate"; @@ -223097,7 +223721,7 @@ self: { ]; }) {}; - "pandoc_3_1_8" = callPackage + "pandoc_3_1_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -223116,8 +223740,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.8"; - sha256 = "0yr4lkc50ygwvv9kv6f9s5bclar4syvbcrf9lzdvf3450x00brva"; + version = "3.1.9"; + sha256 = "06l62xpmgr35shld3rk1r4yab4x9019fjf1vz0lajjg5jfbl6sca"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -223767,6 +224391,38 @@ self: { mainProgram = "pandoc-plot"; }) {}; + "pandoc-plot_1_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, gitrev, hashable, hspec-expectations + , lifted-async, lifted-base, mtl, optparse-applicative, pandoc + , pandoc-types, shakespeare, tagsoup, tasty, tasty-hspec + , tasty-hunit, template-haskell, text, typed-process, unix, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "1.8.0"; + sha256 = "0hg2z0byp4px51y8hdfaa4gy1jkr2svfahq9abw1w0sg9r12rjxx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable lifted-async lifted-base mtl pandoc pandoc-types + shakespeare tagsoup template-haskell text typed-process unix yaml + ]; + executableHaskellDepends = [ + base containers directory filepath gitrev optparse-applicative + pandoc pandoc-types template-haskell text typed-process + ]; + testHaskellDepends = [ + base containers directory filepath hspec-expectations pandoc-types + tasty tasty-hspec tasty-hunit text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "pandoc-plot"; + }) {}; + "pandoc-pyplot" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl @@ -225611,6 +226267,8 @@ self: { pname = "parser-combinators"; version = "1.3.0"; sha256 = "0is45q3q6ngfqvzpwwga9phbwk45v7g1q2x1rlm95a7q946yy44k"; + revision = "1"; + editedCabalFile = "0xkqxas64dd77lgc341b526rip7vva0ipy2kbczmfga41lz5fnc6"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = lib.licenses.bsd3; @@ -226494,28 +227152,6 @@ self: { }: mkDerivation { pname = "path"; - version = "0.9.2"; - sha256 = "15xxsjdxxqxnh20iqhprbdyhldk2igl5gd4ld6hhk9nqgwqdcr0f"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath hashable template-haskell - text - ]; - testHaskellDepends = [ - aeson base bytestring filepath genvalidity genvalidity-hspec - genvalidity-property hspec mtl QuickCheck template-haskell validity - ]; - description = "Support for well-typed paths"; - license = lib.licenses.bsd3; - }) {}; - - "path_0_9_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, genvalidity, genvalidity-hspec, genvalidity-property - , hashable, hspec, mtl, QuickCheck, template-haskell, text - , validity - }: - mkDerivation { - pname = "path"; version = "0.9.5"; sha256 = "0cy4vilmhzhi5nfh4v2kyvizhjzjpjib3bvgm1sgmvjzj40dfgrd"; libraryHaskellDepends = [ @@ -226528,7 +227164,6 @@ self: { ]; description = "Support for well-typed paths"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "path-binary-instance" = callPackage @@ -226620,6 +227255,8 @@ self: { pname = "path-io"; version = "1.8.1"; sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; + revision = "1"; + editedCabalFile = "092gf9fk6f2h5apv2lgqww49gbqjljz70nz6yp7c1l6rhkmcnxaz"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -226849,6 +227486,28 @@ self: { license = lib.licenses.mit; }) {}; + "patrol_1_0_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, exceptions, hspec, http-client, http-types + , network-uri, text, time, uuid + }: + mkDerivation { + pname = "patrol"; + version = "1.0.0.6"; + sha256 = "02szpfdzhb7b6gklnly45wibma19h7dbklqcrc435ks0bjncgyi7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions + http-client http-types network-uri text time uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers exceptions hspec + http-client http-types network-uri text time uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "patronscraper" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt }: mkDerivation { @@ -227700,16 +228359,15 @@ self: { }) {}; "peano" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tasty-bench }: mkDerivation { pname = "peano"; - version = "0.1.0.1"; - sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; - revision = "3"; - editedCabalFile = "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n"; + version = "0.1.0.2"; + sha256 = "0qa2qxm492c4bac8il2riw17djk9pbjymng16dhilnxsimqyi3wa"; libraryHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base tasty-bench ]; description = "Peano numbers"; - license = "unknown"; + license = lib.licenses.bsd3; }) {}; "peano-inf" = callPackage @@ -228104,8 +228762,8 @@ self: { }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.4.6"; - sha256 = "0mbp4lwqwbhhpsbwi2cxrzr7pq2dg4x0sf9rc32fi6svbbcg1hb8"; + version = "0.1.4.7"; + sha256 = "151s5bqhl89ism9v4h93z0x8g0rcschx58ddvzj09xxxdbnf3rmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -228113,10 +228771,13 @@ self: { avif base bytestring hip JuicyPixels primitive vector vector-algorithms webp ]; + libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm ]; + executableToolDepends = [ cpphs ]; testHaskellDepends = [ base hspec ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ base criterion deepseq filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; @@ -230098,7 +230759,8 @@ self: { "phladiprelio-general-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit , phladiprelio-general-datatype, phladiprelio-general-shared - , phladiprelio-tests, phonetic-languages-constraints-array + , phladiprelio-tests, phonetic-languages-basis + , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics , phonetic-languages-simplified-base, rev-scientific @@ -230106,12 +230768,13 @@ self: { }: mkDerivation { pname = "phladiprelio-general-simple"; - version = "0.10.0.0"; - sha256 = "19sydm9r3ggkbkr53akzv8z504kv2dqcbncf86ivkv9qh56rxk3f"; + version = "0.11.1.0"; + sha256 = "1rlnkfiacz1d73bf503wy609gfq2xh7h912rqqm1g364kj473f2c"; libraryHaskellDepends = [ async base cli-arguments directory halfsplit phladiprelio-general-datatype phladiprelio-general-shared - phladiprelio-tests phonetic-languages-constraints-array + phladiprelio-tests phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-simplified-base rev-scientific @@ -230160,8 +230823,8 @@ self: { "phladiprelio-ukrainian-simple" = callPackage ({ mkDerivation, async, base, cli-arguments, directory, halfsplit - , phladiprelio-general-datatype, phladiprelio-tests - , phladiprelio-ukrainian-shared + , mmsyn2-array, phladiprelio-general-datatype, phladiprelio-tests + , phladiprelio-ukrainian-shared, phonetic-languages-basis , phonetic-languages-constraints-array , phonetic-languages-permutations-array , phonetic-languages-simplified-base @@ -230170,23 +230833,25 @@ self: { }: mkDerivation { pname = "phladiprelio-ukrainian-simple"; - version = "0.11.0.1"; - sha256 = "166v5cpdyxs754pmhlm05sbbbvlys8bfmgjr0grrqw6f1rnm1x2d"; + version = "0.12.1.0"; + sha256 = "0k29gyjfdjy2l36i857dhd5d0jk4w33acvy7c56j4m0lmsw0azmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base cli-arguments directory halfsplit + async base cli-arguments directory halfsplit mmsyn2-array phladiprelio-general-datatype phladiprelio-tests - phladiprelio-ukrainian-shared phonetic-languages-constraints-array + phladiprelio-ukrainian-shared phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base phonetic-languages-ukrainian-array rev-scientific rhythmic-sequences ukrainian-phonetics-basic-array ]; executableHaskellDepends = [ - async base cli-arguments directory halfsplit + async base cli-arguments directory halfsplit mmsyn2-array phladiprelio-general-datatype phladiprelio-tests - phladiprelio-ukrainian-shared phonetic-languages-constraints-array + phladiprelio-ukrainian-shared phonetic-languages-basis + phonetic-languages-constraints-array phonetic-languages-permutations-array phonetic-languages-simplified-base phonetic-languages-ukrainian-array rev-scientific @@ -232712,6 +233377,26 @@ self: { maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; + "pipes-safe_2_3_5" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.3.5"; + sha256 = "13npagy597g6zfr2f3vj4a98h2ssg2ps7lmdzrgdsvm8m28x3cph"; + revision = "1"; + editedCabalFile = "0ddvkil91z0j0n5i1jn6xnj423y5qyi1ax3cdwzb71galfjp7adc"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriella439 ]; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -233543,6 +234228,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -236074,14 +236761,12 @@ self: { }) {}; "poolboy" = callPackage - ({ mkDerivation, async, base, hspec, hspec-core, safe-exceptions - , stm - }: + ({ mkDerivation, async, base, hspec, hspec-core, stm, unliftio }: mkDerivation { pname = "poolboy"; - version = "0.2.1.0"; - sha256 = "01wz3bcs9az3g3f1a0gz4va22paqny5jsgakp014z2n84ks67kyd"; - libraryHaskellDepends = [ async base safe-exceptions stm ]; + version = "0.2.2.0"; + sha256 = "0d0lxqyf73w7nvgydbgv692zzc0zg2hk8sdd3lb6xyzdqkkd0vf3"; + libraryHaskellDepends = [ async base stm unliftio ]; testHaskellDepends = [ base hspec hspec-core ]; description = "Simple work queue for bounded concurrency"; license = lib.licenses.isc; @@ -236997,31 +237682,6 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.13.1"; - sha256 = "0l8rnsjmxskhlry1p34y1mfcrzwm382v4y2zcwsjhj5r09ihzkm2"; - libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - containers network-ip scientific text time transformers - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson network-ip postgresql-libpq QuickCheck quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = lib.licenses.mit; - }) {}; - - "postgresql-binary_0_13_1_1" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, containers, criterion, network-ip - , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; version = "0.13.1.1"; sha256 = "16s9j1c9kkkcxq1s8jnb2w5y14s9a25hmghbsd827d1qyvxxglwb"; libraryHaskellDepends = [ @@ -237036,7 +237696,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -237885,7 +238544,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "postgresql-typed_0_6_2_4" = callPackage + "postgresql-typed_0_6_2_5" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, convertible, criterion, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default @@ -237895,8 +238554,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.2.4"; - sha256 = "1wdwdghgnh6fip1pi220vnksc2g302g9v2wv2xi9yb0prs29xmsm"; + version = "0.6.2.5"; + sha256 = "0nzibv34m66z495g8qld97lchpdrnwph8h0hhj0dvbdylk99897d"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers crypton crypton-x509 crypton-x509-store crypton-x509-validation @@ -238470,6 +239129,8 @@ self: { pname = "pqueue"; version = "1.5.0.0"; sha256 = "00hzrhz3n55ahyv2h183l72jsl3q01p4ns0063p0vjaa5j6qpy0v"; + revision = "1"; + editedCabalFile = "1n9gypnfgqlc1b6djjbkcr8r7bxqf8mpfd7avcf11s529gzk9qgg"; libraryHaskellDepends = [ base deepseq indexed-traversable ]; testHaskellDepends = [ base deepseq indexed-traversable tasty tasty-quickcheck @@ -238673,6 +239334,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "predicate" = callPackage + ({ mkDerivation, base, contravariant, lens, mtl }: + mkDerivation { + pname = "predicate"; + version = "0.0.4"; + sha256 = "1dil18qzcr8bxf994hf11a1hqj6wd6nd2kg785cijs8hj67a177k"; + libraryHaskellDepends = [ base contravariant lens mtl ]; + description = "Predicates"; + license = lib.licenses.bsd3; + }) {}; + "predicate-class" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -239619,12 +240291,32 @@ self: { pname = "prettyprinter-combinators"; version = "0.1.1.1"; sha256 = "1553qii74af7a5xxj3n6ch9vv84kr5ayd1z69x0d78lqqraibx4y"; + revision = "1"; + editedCabalFile = "0dp01v9ywwzpvwbiljnlgrazh7pjz8p94wald2rvxa97xzlcm4z2"; + libraryHaskellDepends = [ + base bimap bytestring containers dlist pretty-show prettyprinter + syb template-haskell text unordered-containers vector + ]; + description = "Some useful combinators for the prettyprinter package"; + license = lib.licenses.asl20; + }) {}; + + "prettyprinter-combinators_0_1_2" = callPackage + ({ mkDerivation, base, bimap, bytestring, containers, dlist + , pretty-show, prettyprinter, syb, template-haskell, text + , unordered-containers, vector + }: + mkDerivation { + pname = "prettyprinter-combinators"; + version = "0.1.2"; + sha256 = "1kmvzczb9g3m2q7glrhwwaklbjs225xgq61vcp5qbysnyhdbxydi"; libraryHaskellDepends = [ base bimap bytestring containers dlist pretty-show prettyprinter syb template-haskell text unordered-containers vector ]; description = "Some useful combinators for the prettyprinter package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -240095,28 +240787,6 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.1.8"; - sha256 = "1c91izq58s0v9z4p2kb91af179n4dagvwkqqp46fzvam6n2xcrw3"; - libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus foldl list-t primitive - primitive-unlifted profunctors vector - ]; - testHaskellDepends = [ - cereal deferred-folds focus primitive QuickCheck rerebase tasty - tasty-hunit tasty-quickcheck - ]; - description = "Extras for the \"primitive\" library"; - license = lib.licenses.mit; - }) {}; - - "primitive-extras_0_10_1_10" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , foldl, list-t, primitive, primitive-unlifted, profunctors - , QuickCheck, rerebase, tasty, tasty-hunit, tasty-quickcheck - , vector - }: - mkDerivation { - pname = "primitive-extras"; version = "0.10.1.10"; sha256 = "1b83m53dwd2wagqzf0sy6wzsh3kj8prwdkkh6xbm6x0sqmr5ky8l"; libraryHaskellDepends = [ @@ -240129,7 +240799,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-foreign" = callPackage @@ -241230,17 +241899,16 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.6.1"; - sha256 = "1a8li2wkr2af1d5ddpprxzjs7m2j7ii30k7j93a22isfqmywhhbb"; - revision = "1"; - editedCabalFile = "1jhh1rz5i4mwhxhlc6zcv94qy9khyk3fjdf7cfbwivw1pylwgji1"; - isLibrary = false; + version = "0.4.7.0"; + sha256 = "1pkjca5l5nbvkrhw3s2j54mr0wg5a53wyffzwvhfxmfslgd1s7pw"; + isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring containers filepath ghc-prof js-jquery scientific text unordered-containers vector ]; + executableHaskellDepends = [ base ]; description = "Treemap visualiser for GHC prof files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -242200,8 +242868,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.4"; - sha256 = "1vgrwx36liqkshrfqkrb38nsbq84a6fbnmn0p2v0y76iccd2shid"; + version = "0.10.1"; + sha256 = "0jj2w3hx9bg4zqrrllqz9sg3phb7rgicm1ndyv3zk6g5sy55xzhc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; @@ -242220,8 +242888,8 @@ self: { }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.3"; - sha256 = "117fn2a5821ifl4yv94bwiylbnbhriqgjdl9c4685z98m0n9ryap"; + version = "0.10.1"; + sha256 = "09imzfn6jkcwlsw7ixwz21519cc9pk22l95imwrppkjkkl80q6jq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; @@ -242733,8 +243401,8 @@ self: { pname = "protolude"; version = "0.3.3"; sha256 = "0ihsjx48p9dgsp0i0l73h16mycnba40hyh7412jv3xz9qz9dwfbc"; - revision = "1"; - editedCabalFile = "07hfs830nc1lvcmsw1hhmrmhzq0b8z25dc090wfn25ss2cvrjkjv"; + revision = "2"; + editedCabalFile = "0f949f93wml7h7na9d1n9lvignwphxr2r18jwmpy33g0dxgn21h1"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable mtl mtl-compat stm text transformers transformers-compat @@ -243085,22 +243753,22 @@ self: { "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck + , ghc-prim, hashable, HUnit, mtl, PSQueue, QuickCheck, random + , tagged, tasty, tasty-hunit, tasty-quickcheck , unordered-containers }: mkDerivation { pname = "psqueues"; - version = "0.2.7.3"; - sha256 = "1cmz7spfzx7niglmsphnndh0m4b8njkn0fhb9nshbnbq6nx515yh"; + version = "0.2.8.0"; + sha256 = "0qp48qxqfz3bzl10l1wq3fi2j88bcx71a8g5x3qdaia884wf4vdk"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers + base containers criterion deepseq ghc-prim hashable mtl PSQueue + random unordered-containers ]; description = "Pure priority search queues"; license = lib.licenses.bsd3; @@ -243800,8 +244468,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.6.0.1"; - sha256 = "0gdzdbxgsyps8hqd903bsyja0cr6kbklkicvma62q48wv0y7230j"; + version = "0.6.0.2"; + sha256 = "1nnv48yxvzs0fk5d6syrkijh2ailarqs14iand116hfk7xz6as0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244279,8 +244947,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.16"; - sha256 = "10220z3mg2dqvywsqg8jbgpq5yzwlnv0gc8yv1xwibf8ilwd5km6"; + version = "2.1.0.17"; + sha256 = "1fmnhx9hlxajdbyq71v28b0sc7phgx2h7spi2s5viihpnxzwp3rk"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -245972,8 +246640,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.2.1"; - sha256 = "1kw5bp9yih8z3z7plczwld5xdg46slylszmpd63d2fiq2fx7ii7r"; + version = "0.3.0"; + sha256 = "1kqmdnknwqjc8x1dp7qbaca57y7rkcx3vmx6xxc12yh8f7qc8dx9"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -247488,8 +248156,8 @@ self: { pname = "ral"; version = "0.2.1"; sha256 = "1f6sks81g8zxkgnp7lc5n0aimnvbbvkazassc17z0prs56hs63si"; - revision = "2"; - editedCabalFile = "0s51sjv3npjmvi2d2i3x4qs427h7pa2gm0bwm6m34visk78jaypq"; + revision = "3"; + editedCabalFile = "1a8833bz213ynf9lpmhmsmrzfbvzbm1iznv7hmgkqc8rz93zbvjw"; libraryHaskellDepends = [ adjunctions base bin boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids @@ -247505,8 +248173,8 @@ self: { pname = "ral-lens"; version = "0.2"; sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "3"; - editedCabalFile = "0qpi49n64mvba1v8p6xg81ilnzncrd4li2dawvzr5h1zvav5cn5n"; + revision = "4"; + editedCabalFile = "03wb2rwsh3qwb91iv8ydpbpk74ixfw3krw67dwh4l29057c4p31g"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -247518,8 +248186,8 @@ self: { pname = "ral-optics"; version = "0.2"; sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "3"; - editedCabalFile = "0bc8xs8g9yf592in1g4jfy3fyi2z4wv61sazw9gg377fg7lsm2kv"; + revision = "4"; + editedCabalFile = "17vp96nsgf74b275547mgbwyc858lffy53fggs8nf1b8637mnjvs"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -247588,6 +248256,19 @@ self: { license = lib.licenses.mit; }) {}; + "rampart_2_0_0_7" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "rampart"; + version = "2.0.0.7"; + sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Determine how intervals relate to each other"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -248529,6 +249210,28 @@ self: { license = lib.licenses.mit; }) {}; + "ratel_2_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, uuid + }: + mkDerivation { + pname = "ratel"; + version = "2.0.0.10"; + sha256 = "1vvz9ia5p7phkwryjfwrzfzvrb94r127vy56qkgikwc9jxxdlxlj"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -248544,6 +249247,22 @@ self: { license = lib.licenses.mit; }) {}; + "ratel-wai_2_0_0_5" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "2.0.0.5"; + sha256 = "1y2rcp1birh1akw98zw10qwjwi5wf7qknk7j5xwwjws7hpmmgy2y"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratelimiter" = callPackage ({ mkDerivation, base, containers, extra, mtl, time, timespan , vector @@ -248690,14 +249409,14 @@ self: { broken = true; }) {}; - "rattletrap_12_1_1" = callPackage + "rattletrap_12_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "12.1.1"; - sha256 = "0dmc3zbvrcszp4xgb0fivi2yp4dvi3dj1kmi1kx9dwv12r8is1f9"; + version = "12.1.2"; + sha256 = "0lysr7birh4z8zimn5whqpaxipfsnn6sqppcn5l72sqjq6rdhk3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250381,25 +251100,6 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, data-fix - , free, HUnit, template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "recursion-schemes"; - version = "5.2.2.4"; - sha256 = "0hyvqh8kp2pw4kwvisyz9msjy41y218f9l6fpsrbla4s1b4in58c"; - revision = "3"; - editedCabalFile = "06bffrsh1gcp65gyv0837bd3gv5d5h2879nadv29irc52fyvzwxl"; - libraryHaskellDepends = [ - base base-orphans comonad containers data-fix free template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Representing common recursion patterns as higher-order functions"; - license = lib.licenses.bsd2; - }) {}; - - "recursion-schemes_5_2_2_5" = callPackage ({ mkDerivation, base, comonad, containers, data-fix, free, HUnit , template-haskell, th-abstraction, transformers }: @@ -250414,7 +251114,6 @@ self: { testHaskellDepends = [ base HUnit template-haskell transformers ]; description = "Representing common recursion patterns as higher-order functions"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -253625,25 +254324,24 @@ self: { }) {}; "releaser" = callPackage - ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa - , text + ({ mkDerivation, base, bytestring, Cabal, directory + , pretty-terminal, process, regex-tdfa, text }: mkDerivation { pname = "releaser"; - version = "0.3.0.0"; - sha256 = "0fz8zlkdrk8pjyqxyfyhlvvn68yi9d299z50indyhdnwgd4g94lr"; + version = "0.3.0.2"; + sha256 = "0fph3np0f7xkgs2vz3jiqip7hq7yhr0gmrw9lbv6xdkjjwcn69ll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-tdfa text + base bytestring Cabal directory pretty-terminal process regex-tdfa + text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "releaser"; maintainers = [ lib.maintainers.maralorn ]; - broken = true; }) {}; "relevant-time" = callPackage @@ -253746,6 +254444,8 @@ self: { pname = "relude"; version = "1.2.1.0"; sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; + revision = "1"; + editedCabalFile = "1dqgl50rlrq0d84x5ffm5d4sp275wfm3f03k25ryq0ni1prhrarc"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -254062,6 +254762,8 @@ self: { pname = "repa"; version = "3.4.1.5"; sha256 = "0saa2r94l0x52dlj9402csah96akp5wlc0xaah9p2pb8fv3yvs11"; + revision = "1"; + editedCabalFile = "1bl3q9x6lkkdwb5190nlxwzdil9vww99y57yhr1lab6bzr5qys0q"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -254668,8 +255370,8 @@ self: { pname = "req"; version = "3.13.1"; sha256 = "0cprbfjvzh4fhn1vqyisqcqk236zdn765k6g7a8ssqgkiqaw8i8h"; - revision = "1"; - editedCabalFile = "08x6hs8hazxdypihql8ll90m5i8yrdz9y469s00zzkzwqh6j6xjp"; + revision = "3"; + editedCabalFile = "0dib8rwavjrp2bsv3pl3bgblqdfvky53k7qnv7ca4sq8070aqffp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -254862,16 +255564,14 @@ self: { }) {}; "rere" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clock - , containers, criterion, derp, fin, parsec, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, transformers, vec + ({ mkDerivation, aeson, base, bytestring, clock, containers + , criterion, derp, fin, parsec, QuickCheck, quickcheck-instances + , tasty, tasty-quickcheck, transformers, vec }: mkDerivation { pname = "rere"; - version = "0.2"; - sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr"; - revision = "3"; - editedCabalFile = "01d112sii06yz06lpw5i7q3v4gshha9f0d7vpdc0yj2v34f45crv"; + version = "0.2.0.1"; + sha256 = "1cbdn8jz1zcbddc0b4ahln1k7vwg0npxhmnmqaasm3byrrr6l271"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -254880,8 +255580,8 @@ self: { tasty-quickcheck ]; benchmarkHaskellDepends = [ - aeson attoparsec base bytestring clock containers criterion derp - fin parsec vec + aeson base bytestring clock containers criterion derp fin parsec + vec ]; description = "Regular-expressions extended with fixpoints for context-free powers"; license = lib.licenses.bsd3; @@ -255275,10 +255975,8 @@ self: { ({ mkDerivation, base, effectful-core, resourcet }: mkDerivation { pname = "resourcet-effectful"; - version = "1.0.0.0"; - sha256 = "0446j4ihj3fn6lkqi2b1642ak27l6cpwfv4b73gpanq3nad69fzg"; - revision = "3"; - editedCabalFile = "1w3zij2aj3q06r2773d964pv20ix5n70hf15kawzsd6sadbwymz3"; + version = "1.0.1.0"; + sha256 = "0525jg30d3q545rz4dji8vzbfh2jjfglq9frj8ydwlwd9ylhnsjv"; libraryHaskellDepends = [ base effectful-core resourcet ]; description = "Adaptation of the resourcet library for the effectful ecosystem"; license = lib.licenses.bsd3; @@ -258967,6 +259665,28 @@ self: { license = "unknown"; }) {}; + "rsi-break" = callPackage + ({ mkDerivation, async, base, config-ini, directory, filepath, lens + , monomer, process, text, text-show, time + }: + mkDerivation { + pname = "rsi-break"; + version = "0.1.0.0"; + sha256 = "1gb4l0ydimambxvf6n66df7mik77vgfsdr9hds8w3cna057k2zwd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base config-ini directory filepath lens monomer process text + text-show time + ]; + executableHaskellDepends = [ base monomer process ]; + testHaskellDepends = [ base ]; + description = "Let your mind know that your hands need a rest!"; + license = lib.licenses.bsd2; + badPlatforms = lib.platforms.darwin; + }) {}; + "rspp" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -260679,6 +261399,19 @@ self: { license = lib.licenses.mit; }) {}; + "salve_2_0_0_4" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "salve"; + version = "2.0.0.4"; + sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Semantic version numbers and constraints"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -261371,8 +262104,8 @@ self: { }: mkDerivation { pname = "saturn"; - version = "1.0.0.2"; - sha256 = "0n0670s0sgp00lb758vn5gmw7h84csq1sqaha6k3lckczfs72si1"; + version = "1.0.0.3"; + sha256 = "0xilcnica1bzi310x2dv1igdpzk91sqzbzqpjkjd7g6v93pl9xhv"; libraryHaskellDepends = [ base containers hspec parsec QuickCheck text time ]; @@ -261501,20 +262234,23 @@ self: { }) {}; "sayable" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec, prettyprinter - , tasty, tasty-ant-xml, tasty-hspec, text + ({ mkDerivation, base, bytestring, containers, exceptions, hspec + , prettyprinter, tasty, tasty-ant-xml, tasty-hspec + , template-haskell, text, th-abstraction }: mkDerivation { pname = "sayable"; - version = "1.2.2.0"; - sha256 = "0dmvdf8zs8sf4lwyjzryb2bszfzwgi0wbh232s41g35070sdhy5q"; + version = "1.2.3.0"; + sha256 = "0swwjp1lkfwv4g92d0f4mb6iza56fpf35af2a5kwhxvjg6kp6w32"; libraryHaskellDepends = [ - base bytestring exceptions prettyprinter text + base bytestring containers exceptions prettyprinter + template-haskell text th-abstraction ]; testHaskellDepends = [ - base hspec prettyprinter tasty tasty-ant-xml tasty-hspec text + base hspec prettyprinter tasty tasty-ant-xml tasty-hspec + template-haskell text ]; - description = "Data structures, classes and operators for constructing context-adjusted pretty output"; + description = "Construction of context-adjusted pretty output"; license = lib.licenses.isc; }) {}; @@ -264143,15 +264879,15 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_1_0_1" = callPackage + "secp256k1-haskell_1_1_0" = callPackage ({ mkDerivation, base, base16, bytestring, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, monad-par, mtl , QuickCheck, secp256k1, string-conversions, unliftio-core }: mkDerivation { pname = "secp256k1-haskell"; - version = "1.0.1"; - sha256 = "02mk6w2hkvd008f4wyz67n2bqp63dckyixnk0brpfvk29vm9my9m"; + version = "1.1.0"; + sha256 = "1k0d3lczsw9cg2yxacgf1w58c5wr4gr2a36v9wdid1b6ah673kbl"; libraryHaskellDepends = [ base base16 bytestring deepseq entropy hashable QuickCheck string-conversions unliftio-core @@ -264589,6 +265325,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "semantic-version" = callPackage + ({ mkDerivation, alphachar, base, digit, lens, parsec, parsers }: + mkDerivation { + pname = "semantic-version"; + version = "0.0.2"; + sha256 = "1sx5ik67gqgzg8cxqd5pg1wkbh8b0j27c3hy19nvqn4bssyms17w"; + libraryHaskellDepends = [ + alphachar base digit lens parsec parsers + ]; + description = "Semantic Version"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semaphore-compat" = callPackage ({ mkDerivation, base, exceptions, unix }: mkDerivation { @@ -264981,6 +265731,8 @@ self: { pname = "sendfile"; version = "0.7.11.4"; sha256 = "1i2i0w18l2ysambyylv93jzy0adiiqwwnhg7zagqb7p2srybxc3k"; + revision = "1"; + editedCabalFile = "0276l0b49b4y4z9dy5a5i7182678vv1flmkhiw1a4jsbmc4mrfgm"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -265026,26 +265778,29 @@ self: { }) {}; "sensei" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, directory - , filepath, fsnotify, hspec, hspec-contrib, hspec-discover - , hspec-wai, http-client, http-types, mockery, network, process - , QuickCheck, silently, stm, text, time, unix, wai, warp + ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring + , casing, containers, directory, filepath, fsnotify, hspec + , hspec-contrib, hspec-discover, hspec-wai, http-client, http-types + , mockery, mtl, network, process, QuickCheck, stm, temporary, text + , time, transformers, unix, wai, warp, yaml }: mkDerivation { pname = "sensei"; - version = "0.7.0"; - sha256 = "032vn93gcya2drlcy4mw2rmncq9i21zrr53kdalsxa7xfsds93hw"; + version = "0.8.0"; + sha256 = "0qmi9qzfbsx9xxkczwjx1pzwmkwpl1dq1c80f4nmjgqh4mm21aw5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - ansi-terminal base bytestring directory filepath fsnotify - http-client http-types network process stm text time unix wai warp + aeson ansi-terminal async base bytestring casing containers + directory filepath fsnotify http-client http-types mtl network + process stm text time transformers unix wai warp yaml ]; testHaskellDepends = [ - ansi-terminal base bytestring directory filepath fsnotify hspec - hspec-contrib hspec-wai http-client http-types mockery network - process QuickCheck silently stm text time unix wai warp + aeson ansi-terminal async base bytestring casing containers + directory filepath fsnotify hspec hspec-contrib hspec-wai + http-client http-types mockery mtl network process QuickCheck stm + temporary text time transformers unix wai warp yaml ]; testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; @@ -265404,6 +266159,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequence-formats_1_8_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, errors + , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers + , vector + }: + mkDerivation { + pname = "sequence-formats"; + version = "1.8.0.0"; + sha256 = "0xm0v56q90g89zwphayf6llpnmsrb7asnb06sm5lld4q9jfidi4d"; + libraryHaskellDepends = [ + attoparsec base bytestring containers errors exceptions foldl + lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec pipes pipes-safe tasty + tasty-hunit transformers vector + ]; + description = "A package with basic parsing utilities for several Bioinformatic data formats"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequenceTools" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec , lens-family, optparse-applicative, pipes, pipes-group @@ -268281,8 +269060,8 @@ self: { }: mkDerivation { pname = "servant-serialization"; - version = "0.2.1"; - sha256 = "02xrbdwcnm9i33i386gnnigz1hk76z69iywxi2szzk0l8jnsgd32"; + version = "0.3"; + sha256 = "1nyax605k3dy5h5g0y4wsc7wsksxh352c4yz9vc07kldln6x8498"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272006,8 +272785,8 @@ self: { }: mkDerivation { pname = "si-timers"; - version = "1.2.0.0"; - sha256 = "0abxynhg51bazj1dvd4pxpr6wzfd7gganymlnfj4dxday6y3cnc4"; + version = "1.3.0.0"; + sha256 = "05vclkfidy0cmspa5c79lb8dhn4c2jxq6559vcaq2dkgmqqd3fl5"; libraryHaskellDepends = [ base deepseq io-classes mtl nothunks stm time ]; @@ -272412,6 +273191,19 @@ self: { broken = true; }) {}; + "simdutf" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, system-cxx-std-lib }: + mkDerivation { + pname = "simdutf"; + version = "0.1.0"; + sha256 = "07lvq45j9fcbkjhi733zm7dbjmx28ggv5g69g43yyqqn35223lqr"; + libraryHaskellDepends = [ base system-cxx-std-lib ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell interface to simdutf"; + license = lib.licenses.mit; + }) {}; + "simfin" = callPackage ({ mkDerivation, aeson, base, bytestring, Chart, Chart-diagrams , composition-extra, containers, exceptions, http-client @@ -273160,8 +273952,8 @@ self: { ({ mkDerivation, base, exceptions, extra, haskeline, time }: mkDerivation { pname = "simple-prompt"; - version = "0.2.1"; - sha256 = "0p2xss8l8jzp0dm6ql9sswlsm8mcfxra20dnbnql3bz9v2a2wdhc"; + version = "0.2.2"; + sha256 = "1m8q7jqmdsz3nmsb86i9wy94pxypz172ragx9qfy2v5v0pmc8mww"; libraryHaskellDepends = [ base exceptions extra haskeline time ]; description = "Simple commandline text prompt functions"; license = lib.licenses.bsd3; @@ -273873,6 +274665,8 @@ self: { pname = "singleton-bool"; version = "0.1.7"; sha256 = "16xj7d3qnd8nhk66kxm5c145l1060m9yz2yc9y47wsf3hriijb8w"; + revision = "1"; + editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -274293,23 +275087,6 @@ self: { }: mkDerivation { pname = "size-based"; - version = "0.1.3.1"; - sha256 = "1x2z8iw4jgcp6xirclifjhh3rvyjy5xgqrd6lcv4gifj859sfjd2"; - revision = "1"; - editedCabalFile = "1fmqqnf3b3pjcs4h68r8ry8qci9gcl2ccwifn3dxribcm8c0n3lp"; - libraryHaskellDepends = [ - base dictionary-sharing template-haskell testing-type-modifiers - ]; - description = "Sized functors, for size-based enumerations"; - license = lib.licenses.bsd3; - }) {}; - - "size-based_0_1_3_2" = callPackage - ({ mkDerivation, base, dictionary-sharing, template-haskell - , testing-type-modifiers - }: - mkDerivation { - pname = "size-based"; version = "0.1.3.2"; sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; libraryHaskellDepends = [ @@ -274317,7 +275094,6 @@ self: { ]; description = "Sized functors, for size-based enumerations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sized" = callPackage @@ -275195,26 +275971,6 @@ self: { }) {}; "slave-thread" = callPackage - ({ mkDerivation, base, deferred-folds, focus, foldl, QuickCheck - , quickcheck-instances, rerebase, SafeSemaphore, stm-containers - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "slave-thread"; - version = "1.1.0.2"; - sha256 = "1pbffrmwd975as495b5b4ad59rajgq1dmbvmp07zfb2rmwhpr5n8"; - libraryHaskellDepends = [ - base deferred-folds focus foldl stm-containers - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase SafeSemaphore tasty - tasty-hunit tasty-quickcheck - ]; - description = "A fundamental solution to ghost threads and silent exceptions"; - license = lib.licenses.mit; - }) {}; - - "slave-thread_1_1_0_3" = callPackage ({ mkDerivation, base, deferred-folds, focus, foldl, rerebase , SafeSemaphore, stm-containers, tasty, tasty-hunit }: @@ -275228,7 +275984,6 @@ self: { testHaskellDepends = [ rerebase SafeSemaphore tasty tasty-hunit ]; description = "A fundamental solution to ghost threads and silent exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "sleep" = callPackage @@ -276521,33 +277276,35 @@ self: { }) {}; "snap" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal - , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, hashable, heist, http-streams - , HUnit, lens, lifted-base, map-syntax, monad-control, mtl - , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core - , snap-server, stm, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-smallcheck, text, time - , transformers, transformers-base, unordered-containers, xmlhtml + ({ mkDerivation, aeson, async, attoparsec, attoparsec-aeson, base + , bytestring, cereal, clientsession, configurator, containers + , deepseq, directory, directory-tree, dlist, filepath, hashable + , heist, http-streams, HUnit, lens, lifted-base, map-syntax + , monad-control, mtl, mwc-random, pwstore-fast, QuickCheck + , smallcheck, snap-core, snap-server, stm, syb, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-smallcheck, text, time, transformers + , transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.1.3.2"; - sha256 = "11l7jhch504sbiqdqqjx89cav3qxhkgygvlacfvvl22sya1a4kaf"; + version = "1.1.3.3"; + sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clientsession configurator - containers directory directory-tree dlist filepath hashable heist - lens lifted-base map-syntax monad-control mtl mwc-random - pwstore-fast snap-core snap-server stm text time transformers - transformers-base unordered-containers xmlhtml + aeson attoparsec attoparsec-aeson base bytestring cereal + clientsession configurator containers directory directory-tree + dlist filepath hashable heist lens lifted-base map-syntax + monad-control mtl mwc-random pwstore-fast snap-core snap-server stm + text time transformers transformers-base unordered-containers + xmlhtml ]; testHaskellDepends = [ - aeson async attoparsec base bytestring cereal clientsession - configurator containers deepseq directory directory-tree dlist - filepath hashable heist http-streams HUnit lens lifted-base - map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck - smallcheck snap-core snap-server stm syb test-framework - test-framework-hunit test-framework-quickcheck2 + aeson async attoparsec attoparsec-aeson base bytestring cereal + clientsession configurator containers deepseq directory + directory-tree dlist filepath hashable heist http-streams HUnit + lens lifted-base map-syntax monad-control mtl mwc-random + pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb + test-framework test-framework-hunit test-framework-quickcheck2 test-framework-smallcheck text time transformers transformers-base unordered-containers xmlhtml ]; @@ -276865,8 +277622,8 @@ self: { pname = "snap-server"; version = "1.1.2.1"; sha256 = "0znadz0av6k31s8d175904d2kajxayl38sva3dqh5ckdfkymfx54"; - revision = "2"; - editedCabalFile = "06nw6s7cmx0ap0v9qnjcrrnlrrm2px7msdc8rgv3l349rip34whl"; + revision = "3"; + editedCabalFile = "0adjcah7hx47cg066jbjjgn7wz8pvkm0fc87fyz8c7lc0sdmp84f"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -278685,15 +279442,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "some_1_0_5" = callPackage - ({ mkDerivation, base, deepseq }: + "some_1_0_6" = callPackage + ({ mkDerivation, base, base-orphans, deepseq }: mkDerivation { pname = "some"; - version = "1.0.5"; - sha256 = "0pwivkyhdndh9f79gsz5gx51if8wm3r8mvbkysz2pq5m77g7kpmh"; - revision = "1"; - editedCabalFile = "060vrbwlc4xrwkh92q3jkgdy7zjzrzlg2k0ll0wklxaph9siphzr"; - libraryHaskellDepends = [ base deepseq ]; + version = "1.0.6"; + sha256 = "1fdzhi2rmcigb1c727dyzfak8rgb77bzfr33k1cp987lbnnhd9pp"; + libraryHaskellDepends = [ base base-orphans deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; @@ -279181,8 +279936,8 @@ self: { ({ mkDerivation, base, lens, parsers }: mkDerivation { pname = "spacechar"; - version = "0.0.0.5"; - sha256 = "0wri929s3icffs63z0m7fxb22rd87w7fi8dwlbzdm6q5w29pxxnk"; + version = "0.0.0.6"; + sha256 = "1jg319wsqhkd4dyfsbrhq7y31mlbgw9ymy9iqps764i92ng5hwrf"; libraryHaskellDepends = [ base lens parsers ]; description = "Space Character"; license = lib.licenses.bsd3; @@ -280149,6 +280904,8 @@ self: { pname = "spir-v"; version = "0.0.1.0"; sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr"; + revision = "1"; + editedCabalFile = "17y0ivzqw7piqpglsrva8six7k0jra76nz83zaxiwin5iawsj8z1"; libraryHaskellDepends = [ base ]; description = "Some utilities for reading and writing SPIR-V files"; license = lib.licenses.mit; @@ -282815,8 +283572,10 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.0.1"; - sha256 = "1f4sk6j9dbnjrb3hjjj9gpbzs66mkmij208vqyvb4z284agfhzng"; + version = "0.1.0.2"; + sha256 = "03zalyk0ickp9acfi6s869h4p3a7djpzpiwsp3nlhwhbdv2si9q4"; + revision = "1"; + editedCabalFile = "1dhcx7q4n4yrp9kxqzwha5spzxfqqzwax43gw82ncdh1ykinjgyb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -284095,27 +284854,6 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.2.0.2"; - sha256 = "191yh7whd9x6vjn58saac8nq6rsi7fjq147nbmfmn3kfnxqgabdd"; - libraryHaskellDepends = [ - base deferred-folds focus hashable list-t stm-hamt transformers - ]; - testHaskellDepends = [ - deferred-folds focus foldl free list-t quickcheck-instances - rerebase tasty tasty-hunit tasty-quickcheck - ]; - description = "Containers for STM"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "stm-containers_1_2_0_3" = callPackage - ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable - , list-t, quickcheck-instances, rerebase, stm-hamt, tasty - , tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "stm-containers"; version = "1.2.0.3"; sha256 = "1cchysjykxiq3s85xaafxkz8kg1czygjs17jlk6ic3ihv2ybr34j"; libraryHaskellDepends = [ @@ -284127,7 +284865,6 @@ self: { ]; description = "Containers for STM"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -284176,31 +284913,6 @@ self: { "stm-hamt" = callPackage ({ mkDerivation, async, base, criterion, deferred-folds, focus - , free, hashable, list-t, mwc-random-monad, primitive - , primitive-extras, QuickCheck, quickcheck-instances, rebase - , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "stm-hamt"; - version = "1.2.0.13"; - sha256 = "0nbnh7ibdlcp0bw1jzmkdcq8ysdqz3f9143pd3yj635mp0dyxgya"; - libraryHaskellDepends = [ - base deferred-folds focus hashable list-t primitive - primitive-extras transformers - ]; - testHaskellDepends = [ - deferred-folds focus QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - async criterion focus free mwc-random-monad rebase - ]; - description = "STM-specialised Hash Array Mapped Trie"; - license = lib.licenses.mit; - }) {}; - - "stm-hamt_1_2_0_14" = callPackage - ({ mkDerivation, async, base, criterion, deferred-folds, focus , free, hashable, list-t, primitive, primitive-extras, QuickCheck , quickcheck-instances, random, rebase, rerebase, tasty , tasty-hunit, tasty-quickcheck, transformers @@ -284222,7 +284934,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "stm-incremental" = callPackage @@ -286158,14 +286869,29 @@ self: { license = lib.licenses.mit; }) {}; + "strict-list_0_1_7_3" = callPackage + ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "strict-list"; + version = "0.1.7.3"; + sha256 = "0bpsnhhg69dq2m9zbzchzzvgpnr0f0jgzsakcn3yzwld8dckxq67"; + libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; + testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; + description = "Strict linked list"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strict-mvar" = callPackage ({ mkDerivation, base, io-classes, io-sim, nothunks, QuickCheck , tasty, tasty-quickcheck }: mkDerivation { pname = "strict-mvar"; - version = "1.2.0.0"; - sha256 = "0w324i9daxsvc4np9vc8bwija2p943sirbqxhjrf9bg144q3ldvd"; + version = "1.3.0.0"; + sha256 = "0gv4m2rc5809y6b4n9bgzakjndf22crzz0pb9ff3rg4a48vys5ph"; libraryHaskellDepends = [ base io-classes ]; testHaskellDepends = [ base io-sim nothunks QuickCheck tasty tasty-quickcheck @@ -286191,8 +286917,8 @@ self: { ({ mkDerivation, array, base, io-classes, stm }: mkDerivation { pname = "strict-stm"; - version = "1.2.0.0"; - sha256 = "1kxfnvgrvskgn8ip9gga0fwchnnlxydccf03cpbx524lqrmk4d0x"; + version = "1.3.0.0"; + sha256 = "0fpjyzc0qlz66a7pvj3cgfgpj10y61b4wqfbrzgpy3gz2d4i6c8y"; libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; @@ -286202,27 +286928,12 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.5.2"; - sha256 = "15ss649nhq2nxmdssdmi6sv9d40szvzww7vgrrp2rm1c904y0ky8"; - revision = "1"; - editedCabalFile = "123bhh4nd1mp3s9fppfy72lhv5gphbd7970ifb5i14282a9qcsj0"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5_3" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; version = "0.1.5.3"; sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -286621,6 +287332,31 @@ self: { license = lib.licenses.mit; }) {}; + "string-variants_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, hspec + , hspec-core, hspec-discover, hspec-expectations, hspec-hedgehog + , HUnit, mono-traversable, QuickCheck, refined, refinery + , string-conversions, template-haskell, text + }: + mkDerivation { + pname = "string-variants"; + version = "0.3.0.0"; + sha256 = "01j2vwni7cqi3n61b5zyify3srrqbdnngxymxz5brhah822i8hnh"; + libraryHaskellDepends = [ + aeson base bytestring mono-traversable QuickCheck refined refinery + string-conversions template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring hedgehog hspec hspec-core hspec-expectations + hspec-hedgehog HUnit mono-traversable QuickCheck refined refinery + string-conversions template-haskell text + ]; + testToolDepends = [ hspec-discover ]; + description = "Constrained text newtypes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stringable" = callPackage ({ mkDerivation, base, bytestring, system-filepath, text }: mkDerivation { @@ -287010,6 +287746,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.10"; + sha256 = "10028krfmrq8v1k00ihdzp5hl6nrq0vdp3kb9xfgsyqgvv8l2ic2"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path , tasty, tasty-discover, tasty-hspec, tasty-quickcheck @@ -287183,8 +287937,8 @@ self: { pname = "structured"; version = "0.1.1"; sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; - revision = "7"; - editedCabalFile = "1fqc041qxnsj95pd9mfzdz5jn1ibmlml8zx8biqdivmv25xn59am"; + revision = "8"; + editedCabalFile = "02bmn23733plxrpcsfmsfn56hk7i0bjsp4ml85q868zq18m46kwg"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -288829,8 +289583,8 @@ self: { }: mkDerivation { pname = "svgone"; - version = "0.2.0.0"; - sha256 = "1r176z555amzfj1jxpgc6n495rp60v829d5raab8nddj5rhr5p35"; + version = "0.2.0.1"; + sha256 = "0gfi744l0060gs0cdgy7mfd9j6axivkjqbb9ayqa81v7mqrj9nzf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289080,41 +289834,43 @@ self: { }) {inherit (pkgs) tokyocabinet;}; "swarm" = callPackage - ({ mkDerivation, aeson, array, base, blaze-html, boolexpr, brick - , brick-list-skip, bytestring, clock, colour, commonmark - , commonmark-extensions, containers, criterion, directory, dotgen - , either, extra, filepath, fused-effects, fused-effects-lens, fuzzy + ({ mkDerivation, aeson, array, astar, base, blaze-html, boolexpr + , brick, brick-list-skip, bytestring, clock, colour, commonmark + , commonmark-extensions, containers, directory, dotgen, either + , extra, filepath, fused-effects, fused-effects-lens, fuzzy , githash, hashable, hsnoise, http-client, http-client-tls , http-types, lens, linear, lsp, megaparsec, minimorph, mtl - , murmur3, natural-sort, optparse-applicative, parser-combinators - , prettyprinter, QuickCheck, random, servant, servant-docs - , servant-server, SHA, simple-enumeration, split, stm, syb, tagged - , tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-rope, text-zipper, time - , transformers, unification-fd, unordered-containers, vector, vty - , wai, warp, witch, witherable, word-wrap, yaml + , murmur3, natural-sort, optparse-applicative, palette, pandoc + , pandoc-types, parser-combinators, prettyprinter, QuickCheck + , random, scientific, servant, servant-docs, servant-server, SHA + , simple-enumeration, split, stm, syb, tagged, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, terminal-size, text, text-rope, text-zipper + , time, transformers, unification-fd, unordered-containers, vector + , vty, wai, warp, witch, witherable, word-wrap, yaml }: mkDerivation { pname = "swarm"; - version = "0.4"; - sha256 = "150hblxkv8wkx02wxifiyl0k76a7y8fikkx2wxz6ldd223d1yvqa"; + version = "0.5.0.0"; + sha256 = "007647l7janvsfyyapwrr65q6x6dy1jgiaaga4jhfv4gazwssxsm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson array base blaze-html boolexpr brick brick-list-skip + aeson array astar base blaze-html boolexpr brick brick-list-skip bytestring clock colour commonmark commonmark-extensions containers directory dotgen either extra filepath fused-effects fused-effects-lens fuzzy githash hashable hsnoise http-client http-client-tls http-types lens linear lsp megaparsec minimorph mtl - murmur3 natural-sort parser-combinators prettyprinter random - servant servant-docs servant-server SHA simple-enumeration split - stm syb tagged template-haskell text text-rope text-zipper time - transformers unification-fd unordered-containers vector vty wai - warp witch witherable word-wrap yaml + murmur3 natural-sort palette pandoc pandoc-types parser-combinators + prettyprinter random scientific servant servant-docs servant-server + SHA simple-enumeration split stm syb tagged template-haskell text + text-rope text-zipper time transformers unification-fd + unordered-containers vector vty wai warp witch witherable word-wrap + yaml ]; executableHaskellDepends = [ - base githash optparse-applicative text + base githash optparse-applicative prettyprinter terminal-size text ]; testHaskellDepends = [ aeson base boolexpr containers directory filepath fused-effects @@ -289122,7 +289878,7 @@ self: { tasty-hunit tasty-quickcheck text time transformers vty witch yaml ]; benchmarkHaskellDepends = [ - base containers criterion lens linear mtl random text + base containers lens linear mtl random tasty-bench text ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; @@ -291035,8 +291791,8 @@ self: { pname = "system-filepath"; version = "0.4.14"; sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; - revision = "1"; - editedCabalFile = "18llfvisghrn9w9yfgacqn51gs50a0lngah3bmg852h0swj7vkp8"; + revision = "2"; + editedCabalFile = "0731bm8msw4gdaxy0dmya55w91yh9nk952ysf82n32c0nib1hdr4"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ @@ -291813,6 +292569,8 @@ self: { pname = "tagged-identity"; version = "0.1.4"; sha256 = "0mq4q4i16lzm1d0ckarwjk2a47y28lfrv0hc31y0xblb9q50xxwl"; + revision = "1"; + editedCabalFile = "03r7ys57zbyadkka5rzb418y5ksb88nnmvxjs58j0pmp71h0zfa6"; libraryHaskellDepends = [ base mtl transformers ]; description = "Trivial monad transformer that allows identical monad stacks to have different types"; license = lib.licenses.bsd3; @@ -292243,11 +293001,12 @@ self: { ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base , base32, base32string, base64, base64-bytestring, binary , bytestring, cborg, cborg-json, connection, containers, cryptonite - , data-default-class, deriving-aeson, directory, filepath, foldl - , hspec, hspec-expectations, hspec-wai, http-api-data, http-client - , http-client-tls, http-media, http-types, http2, lens, megaparsec - , memory, network, network-simple-tls, network-uri - , optparse-applicative, primitive, QuickCheck, quickcheck-instances + , data-default-class, data-interval, deriving-aeson, directory + , extra, filepath, foldl, hspec, hspec-expectations, hspec-wai + , http-api-data, http-client, http-client-tls, http-media + , http-types, http2, lens, megaparsec, memory, network + , network-simple-tls, network-uri, optparse-applicative, primitive + , QuickCheck, quickcheck-classes, quickcheck-instances , safe-exceptions, scientific, serialise, servant, servant-client , servant-docs, servant-js, servant-server, tahoe-chk, temporary , text, tls, unordered-containers, utf8-string, vector, wai @@ -292256,14 +293015,14 @@ self: { }: mkDerivation { pname = "tahoe-great-black-swamp"; - version = "0.3.1.0"; - sha256 = "1317sa6jq4vb5nxd4n6i9h799p3i0ghxl866sfkrppay9pncblzq"; + version = "0.4.0.1"; + sha256 = "1ffm58jv6vfzkjjha5j9wq5w2iz68vp8lk21scdy5z8jnjdzchnl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson asn1-encoding asn1-types async base base64 base64-bytestring binary bytestring cborg cborg-json connection containers cryptonite - data-default-class deriving-aeson directory filepath foldl + data-default-class deriving-aeson directory extra filepath foldl http-api-data http-client http-client-tls http-media http-types http2 memory network network-uri primitive safe-exceptions scientific serialise servant-client servant-docs servant-server @@ -292272,16 +293031,18 @@ self: { ]; executableHaskellDepends = [ aeson async base base32 binary bytestring cborg connection - containers deriving-aeson directory filepath foldl http-client - http-client-tls http-types lens megaparsec optparse-applicative - primitive safe-exceptions serialise servant servant-client - servant-js tahoe-chk text unordered-containers vector warp + containers deriving-aeson directory extra filepath foldl + http-client http-client-tls http-types lens megaparsec + optparse-applicative primitive safe-exceptions serialise servant + servant-client servant-js tahoe-chk text unordered-containers + vector warp ]; testHaskellDepends = [ aeson async base base32string base64 binary bytestring cborg - connection containers data-default-class deriving-aeson directory - filepath foldl hspec hspec-expectations hspec-wai http-client - http-types network network-simple-tls primitive QuickCheck + connection containers data-default-class data-interval + deriving-aeson directory extra filepath foldl hspec + hspec-expectations hspec-wai http-client http-types network + network-simple-tls primitive QuickCheck quickcheck-classes quickcheck-instances safe-exceptions serialise servant servant-client temporary text tls unordered-containers vector wai-extra warp warp-tls x509 x509-store yaml @@ -293762,8 +294523,8 @@ self: { ({ mkDerivation, base, containers, deepseq, papi, stm, tasty }: mkDerivation { pname = "tasty-papi"; - version = "0.1.0.1"; - sha256 = "0qlxdcjr8fv05vaspr4bna5wn28c0l0hn9a4znxcrrqlr1wqb3g8"; + version = "0.1.1.0"; + sha256 = "1cz0jw5a7jrb8i3pfx9qx2lsmv08fpdc3qi8rw8ks4cnwc6ba30i"; libraryHaskellDepends = [ base containers deepseq stm tasty ]; librarySystemDepends = [ papi ]; testHaskellDepends = [ base tasty ]; @@ -293877,31 +294638,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.3.1.2"; - sha256 = "11smy3kwr8w4m4xk229lch6s17h7jp55nzx4pw51rx1xmqfgfx14"; - revision = "1"; - editedCabalFile = "1dzw6hvfxrbnfjb9b5ca6adbg3qbdh1rsbji4b3jm0hhgi40gkxr"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - silently stm tagged tasty temporary text transformers - ]; - testHaskellDepends = [ - base directory filepath process silently tasty tasty-hunit - temporary transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_3_1_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, silently, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.3.1.3"; sha256 = "1gg4jkcgc3xiw43bw09shylxgd1rkrynyap17zh0yfzd9jrk3i4v"; libraryHaskellDepends = [ @@ -293915,7 +294651,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -294924,6 +295659,17 @@ self: { mainProgram = "tempered"; }) {}; + "tempgres-client" = callPackage + ({ mkDerivation, base, bytestring, HTTP }: + mkDerivation { + pname = "tempgres-client"; + version = "1.0.0"; + sha256 = "09nivyi2gbsbhwalrzsm5b6934119w2jpj70vf7dgjsqpqkgk403"; + libraryHaskellDepends = [ base bytestring HTTP ]; + description = "Client library for Tempgres"; + license = lib.licenses.bsd2; + }) {}; + "tempi" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -294979,23 +295725,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.9.2"; - sha256 = "1sfp8bzkxqbk7cjc70sz51mm2mcq9lz6cqk9pch8g3qgcscf02f0"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_9_3" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; version = "0.1.9.3"; sha256 = "0qidpj5w8m3qd8xn3vd8z1mym34m6aw1ds16p0yf2anwdn4knilj"; libraryHaskellDepends = [ base template-haskell ]; description = "Backward-compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -295743,21 +296477,21 @@ self: { ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.1.0.1"; - sha256 = "0fwixvyf80gkj1l8r4v4vrmpilz0f02hqhpx0f93rbwaaadxqrd3"; - revision = "1"; - editedCabalFile = "1k1iyj8rpfxc8amlq26wba998ma8hyayw4bzpmf8vwfwg0mpzb42"; + version = "1.1.0.2"; + sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; }) {}; - "termbox_1_1_0_2" = callPackage + "termbox_2_0_0" = callPackage ({ mkDerivation, base, termbox-bindings-hs }: mkDerivation { pname = "termbox"; - version = "1.1.0.2"; - sha256 = "09pn1h2rq5r8w51ikzfnrvqxdq5f9qdh5lc7yv2zlzkrgz2vq5rz"; + version = "2.0.0"; + sha256 = "0al0989wkvkm95m3dz78yrv33zgjb89vskwwq9vgnivvnq8iffhs"; + revision = "1"; + editedCabalFile = "0xwap18cxy0w48jhi1mfk15fhihfrjr2wmq1swzqnpmr6b3mpszr"; libraryHaskellDepends = [ base termbox-bindings-hs ]; description = "termbox"; license = lib.licenses.bsd3; @@ -295777,6 +296511,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-banana_2_0_0" = callPackage + ({ mkDerivation, base, reactive-banana, termbox }: + mkDerivation { + pname = "termbox-banana"; + version = "2.0.0"; + sha256 = "1izf90r6idfspi06q3vwjipawpdcz5ag5qw3l45khn7js520rapn"; + revision = "1"; + editedCabalFile = "0yk0kj4hn6gv89vs04n95fbf6hyf05dvhxmfjj7c5235ppnxjd07"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base reactive-banana termbox ]; + description = "termbox + reactive-banana"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-bindings" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -295821,14 +296571,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "termbox-bindings-hs_0_1_1" = callPackage + ({ mkDerivation, base, termbox-bindings-c }: + mkDerivation { + pname = "termbox-bindings-hs"; + version = "0.1.1"; + sha256 = "1f50j6z72g5lsdvakxvlsg77iqspcm2qmwyc1csafgs1zn40ks2i"; + libraryHaskellDepends = [ base termbox-bindings-c ]; + description = "termbox bindings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "termbox-tea" = callPackage ({ mkDerivation, base, ki, termbox }: mkDerivation { pname = "termbox-tea"; - version = "0.1.0"; - sha256 = "0qck27chphmxm5zdrbz3njix5vkry5c5liybgvrx0745ymcd231w"; - revision = "1"; - editedCabalFile = "0sa211vp9acfjl4mlvfinacmhydby6i8ac1nw511vflkbvvy8zd1"; + version = "0.1.0.1"; + sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki termbox ]; @@ -295836,12 +296596,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "termbox-tea_0_1_0_1" = callPackage + "termbox-tea_1_0_0" = callPackage ({ mkDerivation, base, ki, termbox }: mkDerivation { pname = "termbox-tea"; - version = "0.1.0.1"; - sha256 = "12wcqysm52ln1ppc9a8jhn2a085h2i2hyzvmm5cjrbwxbrnkaawd"; + version = "1.0.0"; + sha256 = "0wya0fkjialv7hs6iw230x5ryx79s12pwig28mwrvgzvxmgm383a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ki termbox ]; @@ -296911,8 +297671,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8.3"; - sha256 = "0lmzvh0izx192h1gik9vfs24xp13mpw2bwagmdd57sr7gpyln9zp"; + version = "0.12.8.4"; + sha256 = "1pkilvc2v1s5h6kxshwwkgjzm6f5dzya30rfpxg09zsrqpffjlzv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -297115,14 +297875,14 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder_0_6_7_1" = callPackage + "text-builder_0_6_7_2" = callPackage ({ mkDerivation, base, bytestring, criterion, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, text-builder-dev }: mkDerivation { pname = "text-builder"; - version = "0.6.7.1"; - sha256 = "1x2k1mwwwjbyc56c9dm454k24imwq17dym5pfbj33iqn9i4n7ki3"; + version = "0.6.7.2"; + sha256 = "1pf76n2prwba1awgz5328zarpclazl81lii5w9hy7frkd43z7531"; libraryHaskellDepends = [ base bytestring text text-builder-dev ]; testHaskellDepends = [ rerebase tasty tasty-hunit tasty-quickcheck @@ -297155,7 +297915,7 @@ self: { license = lib.licenses.mit; }) {}; - "text-builder-dev_0_3_4_1" = callPackage + "text-builder-dev_0_3_4_2" = callPackage ({ mkDerivation, base, base-compat, bytestring, criterion , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes , quickcheck-instances, rerebase, split, tasty, tasty-hunit @@ -297163,8 +297923,8 @@ self: { }: mkDerivation { pname = "text-builder-dev"; - version = "0.3.4.1"; - sha256 = "095kqq7wwnabfyj6380xy94a0v0d76mkwspdw8lj2m4ykq23agw1"; + version = "0.3.4.2"; + sha256 = "0q0wv1b1v5c54yabqd89h5a6rsx9q9k8scmrxgi2d2m94dggzz9n"; libraryHaskellDepends = [ base bytestring deferred-folds isomorphism-class QuickCheck quickcheck-instances split text time transformers @@ -297275,10 +298035,8 @@ self: { }: mkDerivation { pname = "text-display"; - version = "0.0.5.0"; - sha256 = "03v9alzpmsb2mvpyvch77qg13cdb8iqwf6fv736dzjsb5wwvx7sh"; - revision = "1"; - editedCabalFile = "0jrzqgz1gicjssjw2sg8v8i70z77vnh1w4pj39470rlijrjmxx7p"; + version = "0.0.5.1"; + sha256 = "13r2fwr8q5glajc9gwrxd59kx945cqhxqml3dcwzfrmc6a7gr18q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -297603,8 +298361,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "2"; - editedCabalFile = "0h146i2dvv21nc5z1x9a5a9c2v5ml2kvd10krd5p5aaqpng6i1g4"; + revision = "3"; + editedCabalFile = "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -299055,17 +299813,15 @@ self: { }) {}; "theatre-dev" = callPackage - ({ mkDerivation, async, base, contravariant, hspec, rerebase, stm - , unagi-chan, vector + ({ mkDerivation, async, base, contravariant, hspec, QuickCheck + , rerebase, stm, uuid, vector }: mkDerivation { pname = "theatre-dev"; - version = "0.0.1"; - sha256 = "0mvgbp5ba23gcjykki8x7wsdmdzqknm82rshf10rk9rc120jg5f6"; - libraryHaskellDepends = [ - async base contravariant stm unagi-chan vector - ]; - testHaskellDepends = [ hspec rerebase ]; + version = "0.5.0.1"; + sha256 = "139yfrad3n70mkhf4567ddlmgd8nyis7parzgkp7vmbhwa70fglm"; + libraryHaskellDepends = [ base contravariant stm uuid vector ]; + testHaskellDepends = [ async hspec QuickCheck rerebase ]; description = "Minimalistic actor library experiments"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299600,8 +300356,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.0"; sha256 = "08jqa01pp6b300ic0xcn687i0a0kvz76bgym3dchk9n75m6hvc4f"; - revision = "2"; - editedCabalFile = "1jbi3njiyrcykcx8nnz43a7yzh1ad5aigd7ww04vhi8vp3gasbv6"; + revision = "3"; + editedCabalFile = "0vciaszq8kmcdxzhjy7l7w4mmhkvq9pnkyrz9i1ixxg4l2riw4f5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -301109,8 +301865,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "timestats"; - version = "0.1.0"; - sha256 = "1vmrmvfa3lnyqndqs2y61y4c6xh6ql6x9n86i5yzwayfp2hzrfjb"; + version = "0.1.1"; + sha256 = "1yrr6a0p83h2y2n36x65qz937y9dyzvff1q5zfcskyja43jpaimp"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "A library for profiling time in Haskell applications"; @@ -301726,8 +302482,8 @@ self: { }: mkDerivation { pname = "tlex"; - version = "0.4.0.0"; - sha256 = "0pwjgi2l1q5q61s7xvvfn1z4l4jwvxvsqm22lmqsdmav4j9asnsi"; + version = "0.5.0.0"; + sha256 = "0zgsn8vc5jdy5zjz6fzj68bsm5cm83adk9xjr3s2a04m0b4c6nyr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers enummapset tlex-core ]; testHaskellDepends = [ @@ -301768,8 +302524,8 @@ self: { }: mkDerivation { pname = "tlex-debug"; - version = "0.4.0.0"; - sha256 = "0ssvhqcgv3gxbzjldx13rg2h31vcbk57nlagvw2rb562kagw9dqb"; + version = "0.4.1.0"; + sha256 = "0q07i3l6fmlqwlnf3cmyipd3ybm94iwk8sx0j402fxcxj5fnkdy1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers enummapset tlex tlex-core unordered-containers @@ -301790,8 +302546,8 @@ self: { }: mkDerivation { pname = "tlex-encoding"; - version = "0.4.0.0"; - sha256 = "08wqky2ccmhajb8dcc3nxgrbw6q5jikz5cihz7scc8cn6s49drcz"; + version = "0.4.1.0"; + sha256 = "0ljr66vgm12wksn4xsv27958pi75s3xz2dz16n3r7gfpq9r48diw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base charset containers enummapset tlex tlex-core @@ -301812,8 +302568,8 @@ self: { }: mkDerivation { pname = "tlex-th"; - version = "0.4.1.0"; - sha256 = "1dy7q0kfk02h9cf31mv30q3r31sl9yqrlmd23vc3f545c0q6hpxs"; + version = "0.4.2.0"; + sha256 = "1yw2b26n25xn545yi9n9p3sisdj93vr6r80x6p0h5bsx10v1dsad"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base containers enummapset ghc-prim template-haskell tlex @@ -302791,8 +303547,8 @@ self: { pname = "tomland"; version = "1.3.3.2"; sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "1"; - editedCabalFile = "03gnkws6yggkjn4kh8m1aah51a9lg2p25l9bl51cq54hmpcq51ni"; + revision = "2"; + editedCabalFile = "03xx2wqwyp11yxdnlwxi110wkm6shwpfgzdnzjwdw6cqijdc6zc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -305163,8 +305919,8 @@ self: { pname = "trial"; version = "0.0.0.0"; sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; - revision = "2"; - editedCabalFile = "1w98141cgwrik37hz35vkyf5x4p230863axp6mf6rnrlf7gayikr"; + revision = "3"; + editedCabalFile = "1ny7j9m0y6ry298032f2hnibxv961x86p93g8bl0qzyxhls3zngb"; libraryHaskellDepends = [ base colourista dlist ]; testHaskellDepends = [ base dlist doctest hedgehog hspec hspec-hedgehog splitmix @@ -305179,8 +305935,8 @@ self: { pname = "trial-optparse-applicative"; version = "0.0.0.0"; sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; - revision = "1"; - editedCabalFile = "0g05gi4b3c7ghyih83wq4icavg51p1bjx75i1g9nnx1cy4j82m4j"; + revision = "2"; + editedCabalFile = "0f1azyhbj2816aylcfp0jcm3k9j5xhxskg6pabxx8j9886zqv1zf"; libraryHaskellDepends = [ base optparse-applicative trial ]; description = "Trial helper functions for optparse-applicative"; license = lib.licenses.mpl20; @@ -305192,8 +305948,8 @@ self: { pname = "trial-tomland"; version = "0.0.0.0"; sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; - revision = "2"; - editedCabalFile = "1ssvwzqcz5vmvlrmxl6akcfpkr15inra3hdjfm1pg50gcri3mxkp"; + revision = "3"; + editedCabalFile = "0xz9gp83c1h3l8gzkbwn2lwdaxyf59l71kv69anzrp73jhzmq361"; libraryHaskellDepends = [ base text tomland trial ]; description = "Trial helper functions for tomland"; license = lib.licenses.mpl20; @@ -306382,6 +307138,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; + revision = "1"; + editedCabalFile = "0bgd9mf1z96iqwv2cdc0pj4dy3dnfxj8qsbvjm26h54cvazc2sbl"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -308616,6 +309374,8 @@ self: { pname = "typograffiti"; version = "0.2.0.1"; sha256 = "1avvnf1jsl7l3f7jbp0pnj5f4yhgacklciwvq2acbqb0cmr624rx"; + revision = "1"; + editedCabalFile = "1kcfxkxhva215mcmgk6wfnkqi6f3a56372jccfasg876s557ag6q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308742,8 +309502,8 @@ self: { }: mkDerivation { pname = "typst"; - version = "0.3.2.0"; - sha256 = "00cg8p2isb40yzfh63qrr7rshv43cp0bpsn753glbxz49qmspy0x"; + version = "0.3.2.1"; + sha256 = "0if1ig1ha65jp1l1v6bn5ljaa3n688hyfkq65dypj5s3nwfr0skm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310244,8 +311004,8 @@ self: { pname = "unicode-transforms"; version = "0.4.0.1"; sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j"; - revision = "3"; - editedCabalFile = "1hx6v04g4g1d8y8nm26k7vkhgfqmcch5xhvljlz67grw0j5d1zxd"; + revision = "4"; + editedCabalFile = "16d6l9ybs2wdwxdf3xfs25pzkkf3svflsn6ncvg86yky4x50zg29"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310632,8 +311392,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "union-color"; - version = "0.1.2.0"; - sha256 = "1412axanb5nqnxra3559nyid5cyrxasdnpv28xq5fgp7x7ykirj2"; + version = "0.1.2.1"; + sha256 = "188pmc32i1c112hph1irdpcf9b1jxc68yydqm2xzdcvyf1xpp0vr"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Unify verious color formats"; @@ -311747,8 +312507,8 @@ self: { pname = "unliftio-core"; version = "0.2.1.0"; sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; - revision = "2"; - editedCabalFile = "0g41lab0pysvj35wh8a3fzq5i8wf2i58s851m1wjbjzr31bsjy6b"; + revision = "3"; + editedCabalFile = "1ph6pfz8rj697wg0p8df6l4slj9708l8q951vpxpn3qfn8rhd018"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -313588,8 +314348,8 @@ self: { }: mkDerivation { pname = "uuagc"; - version = "0.9.55"; - sha256 = "1j0k94l1ydwwf2cpw22f8caa99hnw61ni7a0bpdgy7vdxsplzzqc"; + version = "0.9.56"; + sha256 = "0m9svb17ppsfbmrkq94cr5fvdwaly056j4xmg69rrb16ar38mz3l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal uuagc-cabal ]; @@ -314216,8 +314976,8 @@ self: { pname = "validation-selective"; version = "0.2.0.0"; sha256 = "11s9qsp5w19lbk6vg6psr3864xdsx2kmx3gcmnn2qkx6wsblx24s"; - revision = "1"; - editedCabalFile = "0m6bvg1z5rxwr2ls8vqizjx3psjm0dvf2vvycwi4shbqn2pgaiz8"; + revision = "2"; + editedCabalFile = "1lzx925znym2jx0qwicx7cv9ixy5qw4r3819sxvgd2yyvs159az1"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -314719,8 +315479,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "4"; - editedCabalFile = "0nmy4c95kss381n38by7li9x1ffgxz1bvyw0dh52xklbi7v144bh"; + revision = "5"; + editedCabalFile = "0piivz1plbr4zvgmvw5qh08zcwpw5pda8z3pzb8nz4h39fr27zwm"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -315009,6 +315769,8 @@ self: { pname = "vec"; version = "0.5"; sha256 = "17r0aq9yby99b4fxwaggdc2czlyh604yskcv2mpzy45sazw0690a"; + revision = "1"; + editedCabalFile = "0ixp1scb1adbb4i9s9zcsby4qckhzsahb5810bq9s5phi954wb8w"; libraryHaskellDepends = [ adjunctions base boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids transformers @@ -315027,8 +315789,8 @@ self: { pname = "vec-lens"; version = "0.4"; sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "3"; - editedCabalFile = "0hnc71d2zhqwi1q2v8lww1mrcs0xd3jw3ky1a63l3g7s6gqfkw1f"; + revision = "4"; + editedCabalFile = "1mh9wswfvcxw7656qqpggykndcpc5jsc5i0wxrnlzyg0ijh22qcs"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -315040,8 +315802,8 @@ self: { pname = "vec-optics"; version = "0.4"; sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "3"; - editedCabalFile = "1z0zzx99pqrg6yyn4qjykk7c8iq82d0yspxzb54wzydp5lrydq7w"; + revision = "4"; + editedCabalFile = "0szgvkhqnn2igjzvm86fbiqpybfjwl5n2dscr614bda6yhqlvk00"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -315336,6 +316098,23 @@ self: { license = lib.licenses.mit; }) {}; + "vector-extras_0_2_8_1" = callPackage + ({ mkDerivation, base, containers, deferred-folds, foldl, hashable + , unordered-containers, vector + }: + mkDerivation { + pname = "vector-extras"; + version = "0.2.8.1"; + sha256 = "0bnjh4c001v6ia6ac40i508jdzfdlccp8v0fhy7ayv4scrvpwip2"; + libraryHaskellDepends = [ + base containers deferred-folds foldl hashable unordered-containers + vector + ]; + description = "Utilities for the \"vector\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-fft" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -316050,8 +316829,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.2"; - sha256 = "06wi1ir0h7jzcjgd1fq17ggjqh8zb3i3nyd79l0kdkjy7x39rysg"; + version = "6.0.3"; + sha256 = "0k7azl5n70yhwkyij73q8iv275arsxh8jj53lwvhndp0bpwxycng"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators template-haskell text @@ -317199,31 +317978,41 @@ self: { license = lib.licenses.bsd3; }) {}; - "vty_5_39" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, blaze-builder - , bytestring, containers, deepseq, directory, filepath, microlens - , microlens-mtl, microlens-th, mtl, parsec, stm, terminfo, text - , transformers, unix, utf8-string, vector + "vty_6_0" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring, deepseq + , directory, filepath, microlens, microlens-mtl, microlens-th, mtl + , parsec, stm, text, utf8-string, vector }: mkDerivation { pname = "vty"; - version = "5.39"; - sha256 = "0x1j4m9gx8fdw651w6m49f91vjy98qkdxpr614z3nmf4sxzbpzp5"; - isLibrary = true; - isExecutable = true; + version = "6.0"; + sha256 = "0gc57ixmkdkbffzlbj1dda183gwwb6nwz65zsl2jplqwa6airb07"; + revision = "1"; + editedCabalFile = "0r0l1qb97jdd5ygqw5zzvcji2qgzj7mqapn44zi211z3svzy8kiw"; libraryHaskellDepends = [ - ansi-terminal base binary blaze-builder bytestring containers - deepseq directory filepath microlens microlens-mtl microlens-th mtl - parsec stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers directory filepath microlens microlens-mtl mtl + base binary blaze-builder bytestring deepseq directory filepath + microlens microlens-mtl microlens-th mtl parsec stm text + utf8-string vector ]; description = "A simple terminal UI library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; + "vty-crossplatform" = callPackage + ({ mkDerivation, base, vty, vty-unix }: + mkDerivation { + pname = "vty-crossplatform"; + version = "0.2.0.0"; + sha256 = "04ri60dp4gx6ycqhbdz5jd8mcwbwivwqh7fgg2m5vws6kycjma1l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vty vty-unix ]; + description = "Cross-platform support for Vty"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -317298,6 +318087,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "vty-unix" = callPackage + ({ mkDerivation, ansi-terminal, base, blaze-builder, bytestring + , containers, deepseq, microlens, microlens-mtl, microlens-th, mtl + , parsec, stm, terminfo, transformers, unix, utf8-string, vector + , vty + }: + mkDerivation { + pname = "vty-unix"; + version = "0.1.0.0"; + sha256 = "158j7hw0ddbvhxrhn3k2ifc2wsw70dq7pj0qwnmh5bkd1fs0iakz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq microlens + microlens-mtl microlens-th mtl parsec stm terminfo transformers + unix utf8-string vector vty + ]; + executableHaskellDepends = [ ansi-terminal base vty ]; + description = "Unix backend for Vty"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "vty-unix-build-width-table"; + broken = true; + }) {}; + + "vty-windows" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers + , deepseq, directory, filepath, microlens, microlens-mtl + , microlens-th, mtl, parsec, stm, transformers, utf8-string, vector + , vty, Win32 + }: + mkDerivation { + pname = "vty-windows"; + version = "0.1.0.3"; + sha256 = "01fwq0mpyxk5nlxkv24bzsr4klg2fpfy8rs124pdssh657aqxaf7"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers deepseq directory filepath + microlens microlens-mtl microlens-th mtl parsec stm transformers + utf8-string vector vty Win32 + ]; + description = "Windows backend for Vty"; + license = lib.licenses.bsd3; + platforms = lib.platforms.windows; + }) {}; + "vulkan" = callPackage ({ mkDerivation, base, bytestring, containers, inline-c, tasty , tasty-discover, tasty-hunit, template-haskell, transformers @@ -319713,6 +320547,8 @@ self: { pname = "warp"; version = "3.3.25"; sha256 = "1wa62inv7ai32jb88gr2vjiv1mh8gb96wc521y6mv2w967q1hzga"; + revision = "1"; + editedCabalFile = "1qg5ca56nmgkpzxcq0140yc8d0761hj257n24gf3dfjdj6hzf0pq"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -319735,7 +320571,7 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_3_29" = callPackage + "warp_3_3_30" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -319745,8 +320581,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.29"; - sha256 = "0dpp98in5ns85ix5lvxvbfy5wdpdbmy11bgbfzw69ajxdhcjk4q0"; + version = "3.3.30"; + sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -320037,18 +320873,14 @@ self: { "wave" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, hspec - , hspec-discover, QuickCheck, temporary, transformers + , hspec-discover, QuickCheck, temporary }: mkDerivation { pname = "wave"; - version = "0.2.0"; - sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki"; - revision = "2"; - editedCabalFile = "015zqms9ypqwb2x0yf51pdy63bikqypn3g3s4ng0nnqsl4bcdya9"; + version = "0.2.1"; + sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring cereal containers transformers - ]; + libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck temporary ]; @@ -322281,10 +323113,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.5.0"; - sha256 = "1h21bcxh4j3bbrx13lm2iialzvkf284cjl129rs2ridjdvzfjcm7"; - revision = "3"; - editedCabalFile = "13qxbck4ia474hlj1244awp2awjn3scppif3p1vwa3i92q6cf37g"; + version = "0.1.6.0"; + sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -322746,6 +323576,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.2.0.3"; + sha256 = "1c5kmxb9y7i1amjb0qn1w4rx7c80f52z976d7id644v9sxp00kfx"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -324617,14 +325467,14 @@ self: { license = lib.licenses.mit; }) {}; - "wuss_2_0_1_4" = callPackage + "wuss_2_0_1_5" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, exceptions , network, websockets }: mkDerivation { pname = "wuss"; - version = "2.0.1.4"; - sha256 = "0hm4rj7mx5zjmg2yr3zq462zw60nqaqrs91k71kgnxhnkcpbszav"; + version = "2.0.1.5"; + sha256 = "1cxl02fmhybk4l6xxrf826nlf7pmnb1xgvd7661xnf1xwz7l23n2"; libraryHaskellDepends = [ base bytestring crypton-connection exceptions network websockets ]; @@ -329253,10 +330103,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.7.1.1"; - sha256 = "1giac751jkygddf09a1h75dd4qv6kjjw5992447k53m1j398dpbn"; - revision = "1"; - editedCabalFile = "10m6k53idxr968595780v29kv9sjrp5irzv4b4bi10n3dxg85lf3"; + version = "0.7.1.2"; + sha256 = "1v2rcasjlh4wkqcas652wvs7z8n38cda4yzp18s07f01z0r8ra0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -329269,6 +330117,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-oauth2_0_7_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, mtl, safe-exceptions, text, transformers, unliftio + , uri-bytestring, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.7.1.3"; + sha256 = "151is1lvhnl3pvp0q4sn3i26l4n936vlpky3hndsn1f76cjy489b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + transformers unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-oidc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring , classy-prelude-yesod, containers, cryptonite, http-client @@ -329550,8 +330421,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.24.5"; - sha256 = "08w8rd69hswj9swi8krbfc063hvnm3vvn5n5vlx025xrgy5jfky2"; + version = "1.6.25.0"; + sha256 = "1n05rs8qn9xpdg9bccxil27zzjzv7gn1x7q8ld3dshwphpr0rpdv"; libraryHaskellDepends = [ aeson attoparsec-aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -332857,8 +333728,8 @@ self: { pname = "zip"; version = "2.0.0"; sha256 = "1j3gwhgcn2j2jsdg4dw7a5y1pw0n273zkfk782pvzjqmccaywbdp"; - revision = "1"; - editedCabalFile = "0cfnwqd2fjlhn2y8srav9s24038amkg3svj1ngs5g1gcljv3rsk8"; + revision = "2"; + editedCabalFile = "15qqk75gd3w4rypwhxlxsq9aaj8iz9wd8pds2si69jsyivn1nrrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -333111,8 +333982,8 @@ self: { pname = "zlib"; version = "0.6.3.0"; sha256 = "1nh4xsm3kgsg76jmkcphvy7hhslg9hx1s75mpsskhi2ksjd9ialy"; - revision = "3"; - editedCabalFile = "0hgh4rn9qinckiiwdnbp9rn0kpc06x18466i713971j03zf8wang"; + revision = "4"; + editedCabalFile = "0v8f3y0isi60c1ldmh5rvl08gjglwaqxs47csl8pi5bimxcpgsqr"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index c31e0dbe67f73..e59d2ed7c176a 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # that as the version number, I guess. version = "2017"; - libname = pname + stdenv.targetPlatform.extensions.sharedLibrary; + libname = pname + stdenv.hostPlatform.extensions.sharedLibrary; src = fetchurl { url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index 4c4cfd67dcdce..7f8281dd1de2d 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -33,9 +33,10 @@ let doInstallCheck = true; installCheckPhase = '' - $out/bin/bb --version | grep '${version}' - $out/bin/bb '(+ 1 2)' | grep '3' - $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' + $out/bin/bb --version | fgrep '${version}' + $out/bin/bb '(+ 1 2)' | fgrep '3' + $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' + $out/bin/bb '(prn "bépo àê")' | fgrep 'bépo àê' ''; # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index d45abd4c0f4a3..821e8da2ee34e 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,24 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-eXltZkg5QjdCrL9sk2ngVtirSnjBBqk+OdNLY4QtVx4="; + hash = "sha256-c4MVOHkDaUGlRVYb9YS9BH4ld2zS3SR5efP6amLhTig="; }; modRoot = "repl"; - vendorHash = "sha256-kalTHpyMYrKZHayxNKLc8vtogiDKyyQLExOQhqp1MUY="; - - patches = [ - # repl/go.mod and repl/go.sum are outdated - # ran `go mod tidy` in the repl directory - ./go-mod-tidy.patch - ]; + vendorHash = "sha256-Oj/XUUmuj5scD5WT6zBxnU1hSapDyRBBz75rbIdY4Ho="; subPackages = [ "main" diff --git a/pkgs/development/interpreters/cel-go/go-mod-tidy.patch b/pkgs/development/interpreters/cel-go/go-mod-tidy.patch deleted file mode 100644 index a1f4f06ae8348..0000000000000 --- a/pkgs/development/interpreters/cel-go/go-mod-tidy.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/repl/go.mod -+++ b/repl/go.mod -@@ -6,16 +6,16 @@ require ( - github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 - github.com/chzyer/readline v1.5.1 - github.com/google/cel-go v0.14.0 -- google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 -- google.golang.org/protobuf v1.30.0 -+ google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 -+ google.golang.org/protobuf v1.31.0 - ) - - require ( - github.com/stoewer/go-strcase v1.3.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect -- golang.org/x/sys v0.7.0 // indirect -+ golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect -- google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect -+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect - ) - - replace github.com/google/cel-go => ../. ---- a/repl/go.sum -+++ b/repl/go.sum -@@ -26,18 +26,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= - golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= - golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= --golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= - golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= -+google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= -+google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= --google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= --google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index be783c6a0410d..cda9cc7b78e87 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.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-r+XlcDvCQarzh8wO3NL87PJThnioeVC73OZdJ8kW4RM="; + hash = "sha256-x96I6HHhm3RIrlg1/KVCIbFkelazGt0H2nk8juUWjKg="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-WxYqP8L64U5MAYG7XTpKrRW1aaqGB4hJr+e/RKdb1lU="; + vendorHash = "sha256-ZVB6P0WdjyDK9OlEgKjR3D3IVBkDbDx9bOpLC/H2JLs="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 617658e748b98..918735517ea34 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -34,9 +34,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 2fe786271a782..a09afadf52712 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -36,10 +36,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0; nativeBuildInputs = [ makeWrapper @@ -129,6 +128,9 @@ builder rec { doCheck = false; doInstallCheck = doCheck; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + setupHook = ./setup-hook-3.0.sh; passthru = rec { diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 8030980b77886..fe4448c2f8d61 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2023-01-21"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "d10cc61bc54050b07874a8597f8df20534885105"; - hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; + rev = "596fcca5c77932da8a07c249de59a9dff3099495"; + hash = "sha256-gXTlAxW7s3VBiC1fGU0aUlGspHlvyY7FC5KLeU2FyGQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 63e7ec8e31b65..23b9c2ee8e821 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,14 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC5"; - hash = null; - })).overrideAttrs (oldAttrs: { - src = fetchurl { - url = "https://downloads.php.net/~jakub/php-8.3.0RC5.tar.xz"; - hash = "sha256-I42ded2tZO5ZQ+iU5DeNKjT+mNNoowew8gNOYDeB5aY="; + version = "8.3.0RC6"; + phpSrc = fetchurl { + url = "https://downloads.php.net/~eric/php-8.3.0RC6.tar.xz"; + hash = "sha256-Hntdz+vEkh7EQgnB4IrnG2sQ5bG2uJW7T3a0RIbHBe0="; }; - }); + })); in base.withExtensions ({ all, ... }: with all; ([ bcmath diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py index bb82900c65a92..d5c99e64751c7 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py @@ -1,30 +1,34 @@ -import pkg_resources +from importlib.metadata import PathDistribution +from pathlib import Path import collections import sys + do_abort = False packages = collections.defaultdict(list) -for f in sys.path: - for req in pkg_resources.find_distributions(f): - if req not in packages[req.project_name]: - # some exceptions inside buildPythonPackage - if req.project_name in ['setuptools', 'pip', 'wheel']: - continue - packages[req.project_name].append(req) + +for path in sys.path: + for dist_info in Path(path).glob("*.dist-info"): + dist = PathDistribution(dist_info) + + packages[dist._normalized_name].append( + f"{dist._normalized_name} {dist.version} ({dist._path})" + ) for name, duplicates in packages.items(): if len(duplicates) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) - for dup in duplicates: - print(" " + repr(dup)) + for duplicate in duplicates: + print(f"\t{duplicate}") if do_abort: print("") print( - 'Package duplicates found in closure, see above. Usually this ' - 'happens if two packages depend on different version ' - 'of the same dependency.') + "Package duplicates found in closure, see above. Usually this " + "happens if two packages depend on different version " + "of the same dependency." + ) sys.exit(1) diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py new file mode 100644 index 0000000000000..bb82900c65a92 --- /dev/null +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts_py2.py @@ -0,0 +1,30 @@ +import pkg_resources +import collections +import sys + +do_abort = False +packages = collections.defaultdict(list) + +for f in sys.path: + for req in pkg_resources.find_distributions(f): + if req not in packages[req.project_name]: + # some exceptions inside buildPythonPackage + if req.project_name in ['setuptools', 'pip', 'wheel']: + continue + packages[req.project_name].append(req) + + +for name, duplicates in packages.items(): + if len(duplicates) > 1: + do_abort = True + print("Found duplicated packages in closure for dependency '{}': ".format(name)) + for dup in duplicates: + print(" " + repr(dup)) + +if do_abort: + print("") + print( + 'Package duplicates found in closure, see above. Usually this ' + 'happens if two packages depend on different version ' + 'of the same dependency.') + sys.exit(1) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index b336caf6a0ada..5cdd307e70fe6 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -133,6 +133,11 @@ let ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + + ] ++ lib.optionals stdenv.isDarwin [ + # Fix darwin build https://bugs.python.org/issue34027 + ../3.7/darwin-libutil.patch + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2d293bb29a0e5..8f775699f4829 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "5"; + patch = "6"; suffix = ""; }; - hash = "sha256-hc0S6c8dbVpF8X96/hzr5+5ijTKCKBxJLoat9jbe+j8="; + hash = "sha256-D6t4+n8TP084IQxiYNkNfA1ccZhEZBnOBX7HrC5vXzg="; }; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 5aee357dd91b7..0a4600b9d6c39 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -106,9 +106,16 @@ in { pythonCatchConflictsHook = callPackage ({ makePythonHook, setuptools }: makePythonHook { name = "python-catch-conflicts-hook"; - substitutions = { - inherit pythonInterpreter pythonSitePackages setuptools; - catchConflicts=../catch_conflicts/catch_conflicts.py; + substitutions = let + useLegacyHook = lib.versionOlder python.version "3.10"; + in { + inherit pythonInterpreter pythonSitePackages; + catchConflicts = if useLegacyHook then + ../catch_conflicts/catch_conflicts_py2.py + else + ../catch_conflicts/catch_conflicts.py; + } // lib.optionalAttrs useLegacyHook { + inherit setuptools; }; } ./python-catch-conflicts-hook.sh) {}; @@ -183,16 +190,14 @@ in { }; } ./setuptools-check-hook.sh) {}; - setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust }: makePythonHook { name = "setuptools-rust-setup-hook"; propagatedBuildInputs = [ setuptools-rust ]; substitutions = { pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; - cargoLinkerVar = lib.toUpper ( - builtins.replaceStrings ["-"] ["_"] ( - rust.toRustTarget stdenv.hostPlatform)); + cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; }; } ./setuptools-rust-hook.sh) {}; @@ -228,5 +233,8 @@ in { makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ]; + substitutions = { + sphinxBuild = "${pythonOnBuildForHost.pkgs.sphinx}/bin/sphinx-build"; + }; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ca67fa9beabf3..0307e83d94799 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -38,7 +38,7 @@ buildSphinxPhase() { for __builder in "${__sphinxBuilders[@]}"; do echo "Executing sphinx-build with ${__builder} builder" - sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + @sphinxBuild@ -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v done runHook postBuildSphinx diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 060b840ce227b..c14c6bc096fd3 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -102,13 +102,14 @@ , disabledTestPaths ? [] +# Allow passing in a custom stdenv to buildPython* +, stdenv ? python.stdenv + , ... } @ attrs: assert (pyproject != null) -> (format == null); let - inherit (python) stdenv; - format' = if pyproject != null then if pyproject then @@ -194,7 +195,7 @@ let # 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" + "disabledTestPaths" "outputs" "stdenv" ]) // { name = namePrefix + name_; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 91ca84b34b83d..b5afaf34ce618 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -13,7 +13,7 @@ let # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. - makeOverridablePythonPackage = f: origArgs: + makeOverridablePythonPackage = f: lib.mirrorFunctionArgs f (origArgs: let args = lib.fix (lib.extends (_: previousAttrs: { @@ -30,7 +30,7 @@ let overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); __functor = self: result; } - else result; + else result); mkPythonDerivation = if python.isPy3k then ./mk-python-derivation.nix diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 9b0bb014e1efa..77231163f8036 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { shared = if stdenv.isDarwin then "dylib" else "shared"; configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.isDarwin [ "--enable-xonx" ]; + ++ lib.optionals stdenv.isDarwin [ "--disable-strip" "--enable-xonx" ]; configureScript = "../configure"; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index fc7e541ceff63..66ee788ca4300 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-IWOgbKYaWKjC2+dc2P3THAVy23F3iQXh2D6od/0e0Jw="; + sha256 = "sha256-QVUnn9G28epoUEcK8mwm8S2wDQ/tv5B3Zds7bTUFwlw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d650a03331eba..3ccbe1e855a3a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -15,13 +15,6 @@ let config = import ./config.nix { inherit fetchFromSavannah; }; rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; - openssl3Gem = fetchFromGitHub { - owner = "ruby"; - repo = "openssl"; - rev = "v3.0.2"; - hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo="; - }; - # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -156,12 +149,6 @@ let rm -rf $sourceRoot/{lib,test}/rubygems* cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib cp -r ${rubygems}/test/rubygems $sourceRoot/test - '' + opString (ver.majMin == "3.0" && opensslSupport) '' - # Replace the Gem by a OpenSSL3-compatible one. - echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..." - cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/ - cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/ - cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/ ''; postPatch = '' @@ -334,11 +321,6 @@ in { sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; }; - ruby_3_0 = generic { - version = rubyVersion "3" "0" "6" ""; - sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4="; - }; - ruby_3_1 = generic { version = rubyVersion "3" "1" "4" ""; sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; @@ -351,8 +333,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "0" "preview2"; - sha256 = "sha256-MM6LD+EbN7WsCI9aV2V0S5NerEW7ianjgXMVMxRPWZE="; + version = rubyVersion "3" "3" "0" "preview3"; + sha256 = "sha256-CWkUG+kuZ+DtuEqPs1SsyY8BvXjmAqI6DxNgRcgvSAk="; cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index e40ccb5908db6..8e9e35dae59a4 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.4.20"; + version = "3.4.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-9jKKef7KPnSYgKb3zf1LaulFBJuDpY6pWOJHSpG6Hzs="; + hash = "sha256-gD+nd3bRHT0btWOCZhbIERJEJeAzGtH9mDxBRARqYVY="; }; patches = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md"; homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; + mainProgram = "gem"; maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 7a4178d82b15d..82bd58469bd32 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""' ''; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = with lib; { homepage = "https://s48.org/"; description = "Scheme 48 interpreter for R5RS"; diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 194c67eba98f2..538f5e7f13565 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; + broken = true; license = licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 1b298af4ac492..fef3f5daceeb0 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # We want to have the makefile pick up $CC, etc. so that we don't have # to unnecessarily tie this package to the GCC stdenv. ./02-use-toolchain-env-vars.patch - ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # On macOS the library suffix is .dylib: ./03-macOS-SOsuf.patch ]; diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix index 95c05c3cf63cf..ef302aacc7398 100644 --- a/pkgs/development/interpreters/zuo/default.nix +++ b/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2023-10-17"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "493e9cd08147add01bba9247f36759f095b87678"; - hash = "sha256-gsCjB3V+A0kMZJZ9onZ57R6b1Ha0K+Q383DQoVGfY7I="; + rev = "9e2aa26b0574b4ac53c838f6b59fd78f952c3923"; + hash = "sha256-wF+jj4+4uFofW9KhVqRF7EoWViRny2KuSfX/l6UN+yY="; }; doCheck = true; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 680e86dd64ef7..0ad160673973f 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, flex, cmake }: stdenv.mkDerivation { pname = "NSPlist"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ flex cmake ]; + + preConfigure = '' + # Regenerate the lexer for improved compatibility with clang 16. + flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) + ''; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d74ab371bb147..dea308d59a2e4 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -9,7 +9,7 @@ , libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , alsa-lib -, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid +, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11 , xorgproto , libICE @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.3"; + version = "2.28.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; + hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-oss" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" ++ lib.optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 91e9f0a3edf0b..12b50cd476ba9 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , SDL, libogg, libvorbis, smpeg, libmikmod , fluidsynth, pkg-config , enableNativeMidi ? false @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + patches = [ + # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. + # https://github.com/libsdl-org/SDL_mixer/issues/287 + (fetchpatch { + name = "fluidsynth-fix-implicit-declaration.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; + hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; + }) + # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. + (fetchpatch { + name = "fluidsynth-fix-function-pointer-conversions.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; + hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; + }) + # Backport of MikMod fixes, which includes incompatible function pointer conversions. + (fetchpatch { + name = "mikmod-fixes.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + }) + # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; + hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion-header-part.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; + hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-signature.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; + hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f358a59ad62d1..f90be3a751e34 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch new file mode 100644 index 0000000000000..5f8fa80f387df --- /dev/null +++ b/pkgs/development/libraries/aalib/clang.patch @@ -0,0 +1,74 @@ +diff -ur a/configure b/configure +--- a/configure 2001-04-26 10:44:54.000000000 -0400 ++++ b/configure 2023-10-21 23:19:52.941161475 -0400 +@@ -1005,7 +1005,7 @@ + #line 1006 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +diff -ur a/src/aafire.c b/src/aafire.c +--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 ++++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <stdio.h> + #include "aalib.h" + +diff -ur a/src/aainfo.c b/src/aainfo.c +--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 +@@ -1,4 +1,4 @@ +- ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff -ur a/src/aakbdreg.c b/src/aakbdreg.c +--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 ++++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aamoureg.c b/src/aamoureg.c +--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 ++++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aaregist.c b/src/aaregist.c +--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 ++++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aasavefont.c b/src/aasavefont.c +--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <stdio.h> + #include "aalib.h" + int main(int argc, char **argv) + { +diff -ur a/src/aatest.c b/src/aatest.c +--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <string.h> + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch index 44559d06210c5..94b548b35c167 100644 --- a/pkgs/development/libraries/aalib/darwin.patch +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aalib.c b/src/aalib.c index 11fecc8..e3063b4 100644 --- a/src/aalib.c @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aarec.c b/src/aarec.c index 70f4ebc..ee43e8a 100644 --- a/src/aarec.c @@ -61,9 +61,9 @@ index 54abec0..765155e 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aax.c b/src/aax.c index adcbd82..36e3294 100644 --- a/src/aax.c diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index af0fa61740150..903364ea27f61 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 712f89e383fff..59294496f80ae 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index d40ca0bd4ab23..0c1a173eca44b 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index 7ca25f4140405..a605be3c05edf 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index da5f1fc029e16..4676264c26d74 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch new file mode 100644 index 0000000000000..61b57456b3fca --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch @@ -0,0 +1,12 @@ +diff -ur a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +--- a/absl/time/CMakeLists.txt 1969-12-31 19:00:01.000000000 -0500 ++++ b/absl/time/CMakeLists.txt 2023-10-30 21:50:32.639061785 -0400 +@@ -55,7 +55,7 @@ + ) + + if(APPLE) +- find_library(CoreFoundation CoreFoundation) ++ set(CoreFoundation "-framework CoreFoundation") + endif() + + absl_cc_library( diff --git a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix index 8d039701d97b5..c32c301dd3b3a 100644 --- a/pkgs/development/libraries/agda/functional-linear-algebra/default.nix +++ b/pkgs/development/libraries/agda/functional-linear-algebra/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, mkDerivation, standard-library }: mkDerivation rec { - version = "0.4"; + version = "0.4.1"; pname = "functional-linear-algebra"; buildInputs = [ standard-library ]; @@ -10,7 +10,7 @@ mkDerivation rec { repo = "functional-linear-algebra"; owner = "ryanorendorff"; rev = "v${version}"; - sha256 = "05jk3792k9xf8iiwzm2hwlvd25f2pqqr3gppmqjf8xb9199i8fk0"; + sha256 = "GrTeMEHEXb0t2RgHWiGfvvofNYl8YYaaoCE18JrG6Q4="; }; preConfigure = '' @@ -26,6 +26,5 @@ mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ ryanorendorff ]; - broken = true; }; } diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index b3346be1bb70f..487b0dfde0d62 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,10 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU, libGL, libjpeg, flac -, libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs +{ lib +, alsa-lib +, cmake +, enet +, fetchFromGitHub +, fetchpatch +, flac +, freetype +, gtk3 +, libGL +, libGLU +, libjpeg +, libopus +, libpng +, libpthreadstubs +, libpulseaudio +, libtheora +, libvorbis +, libwebp +, libX11 +, libXcursor , libXdmcp +, libXext +, libXfixes +, libXi +, libXpm +, libXt +, libXxf86dga +, libXxf86misc +, libXxf86vm +, openal +, pcre +, physfs +, pkg-config +, stdenv +, texinfo +, xorgproto +, zlib }: stdenv.mkDerivation rec { @@ -18,15 +49,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - texinfo zlib libpng libvorbis openal libGLU libGL - libjpeg flac enet libtheora freetype physfs libopus - gtk3 pcre + enet + flac + freetype + gtk3 + libGL + libGLU + libjpeg + libopus + libpng + libtheora + libvorbis + libwebp + openal + pcre + physfs + texinfo + zlib ] ++ lib.optionals stdenv.isLinux [ - libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib - libXxf86dga libXxf86misc libXxf86vm libXi libXfixes - libXdmcp libpulseaudio libpthreadstubs + alsa-lib + libpthreadstubs + libpulseaudio + libX11 + libXcursor + libXdmcp + libXext + libXfixes + libXi + libXpm + libXt + libXxf86dga + libXxf86misc + libXxf86vm + xorgproto ]; postPatch = '' diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/development/libraries/apr-util/clang-bdb.patch new file mode 100644 index 0000000000000..02e9c8378c636 --- /dev/null +++ b/pkgs/development/libraries/apr-util/clang-bdb.patch @@ -0,0 +1,12 @@ +diff -ur a/build/dbm.m4 b/build/dbm.m4 +--- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 ++++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 +@@ -235,7 +235,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b44b410d30eb9..a1cbbc5e66423 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; - patches = [ ./fix-libxcrypt-build.patch ] - ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + patches = [ + ./fix-libxcrypt-build.patch + # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. + ./clang-bdb.patch + ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ lib.optional (!stdenv.isCygwin) "--with-crypto" diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 76bf38cce1693..63ccedd56a198 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.6.5"; + version = "12.6.6"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; + hash = "sha256-OFiw/UMXcq8DKtPzXCrrVOjavqWRaefR6fzNeLyCrTU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch deleted file mode 100644 index 32c0a4cab5847..0000000000000 --- a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake -similarity index 60% -rename from cmake_modules/FindProtobufAlt.cmake -rename to cmake_modules/FindprotobufAlt.cmake -index 15fe1b4f2..19bdd6291 100644 ---- a/cmake_modules/FindProtobufAlt.cmake -+++ b/cmake_modules/FindprotobufAlt.cmake -@@ -16,24 +16,24 @@ - # under the License. - - if(ARROW_PROTOBUF_USE_SHARED) -- set(Protobuf_USE_STATIC_LIBS OFF) -+ set(protobuf_USE_STATIC_LIBS OFF) - else() -- set(Protobuf_USE_STATIC_LIBS ON) -+ set(protobuf_USE_STATIC_LIBS ON) - endif() - - set(find_package_args) --if(ProtobufAlt_FIND_VERSION) -- list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION}) -+if(protobufAlt_FIND_VERSION) -+ list(APPEND find_package_args ${protobufAlt_FIND_VERSION}) - endif() --if(ProtobufAlt_FIND_QUIETLY) -+if(protobufAlt_FIND_QUIETLY) - list(APPEND find_package_args QUIET) - endif() --find_package(Protobuf ${find_package_args}) --set(ProtobufAlt_FOUND ${Protobuf_FOUND}) --if(ProtobufAlt_FOUND) -- set(ProtobufAlt_VERSION ${Protobuf_VERSION}) -- set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR}) -- set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR}) -- set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH}) -- set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK}) -+find_package(protobuf ${find_package_args} CONFIG) -+set(protobufAlt_FOUND ${protobuf_FOUND}) -+if(protobufAlt_FOUND) -+ set(protobufAlt_VERSION ${protobuf_VERSION}) -+ set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR}) -+ set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR}) -+ set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH}) -+ set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK}) - endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 94f926039..8efc98323 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - opentelemetry-cpp - ORC - re2 -- Protobuf -+ protobuf - RapidJSON - Snappy - Substrait -@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME) - build_opentelemetry() - elseif("${DEPENDENCY_NAME}" STREQUAL "ORC") - build_orc() -- elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf") -+ elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf") - build_protobuf() - elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON") - build_rapidjson() -@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF) - # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If - # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and - # use 23.4. -- resolve_dependency(Protobuf -+ resolve_dependency(protobuf - FORCE_ANY_NEWER_VERSION - TRUE - HAVE_ALT -@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF) - PC_PACKAGE_NAMES - protobuf) - -- if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) -+ if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) - add_definitions(-DPROTOBUF_USE_DLLS) - endif() - -@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF) - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE) - if(NOT STREQUAL "INTERFACE_LIBRARY") -- # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -- message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -+ message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}") - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") -@@ -3986,7 +3986,7 @@ endmacro() - - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.30.0") -- if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE) -+ if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE) - # ARROW-15495: Protobuf/gRPC must come from the same source - message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})") - set(gRPC_SOURCE "${Protobuf_SOURCE}") diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ddf8db98b39bd..4cc55effdaa5f 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "13.0.0"; + version = "14.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY="; + hash = "sha256-XHDq+xAR+dEkuvsyiv5U9izFuSgLcIDh49Zo94wOQH4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -115,15 +115,10 @@ stdenv.mkDerivation rec { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.20.0"; - hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; + rev = "v0.27.0"; + hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; }; - patches = [ - # Protobuf switched to lower case project name. - ./cmake-find-protobuf.patch - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index a10aace767be3..0f420745baef6 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; + buildInputs = [ zlib ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5ecbdcfccce9..3b5224c97f936 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; + hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; }; outputs = [ "out" "dev" ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bb5a4e0dd53b9..b8b89abc8ea7f 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; + hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46fa..a0869edf4fbdd 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib +, stdenv +, fetchurl +, lv2 +, meson +, ninja +, pkg-config +, python3 +, libsndfile +, serd +, sord +, sratom +, gitUpdater # test derivations , pipewire @@ -6,24 +18,29 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.12"; + version = "0.24.20"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; }; - patches = [ ./lilv-pkgconfig.patch ]; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ serd sord sratom ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - dontAddWafCrossFlags = true; - passthru.tests = { - inherit pipewire; + mesonFlags = [ "-Ddocs=disabled" ]; + + passthru = { + tests = { + inherit pipewire; + }; + updateScript = gitUpdater { + url = "https://gitlab.com/lv2/lilv.git"; + rev-prefix = "v"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch deleted file mode 100644 index a5a8c6007e439..0000000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/lilv.pc.in -+++ b/lilv.pc.in -@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins --Requires: @LILV_PKG_DEPS@ -+Requires: lv2 -+Requires.private: @LILV_PKG_DEPS@ diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 075ce33ef9e2e..70054134767ae 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd source substituteInPlace Makefile \ --replace 'ldconfig' "" - '' + lib.optionalString (!stdenv.targetPlatform.isx86_64) '' + '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ --replace '-DENABLE_SSE2' "" ''; diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index 7d1bac57472c4..9f5d8867a150e 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Do not fail the build on clang-16/darwin. + # TODO: drop the workaround when upstream fixes it in: + # https://gitlab.com/drobilla/zix/-/issues/3 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "A lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c6d656388d458..f9974e2ca2538 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; + # std::unary_function has been removed in c++17 + makeFlags = [ "CXXFLAGS=-std=c++11" ]; + # Even when statically linking, libstdc++.la is put in dependency_libs here, # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the # compiler do what it does best. (libaudiofile.la is a generated file, so we diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index ef174d1118a9e..48865cf83564d 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: { buildPhase = '' runHook preBuild - ./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} - ./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} + ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} runHook postBuild ''; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 69a8978ae6289..017b4cf46a79c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,12 +1,8 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype -, x11Support? !stdenv.isDarwin, libXext, libXrender +{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL # libGLU libGL is no longer a big dependency -, pdfSupport ? true +, xcbSupport ? x11Support, libxcb , darwin , testers }: @@ -17,82 +13,27 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; + hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; }; - patches = [ - # Fixes CVE-2018-19876; see Nixpkgs issue #55384 - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 - # - # This patch is the merged commit from the above PR. - (fetchpatch { - name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; - }) - - # Fix PDF output. - # https://gitlab.freedesktop.org/cairo/cairo/issues/342 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; - }) - - # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 - (fetchpatch { - name = "CVE-2020-35492.patch"; - includes = [ "src/cairo-image-compositor.c" ]; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; - }) - - # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 - ./skip-configure-stderr-check.patch - - # Fixes cairo crash on macOS Big Sur - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; - }) - - # Fix clang build failures on newer LLVM versions - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/119 - (fetchpatch { - name = "fix-types.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; - }) - - # Fix unexpected color addition on grayscale images (usually text). - # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 - # Can be removed after 1.18 release - (fetchpatch { - name = "fix-grayscale-anialias.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; - }) - - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small separateDebugInfo = true; nativeBuildInputs = [ + gtk-doc + meson + ninja pkg-config + python3 ]; buildInputs = [ - libiconv - libintl + docbook_xsl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText @@ -100,49 +41,53 @@ in { Carbon ]); - propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optionals xcbSupport [ libxcb ] ++ optional gobjectSupport glib - ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = [ - "--enable-tee" - ] ++ (if stdenv.isDarwin then [ - "--disable-dependency-tracking" - "--enable-quartz" - "--enable-quartz-font" - "--enable-quartz-image" - "--enable-ft" - ] else (optional xcbSupport "--enable-xcb" - ++ optional glSupport "--enable-gl" - ++ optional pdfSupport "--enable-pdf" - )) ++ optional (!x11Support) "--disable-xlib"; - - preConfigure = - # On FreeBSD, `-ldl' doesn't exist. - lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - '' - + - '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - substituteInPlace configure --replace strings $STRINGS - ''; + mesonFlags = [ + "-Dgtk_doc=true" + + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; enableParallelBuilding = true; doCheck = false; # fails - postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -151,9 +96,8 @@ in { longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration @@ -162,10 +106,10 @@ in { homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; pkgConfigModules = [ + "cairo-pdf" "cairo-ps" "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-pdf"; + ] ++ lib.optional gobjectSupport "cairo-gobject"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index f1c1a272b5f91..0b945c8c5990a 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin Foundation; installTargets = [ "install_hdrs" ] - ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" - ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; + ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 8add9c623470d..14b4e549264b0 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; + # fortify breaks the libcompat vsnprintf implementation + hardeningDisable = lib.optionals (stdenv.hostPlatform.isMusl && (stdenv.hostPlatform != stdenv.buildPlatform)) [ "fortify" ]; + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix index dd4d410bb874c..1da0b31cb10cf 100644 --- a/pkgs/development/libraries/clap/default.nix +++ b/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; + hash = "sha256-AH3kSCp4Q8Nw3To2vuPuMH/cWm3cmzj2OEH/Azcbdmo="; }; postPatch = '' diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 80c4187c951c5..804aa13ed91a9 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + #doCheck = true; # no tests possible without a display passthru = { diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 41aa3045841f4..987d90e269955 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { "--enable-wayland-egl-server" "--enable-gles1" "--enable-gles2" + # Force linking against libGL. + # Otherwise, it tries to load it from the runtime library path. + "LIBS=-lGL" ] ++ lib.optionals stdenv.isDarwin [ "--disable-glx" "--without-x" @@ -82,11 +85,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ - "-I${pango.dev}/include/pango-1.0" - "-I${cairo.dev}/include/cairo" - "-I${harfbuzz.dev}/include/harfbuzz" - ]); + env = { + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; #doCheck = true; # all tests fail (no idea why) diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index c9f6711780b0b..801ad7979aee9 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-UG/vV/6WxVLq9mdze8pSDFJIekOgGsg93dzMq6eP6Dg="; + hash = "sha256-QFK8mEMcqQwALFNvAdD8yWixwMYHSbeo6xqx86PvejU="; }; patches = [ ./version.patch ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 1b31cef96550f..d4ab53f37bcd3 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , aspell , groff , pkg-config @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; + patches = [ + # fix build with clang 16 + (fetchpatch { + url = "https://github.com/AbiWord/enchant/commit/f71eb22e4af7f9917011807a41cf295d3ce0ccbc.patch"; + hash = "sha256-9WWvpU3HKzPlxNBYQAKPppW6G3kOIC2A+MqX5eheBDA="; + }) + ]; + nativeBuildInputs = [ groff pkg-config diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cd02c6bba15c2..e713ca1413fb3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -52,7 +52,7 @@ , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils -, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer @@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withHardcodedTables "hardcoded-tables") (enableFeature withSafeBitstreamReader "safe-bitstream-reader") - (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") - (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads") "--disable-os2threads" # We don't support OS/2 (enableFeature withNetwork "network") diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index ec1715b005ffb..eeac7d14568eb 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 76e661dfbd4c6..2a4fdaca27254 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -9,7 +9,12 @@ , libiconv , enablePython ? false , python ? null -, swig +, swig4 +, expat +, libuuid +, openjpeg +, zlib +, pkg-config }: stdenv.mkDerivation rec { @@ -27,6 +32,10 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_BUILD_TESTING=ON" + "-DGDCM_USE_SYSTEM_EXPAT=ON" + "-DGDCM_USE_SYSTEM_ZLIB=ON" + "-DGDCM_USE_SYSTEM_UUID=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -38,15 +47,23 @@ stdenv.mkDerivation rec { "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optionals enableVTK [ + buildInputs = [ + expat + libuuid + openjpeg + zlib + ] ++ lib.optionals enableVTK [ vtk ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig python ]; + ] ++ lib.optionals enablePython [ swig4 python ]; disabledTests = [ # require networking: @@ -59,6 +76,8 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ + "TestRescaler2" ]; checkPhase = '' diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 36c7120ac609a..1d6f158b52f2b 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -18,10 +18,17 @@ stdenv.mkDerivation rec { (import ./fix-const-weights-clang-patch.nix fetchpatch) ]; + postPatch = '' + substituteInPlace gecode/flatzinc/lexer.yy.cpp \ + --replace "register " "" + ''; + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index a11b5674b58ab..3dac6d6804e3c 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,19 +2,20 @@ , fetchFromGitHub , lib , nix-update-script +, openssl , pkg-config , stdenv }: stdenv.mkDerivation rec { pname = "gensio"; - version = "2.6.2"; + version = "2.7.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lpP/pmM06zIw+9EZe+zywExLOcrN3K7IMK32XSrCmYs="; + sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0="; }; passthru = { @@ -27,6 +28,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ openssl ]; + meta = with lib; { description = "General Stream I/O"; homepage = "https://sourceforge.net/projects/ser2net/"; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 70d06c107fd55..1b45be6112812 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + patches = [ + (fetchpatch { + name = "gf2x-1.3.0-configure-clang16.patch"; + url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; + hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch new file mode 100644 index 0000000000000..234bc1943c9af --- /dev/null +++ b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch @@ -0,0 +1,37 @@ +From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001 +From: Connor Baker <connor.baker@tweag.io> +Date: Tue, 31 Oct 2023 14:30:24 +0000 +Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard + +--- + sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7c200599c1..583a426494 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -25,17 +25,17 @@ + /* Get default empty definitions for simd declarations. */ + #include <bits/libm-simd-decl-stubs.h> + +-#if __GNUC_PREREQ(9, 0) ++#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __Float32x4_t __f32x4_t; + typedef __Float64x2_t __f64x2_t; +-#elif __glibc_clang_prereq(8, 0) ++#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t; + typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t; + #endif + +-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0) ++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__) + # define __SVE_VEC_MATH_SUPPORTED + typedef __SVFloat32_t __sv_f32_t; + typedef __SVFloat64_t __sv_f64_t; +-- +2.42.0 + diff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz index 4eb3c7b2cdb32..6414956807f44 100644 --- a/pkgs/development/libraries/glibc/2.38-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 51d8a4dbe05c0..3e17817c0babe 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.38"; - patchSuffix = "-23"; + patchSuffix = "-27"; sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in @@ -60,7 +60,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.38/master && git describe - glibc-2.38-23-g0e1ef6779a + glibc-2.38-27-g750a45a783 $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. @@ -97,6 +97,18 @@ stdenv.mkDerivation ({ */ ./reenable_DT_HASH.patch ] + /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost + every HPC piece of software, without this patch CUDA compilation on ARM + is effectively broken. See + https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2. + */ + ++ ( + let + isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64; + isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux; + in + lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch + ) ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -276,7 +288,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 ]; + maintainers = with maintainers; [ eelco ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 11676560e80b1..be3bee081e73e 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -154,7 +154,7 @@ in ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so touch $out/lib/libpthread.a # Put libraries for static linking in a separate output. Note @@ -163,6 +163,8 @@ in mkdir -p $static/lib mv $out/lib/*.a $static/lib mv $static/lib/lib*_nonshared.a $out/lib + # If libutil.so.1 is missing, libutil.a is required. + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib # Some of *.a files are linker scripts where moving broke the paths. sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ -i "$static"/lib/*.a diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d91f936c937b1..27894b09b91ce 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 8af09dcd6f6e9..417d70d621b69 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; - # https://github.com/g-truc/glm/pull/1055 - # Fix more implicit-int-float-conversion warnings # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) - patches = [(fetchpatch { - url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; - sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; - })]; + # (https://github.com/g-truc/glm/pull/1055 neither) + patches = [ + (fetchpatch { + name = "glm-0.9.9.8-clang.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa"; + hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY="; + }) + ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 2b088eb459ad5..0315f39c60592 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -6,22 +6,22 @@ # files. let - rev = "d4e37b5868ef910e3e52744c34408084bb13051c"; + rev = "28ea239c53a2d5d8800c472bc2452eaa16e37af2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { name = "config.guess-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "191czpnbc1nxrygg8fd3839y1f4m9x43rp57vgrsas6p07zzh3c1"; + hash = "sha256-7CV3YUJSMm+InfHel7mkV8A6mpSBEEhWPCEaRElti6M="; }; configSub = fetchurl { name = "config.sub-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "0148p54gw10p6sk2rn3gi9vvqm89rk8kcvl9335ckayhanx31381"; + hash = "sha256-Rlxf5nx9NrcugIgScWRF1NONS5RzTKjTaoY50SMjh4s="; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2023-07-31"; + version = "2023-09-19"; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0cfe4c7945895..4dec79e0e2da1 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-lVHjcIGtO96BAYoNJPJFw/ggaZBUlZj7Mal6aDgKe3E="; + hash = "sha256-BD4u/hi0rSK5bUNN3nY/vtMs+NbCINxp3w0P+53Gb8Y="; }; patches = [ diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 84c3abd575ce7..daf3bad132d3d 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.57.0"; # N.B: if you change this, please update: + version = "1.59.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-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; fetchSubmodules = true; }; @@ -37,14 +37,8 @@ stdenv.mkDerivation rec { (fetchpatch { # armv6l support, https://github.com/grpc/grpc/pull/21341 name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; - hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; - }) - # Fix generated CMake config file - # FIXME: remove when merged - (fetchpatch { - url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch"; - hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo="; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) ]; @@ -95,13 +89,12 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=unknown-warning-option" - ] ++ lib.optionals stdenv.isAarch64 [ - "-Wno-error=format-security" - ] - ); + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals stdenv.isDarwin [ + # Workaround for https://github.com/llvm/llvm-project/issues/48757 + "-Wno-elaborated-enum-base" + ]); enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 9599da0fdf529..8ff8220aa75df 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,6 +10,7 @@ , orc , bzip2 , gettext +, libGL , libv4l , libdv , libavc1394 @@ -129,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936dd07..ee467f965c817 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 73914495d6d41..45e640e2a708a 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 7bf7132068676..53bd7f067b291 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Y6ATYXsV8hH22XiXyvacuUhHTuNCzObPlxNX2vZGghM="; + hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index ca7a47d363856..73bc80ef9d5bf 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.89.9"; + version = "1.90"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; + sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index f85ec4d96b396..ab237d9dca000 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -22,6 +22,8 @@ , enlightenment , xorg , testers + +, gitUpdater }: let @@ -29,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; + hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; }; buildInputs = [ @@ -59,19 +61,25 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "bin" "out" "dev" ]; - passthru.tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; + passthru = { + tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.enlightenment.org/old/legacy-imlib2.git"; + rev-prefix = "v"; + }; }; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { description = "Image manipulation library"; diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index 3a6b2afee0d95..e2db993707e21 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -1,7 +1,8 @@ { version, rev, sourceSha256 }: -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper -, pkg-config, libX11, libuuid, xz, vtk, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake +, expat, fftw, gdcm, hdf5-cpp, libjpeg, libminc, libtiff, libpng +, libX11, libuuid, xz, vtk, zlib, Cocoa }: let itkGenericLabelInterpolatorSrc = fetchFromGitHub { @@ -41,8 +42,6 @@ stdenv.mkDerivation { substituteInPlace CMake/ITKSetStandardCompilerFlags.cmake \ --replace "-march=corei7" "" \ --replace "-mtune=native" "" - substituteInPlace Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/libopenjp2.pc.cmake.in \ - --replace "@OPENJPEG_INSTALL_LIB_DIR@" "@OPENJPEG_INSTALL_FULL_LIB_DIR@" ln -sr ${itkGenericLabelInterpolatorSrc} Modules/External/ITKGenericLabelInterpolator ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters @@ -52,6 +51,15 @@ stdenv.mkDerivation { "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" "-DITK_FORBID_DOWNLOADS=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. + # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, + # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" + # when compiling c3d, but maybe an ITK 5.2/eigen version issue: + "-DITK_USE_SYSTEM_EIGEN=OFF" + "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 + "-DITK_USE_SYSTEM_GDCM=ON" + "-DITK_USE_SYSTEM_MINC=ON" + "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DModule_ITKMINC=ON" "-DModule_ITKIOMINC=ON" "-DModule_ITKIOTransformMINC=ON" @@ -63,8 +71,12 @@ stdenv.mkDerivation { "-DModule_GenericLabelInterpolator=ON" ]; - nativeBuildInputs = [ cmake xz makeWrapper ]; - buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake xz ]; + buildInputs = [ + libX11 + libuuid + vtk + ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 # (specifically libGL and libX11 on Linux), # it's now seemingly necessary for packages that configure ITK to @@ -72,11 +84,20 @@ stdenv.mkDerivation { # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, # so we simply propagate them again from ITK. # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. - propagatedBuildInputs = vtk.propagatedBuildInputs; - - postInstall = '' - wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" - ''; + propagatedBuildInputs = [ + # The dependencies we've un-vendored from ITK, such as GDCM, must be propagated, + # otherwise other software built against ITK fails to configure since ITK headers + # refer to these previously vendored libraries: + expat + fftw + gdcm + hdf5-cpp + libjpeg + libminc + libpng + libtiff + zlib + ] ++ vtk.propagatedBuildInputs; meta = { description = "Insight Segmentation and Registration Toolkit"; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 87dbd16d86c49..53265baaf8fec 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.24.0"; + version = "1.25.0"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-VQzXg16rnrghsRY2H3NnGJ+0HEbz8/Num7Xlm9pEqqw="; + sha256 = "sha256-isxV/gTOjVQW3716cr8ZrlLnOn8YWWr6p1SHYlwhdvA="; }; installPhase = '' diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index a00399497e222..f89152820698d 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - nativeBuildInputs = [ autoreconfHook ]; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool ]; nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa501..517746aa9b531 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 3543fef66337e..2a264d47c24c9 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -25,21 +25,6 @@ mkDerivation { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; - # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups - # where the device id will change on reboot causing baloo to reindex all the files and then having - # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. - # However, without this patch, people tend to disable baloo rather than dealing with the constant - # reindexing. - # - # https://bugs.kde.org/show_bug.cgi?id=402154 - patches = [ - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; - hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; - name = "use_fsid.patch"; - }) - ]; - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c72caa6d585d4..f53e0d6c16bff 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.110/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 03e233c28799c..8815683aef65d 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -29,12 +29,6 @@ mkDerivation { separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch - - # Fix a crash when saving files. - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/-/commit/48322f44323a1fc09305d66d9093fe6c3780709e.patch"; - hash = "sha256-4NxI2mD/TdthvrzgatCAlM6VN3N38i3IJUHh0Bs8Fjk="; - }) ]; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index a9d4baebf1c1a..04256007ef24a 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -2,25 +2,11 @@ mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, - fetchpatch }: mkDerivation { pname = "networkmanager-qt"; - # backport patches for NetworkManager 1.44 compatibility - # FIXME: remove in 5.112 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d9a938ddbfb5800503935926301ff2865ab77a6d.patch"; - hash = "sha256-EjFBcU0YJQocp8skDZUTxCQhfrtQP5Fdo8q1BC9lLnQ="; - }) - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d35c6cb97443424d228dfd8eee8282af6632b5f5.patch"; - hash = "sha256-KmRcCjdHGGk+5PY5JKNbk0BHCtdwibns+Hw4aNRaoZI="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1fd8a2ba15a0e..f6909957ba445 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; - sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; - name = "attica-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; + sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; + name = "attica-5.112.0.tar.xz"; }; }; baloo = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; - sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; - name = "baloo-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; + sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; + name = "baloo-5.112.0.tar.xz"; }; }; bluez-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; - sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; - name = "bluez-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; + sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; + name = "bluez-qt-5.112.0.tar.xz"; }; }; breeze-icons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; - sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; - name = "breeze-icons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; + sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; + name = "breeze-icons-5.112.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; - sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; - name = "extra-cmake-modules-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/extra-cmake-modules-5.112.0.tar.xz"; + sha256 = "1qn2shanzsv06q34zwhkjhb88j7crdp83qp265gpxmc049vq845c"; + name = "extra-cmake-modules-5.112.0.tar.xz"; }; }; frameworkintegration = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; - sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; - name = "frameworkintegration-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; + sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; + name = "frameworkintegration-5.112.0.tar.xz"; }; }; kactivities = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; - sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; - name = "kactivities-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; + sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; + name = "kactivities-5.112.0.tar.xz"; }; }; kactivities-stats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; - sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; - name = "kactivities-stats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; + sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; + name = "kactivities-stats-5.112.0.tar.xz"; }; }; kapidox = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; - sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; - name = "kapidox-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; + sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; + name = "kapidox-5.112.0.tar.xz"; }; }; karchive = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; - sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; - name = "karchive-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; + sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; + name = "karchive-5.112.0.tar.xz"; }; }; kauth = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; - sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; - name = "kauth-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; + sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; + name = "kauth-5.112.0.tar.xz"; }; }; kbookmarks = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; - sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; - name = "kbookmarks-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; + sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; + name = "kbookmarks-5.112.0.tar.xz"; }; }; kcalendarcore = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; - sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; - name = "kcalendarcore-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; + sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; + name = "kcalendarcore-5.112.0.tar.xz"; }; }; kcmutils = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; - sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; - name = "kcmutils-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; + sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; + name = "kcmutils-5.112.0.tar.xz"; }; }; kcodecs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; - sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; - name = "kcodecs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; + sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; + name = "kcodecs-5.112.0.tar.xz"; }; }; kcompletion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; - sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; - name = "kcompletion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; + sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; + name = "kcompletion-5.112.0.tar.xz"; }; }; kconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; - sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; - name = "kconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; + sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; + name = "kconfig-5.112.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; - sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; - name = "kconfigwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; + sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; + name = "kconfigwidgets-5.112.0.tar.xz"; }; }; kcontacts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; - sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; - name = "kcontacts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; + sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; + name = "kcontacts-5.112.0.tar.xz"; }; }; kcoreaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; - sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; - name = "kcoreaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; + sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; + name = "kcoreaddons-5.112.0.tar.xz"; }; }; kcrash = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; - sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; - name = "kcrash-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; + sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; + name = "kcrash-5.112.0.tar.xz"; }; }; kdav = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; - sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; - name = "kdav-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; + sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; + name = "kdav-5.112.0.tar.xz"; }; }; kdbusaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; - sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; - name = "kdbusaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; + sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; + name = "kdbusaddons-5.112.0.tar.xz"; }; }; kdeclarative = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; - sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; - name = "kdeclarative-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; + sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; + name = "kdeclarative-5.112.0.tar.xz"; }; }; kded = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; - sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; - name = "kded-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; + sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; + name = "kded-5.112.0.tar.xz"; }; }; kdelibs4support = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; - sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; - name = "kdelibs4support-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; + sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; + name = "kdelibs4support-5.112.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; - sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; - name = "kdesignerplugin-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; + sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; + name = "kdesignerplugin-5.112.0.tar.xz"; }; }; kdesu = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; - sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; - name = "kdesu-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; + sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; + name = "kdesu-5.112.0.tar.xz"; }; }; kdewebkit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; - sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; - name = "kdewebkit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; + sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; + name = "kdewebkit-5.112.0.tar.xz"; }; }; kdnssd = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; - sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; - name = "kdnssd-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; + sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; + name = "kdnssd-5.112.0.tar.xz"; }; }; kdoctools = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; - sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; - name = "kdoctools-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; + sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; + name = "kdoctools-5.112.0.tar.xz"; }; }; kemoticons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; - sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; - name = "kemoticons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; + sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; + name = "kemoticons-5.112.0.tar.xz"; }; }; kfilemetadata = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; - sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; - name = "kfilemetadata-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; + sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; + name = "kfilemetadata-5.112.0.tar.xz"; }; }; kglobalaccel = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; - sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; - name = "kglobalaccel-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; + sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; + name = "kglobalaccel-5.112.0.tar.xz"; }; }; kguiaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; - sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; - name = "kguiaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; + sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; + name = "kguiaddons-5.112.0.tar.xz"; }; }; kholidays = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; - sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; - name = "kholidays-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; + sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; + name = "kholidays-5.112.0.tar.xz"; }; }; khtml = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; - sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; - name = "khtml-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; + sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; + name = "khtml-5.112.0.tar.xz"; }; }; ki18n = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; - sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; - name = "ki18n-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; + sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; + name = "ki18n-5.112.0.tar.xz"; }; }; kiconthemes = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; - sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; - name = "kiconthemes-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; + sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; + name = "kiconthemes-5.112.0.tar.xz"; }; }; kidletime = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; - sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; - name = "kidletime-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; + sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; + name = "kidletime-5.112.0.tar.xz"; }; }; kimageformats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; - sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; - name = "kimageformats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; + sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; + name = "kimageformats-5.112.0.tar.xz"; }; }; kinit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; - sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; - name = "kinit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; + sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; + name = "kinit-5.112.0.tar.xz"; }; }; kio = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; - sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; - name = "kio-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; + sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; + name = "kio-5.112.0.tar.xz"; }; }; kirigami2 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; - sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; - name = "kirigami2-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; + sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; + name = "kirigami2-5.112.0.tar.xz"; }; }; kitemmodels = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; - sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; - name = "kitemmodels-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; + sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; + name = "kitemmodels-5.112.0.tar.xz"; }; }; kitemviews = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; - sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; - name = "kitemviews-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; + sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; + name = "kitemviews-5.112.0.tar.xz"; }; }; kjobwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; - sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; - name = "kjobwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; + sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; + name = "kjobwidgets-5.112.0.tar.xz"; }; }; kjs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; - sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; - name = "kjs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; + sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; + name = "kjs-5.112.0.tar.xz"; }; }; kjsembed = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; - sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; - name = "kjsembed-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; + sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; + name = "kjsembed-5.112.0.tar.xz"; }; }; kmediaplayer = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; - sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; - name = "kmediaplayer-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; + sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; + name = "kmediaplayer-5.112.0.tar.xz"; }; }; knewstuff = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; - sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; - name = "knewstuff-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; + sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; + name = "knewstuff-5.112.0.tar.xz"; }; }; knotifications = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; - sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; - name = "knotifications-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; + sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; + name = "knotifications-5.112.0.tar.xz"; }; }; knotifyconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; - sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; - name = "knotifyconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; + sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; + name = "knotifyconfig-5.112.0.tar.xz"; }; }; kpackage = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; - sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; - name = "kpackage-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; + sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; + name = "kpackage-5.112.0.tar.xz"; }; }; kparts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; - sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; - name = "kparts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; + sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; + name = "kparts-5.112.0.tar.xz"; }; }; kpeople = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; - sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; - name = "kpeople-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; + sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; + name = "kpeople-5.112.0.tar.xz"; }; }; kplotting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; - sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; - name = "kplotting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; + sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; + name = "kplotting-5.112.0.tar.xz"; }; }; kpty = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; - sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; - name = "kpty-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; + sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; + name = "kpty-5.112.0.tar.xz"; }; }; kquickcharts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; - sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; - name = "kquickcharts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; + sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; + name = "kquickcharts-5.112.0.tar.xz"; }; }; kross = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; - sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; - name = "kross-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; + sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; + name = "kross-5.112.0.tar.xz"; }; }; krunner = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; - sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; - name = "krunner-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; + sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; + name = "krunner-5.112.0.tar.xz"; }; }; kservice = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; - sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; - name = "kservice-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; + sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; + name = "kservice-5.112.0.tar.xz"; }; }; ktexteditor = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; - sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; - name = "ktexteditor-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; + sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; + name = "ktexteditor-5.112.0.tar.xz"; }; }; ktextwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; - sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; - name = "ktextwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; + sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; + name = "ktextwidgets-5.112.0.tar.xz"; }; }; kunitconversion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; - sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; - name = "kunitconversion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; + sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; + name = "kunitconversion-5.112.0.tar.xz"; }; }; kwallet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; - sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; - name = "kwallet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; + sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; + name = "kwallet-5.112.0.tar.xz"; }; }; kwayland = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; - sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; - name = "kwayland-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; + sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; + name = "kwayland-5.112.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; - sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; - name = "kwidgetsaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; + sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; + name = "kwidgetsaddons-5.112.0.tar.xz"; }; }; kwindowsystem = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; - sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; - name = "kwindowsystem-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; + sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; + name = "kwindowsystem-5.112.0.tar.xz"; }; }; kxmlgui = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; - sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; - name = "kxmlgui-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; + sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; + name = "kxmlgui-5.112.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; - sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; - name = "kxmlrpcclient-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; + sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; + name = "kxmlrpcclient-5.112.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; - sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; - name = "modemmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; + sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; + name = "modemmanager-qt-5.112.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; - sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; - name = "networkmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; + sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; + name = "networkmanager-qt-5.112.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; - sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; - name = "oxygen-icons5-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; + sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; + name = "oxygen-icons5-5.112.0.tar.xz"; }; }; plasma-framework = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; - sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; - name = "plasma-framework-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; + sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; + name = "plasma-framework-5.112.0.tar.xz"; }; }; prison = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; - sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; - name = "prison-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; + sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; + name = "prison-5.112.0.tar.xz"; }; }; purpose = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; - sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; - name = "purpose-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; + sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; + name = "purpose-5.112.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; - sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; - name = "qqc2-desktop-style-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/qqc2-desktop-style-5.112.0.tar.xz"; + sha256 = "1k74vwj07xf3fjfj8ff9zx5ndzq5m3bdnj4zgymkxm1gk3r6gl5y"; + name = "qqc2-desktop-style-5.112.0.tar.xz"; }; }; solid = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; - sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; - name = "solid-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; + sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; + name = "solid-5.112.0.tar.xz"; }; }; sonnet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; - sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; - name = "sonnet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; + sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; + name = "sonnet-5.112.0.tar.xz"; }; }; syndication = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; - sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; - name = "syndication-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; + sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; + name = "syndication-5.112.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; - sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; - name = "syntax-highlighting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; + sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; + name = "syntax-highlighting-5.112.0.tar.xz"; }; }; threadweaver = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; - sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; - name = "threadweaver-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; + sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; + name = "threadweaver-5.112.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index a569b59621e0e..828a6891e293c 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation { "--${if withX then "with" else "without"}-x" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6be0370a17736..30d3c0d81b55e 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableButteraugli ? true, libjxl , enableVmaf ? true, libvmaf +, gitUpdater }: let @@ -8,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.6.1"; + version = "3.7.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; + hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; stripRoot = false; }; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ - "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" + "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix @@ -64,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; + passthru = { + updateScript = gitUpdater { + url = "https://aomedia.googlesource.com/aom"; + rev-prefix = "v"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + }; + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb1fb..3b24089e53c63 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 937937ae82602..ce570b76bc082 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index a502bc0d79620..076eccb1c26ef 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchgit +, fetchpatch , lib , meson , ninja @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 + name = "libcamera-sphinx7.0-compat.patch"; + url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; + hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; + }) + ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index fff5f705d7ce5..efb17eeaf3158 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmocka @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Pull fix pending upstream inclusion to support + # `CMAKE_INSTALL_INCLUDEDIR`: + # https://github.com/PJK/libcbor/pull/297 + (fetchpatch { + name = "includedir.patch"; + url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; + hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 5daca729bc738..2fb83097c02af 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -69,7 +69,7 @@ let platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z"; platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j"; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 142e329fd09e5..52da371999194 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcmis"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tdf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E2A4uJUayqMMxVifzeAeYKLL+FiV2vShNNdXe5ZLXZ4="; + sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; }; nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 6494f16a876cb..3bbf449d89aaf 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-dWSDAYn36GDtkghmouGhHzxpa6EVwCslIPqejlLMZNM="; + sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 80f4eb3346f80..26a8f6666460c 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" dependencies = [ "concurrent-queue", - "event-listener 3.0.0", + "event-listener 3.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -224,11 +224,11 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936c1b580be4373b48c9c687e0c79285441664398354df28d0860087cac0c069" +checksum = "2e542b1682eba6b85a721daef0c58e79319ffd0c678565c07ac57c8071c548b5" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.0", "base64 0.21.5", "bytes", "chrono", @@ -290,7 +290,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -512,9 +512,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -707,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstyle", "clap_lex", @@ -824,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -983,13 +983,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1087,11 +1087,11 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.128.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.0.0", + "async-channel 2.1.0", "async-imap", "async-native-tls", "async-smtp", @@ -1165,10 +1165,10 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", - "async-channel 2.0.0", + "async-channel 2.1.0", "axum", "base64 0.21.5", "deltachat", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.128.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1224,12 +1224,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "deltachat_ffi" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1433,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1461,9 +1461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" @@ -1613,6 +1613,12 @@ dependencies = [ ] [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "encoded-words" version = "0.2.0" source = "git+https://github.com/async-email/encoded-words?branch=master#d55366b36f96e383f39c432aedce42ee8b43f796" @@ -1720,7 +1726,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1733,14 +1739,14 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[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", @@ -1757,9 +1763,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ "libc", "windows-sys", @@ -1792,9 +1798,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" dependencies = [ "concurrent-queue", "parking", @@ -1807,15 +1813,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" dependencies = [ - "event-listener 3.0.0", + "event-listener 3.0.1", "pin-project-lite", ] [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1864,9 +1870,9 @@ dependencies = [ [[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", ] @@ -1893,9 +1899,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "filetime" @@ -1968,9 +1974,9 @@ version = "1.0.0" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1983,9 +1989,9 @@ 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", "futures-sink", @@ -1993,15 +1999,15 @@ dependencies = [ [[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", @@ -2010,15 +2016,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1155db57329dca6d018b61e76b1488ce9a2e5e44028cac420a5898f4fcef63" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ "fastrand", "futures-core", @@ -2026,37 +2032,36 @@ dependencies = [ "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[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.38", + "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-channel", "futures-core", @@ -2094,9 +2099,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", @@ -2296,9 +2301,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" dependencies = [ "bytes", "fnv", @@ -2330,9 +2335,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2" +checksum = "7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d" dependencies = [ "backtrace", "os_info", @@ -2460,9 +2465,9 @@ dependencies = [ [[package]] name = "imap-proto" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b1b63179418b20aa81002d616c5f21b4ba257da9bca6989ea64dc573933e0" +checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" dependencies = [ "nom", ] @@ -2479,9 +2484,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2591,9 +2596,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2651,9 +2656,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" @@ -2662,10 +2667,21 @@ 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.1", + "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", "openssl-sys", @@ -2681,9 +2697,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -2818,7 +2834,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -2974,7 +2990,7 @@ checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3067,9 +3083,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3088,7 +3104,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3108,9 +3124,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3206,13 +3222,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 0.4.1", "smallvec", "windows-targets", ] @@ -3296,7 +3312,7 @@ dependencies = [ "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.2", + "rsa 0.9.3", "sha1", "sha2 0.10.8", "sha3", @@ -3325,7 +3341,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3391,9 +3407,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "plotters" @@ -3444,12 +3460,13 @@ checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postcard" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", "const_format", + "embedded-io", "postcard-derive", "serde", ] @@ -3499,9 +3516,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" dependencies = [ "elliptic-curve 0.13.6", ] @@ -3541,9 +3558,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bitflags 2.4.1", "lazy_static", @@ -3551,7 +3568,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "unarray", ] @@ -3614,9 +3631,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", @@ -3727,7 +3744,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.11", ] [[package]] @@ -3786,30 +3803,30 @@ dependencies = [ [[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 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.11", + "libredox", "thiserror", ] @@ -3853,12 +3870,6 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" @@ -3954,7 +3965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -3993,16 +4004,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", @@ -4015,9 +4024,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ "bitflags 2.4.1", "fallible-iterator", @@ -4065,9 +4074,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.1", "errno", @@ -4101,9 +4110,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -4189,9 +4198,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4201,9 +4210,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4280,9 +4289,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" @@ -4295,9 +4304,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -4322,13 +4331,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4344,9 +4353,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4495,9 +4504,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smawk" @@ -4629,7 +4638,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4651,9 +4660,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4721,13 +4730,13 @@ checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] @@ -4783,7 +4792,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4863,9 +4872,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -4892,13 +4901,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4980,9 +4989,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -5001,11 +5010,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -5060,7 +5069,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5268,7 +5277,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -5291,12 +5300,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" @@ -5335,9 +5338,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5345,24 +5348,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -5372,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5382,28 +5385,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -5582,9 +5585,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -5691,22 +5694,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.15" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.15" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5726,5 +5729,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 092a235d9fd7e..f7aab70d42e6e 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.128.0"; + version = "1.131.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw="; + hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; }; patches = [ @@ -70,6 +70,14 @@ in stdenv.mkDerivation rec { cargoCheckHook ]; + # Sometimes -fmacro-prefix-map= can redirect __FILE__ to non-existent + # paths. This breaks packages like `python3.pkgs.deltachat`. We embed + # absolute path to headers by expanding `__FILE__`. + postInstall = '' + substituteInPlace $out/include/deltachat.h \ + --replace __FILE__ '"${placeholder "out"}/include/deltachat.h"' + ''; + passthru = { inherit cargoLock; tests = { diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index cf1a9a561f375..c70a217f6fce3 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -5,9 +5,7 @@ , rust , stdenv }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in + rustPlatform.buildRustPackage rec { pname = "libdovi"; version = "3.1.2"; @@ -28,19 +26,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 31b284861d1b9..63a8522bd073c 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, gitUpdater }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.116"; + version = "2.4.117"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RsU/QHNeo9JtYUKX8VX2ExpRBiSiQnT2VPZGnKkFM5o="; + hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; }; outputs = [ "out" "dev" "bin" ]; @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { "-Detnaviv=disabled" ]; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/mesa/drm.git"; + rev-prefix = "libdrm-"; + # Skip versions like libdrm-2_0_2 that happen to go last when + # sorted. + ignoredVersions = "_"; + }; + }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; downloadPage = "https://dri.freedesktop.org/libdrm/"; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 9755d0977c85f..a2822eae8d547 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,30 +1,51 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, intltool +, gtk-doc +, glib +, avahi +, gnutls +, libuuid +, libsoup +, gtk3 +, gnome +}: -let - avahiWithGtk = avahi.override { gtk3Support = true; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepc"; version = "0.4.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; + patches = [ + # Remove dependency that is only needed by uninstalled examples. + ./no-avahi-ui.patch + ]; + nativeBuildInputs = [ + autoreconfHook + gnome.gnome-common pkg-config intltool gtk-doc ]; + buildInputs = [ glib libuuid gtk3 ]; + propagatedBuildInputs = [ - avahiWithGtk + avahi gnutls libsoup ]; @@ -33,7 +54,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libepc"; versionPolicy = "odd-unstable"; }; }; @@ -45,4 +66,4 @@ in stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/development/libraries/libepc/no-avahi-ui.patch new file mode 100644 index 0000000000000..4649ecbe27ce8 --- /dev/null +++ b/pkgs/development/libraries/libepc/no-avahi-ui.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index acf0d25..13022d1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ + examples/lookup-resource \ + examples/service-browser \ + examples/simple-publisher \ +- examples/consumer-ui \ +- examples/publisher-ui \ + examples/server-credentials \ + $(TESTS) + TESTS = \ +@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) + examples_simple_publisher_CFLAGS = $(example_epc_cflags) + examples_simple_publisher_LDADD = $(example_epc_libs) + +-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) + examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) + examples_server_credentials_LDADD = $(example_epc_ui_libs) + +diff --git a/configure.ac b/configure.ac +index d68bf94..89bd471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], + GIO=$GIO_REQUIREMENT], + [AC_MSG_RESULT([no])]) + +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) + PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 + avahi-glib >= 0.6 + glib-2.0 >= 2.36 diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 6c7b559142967..cd98e2229fe23 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + '' + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) + + lib.optionalString stdenv.isDarwin '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; @@ -55,15 +64,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; - # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - preCheck = lib.optionalString stdenv.isDarwin '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 681f9cbfb2297..5bfa335314fe8 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" - - # Causes issues in downstream packages which misuse ffi_closure_alloc - # Reenable once these issues are fixed and merged: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 - "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix new file mode 100644 index 0000000000000..3e7253a40175a --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix @@ -0,0 +1,53 @@ +{ stdenvNoCC +, lib +, fetchzip +, libfprint-tod +, openssl +, gusb +, glib +, autoPatchelfHook +}: + +stdenvNoCC.mkDerivation { + pname = "libfprint-2-tod1-elan"; + version = "0.0.8"; + + src = fetchzip { + url = "https://download.lenovo.com/pccbbs/mobiles/r1slf01w.zip"; + hash = "sha256-GD/BebPto1fFLgyvpiitt+ngwEtdsnKsvdFNeSmVDmw="; + # .so is in a subzip + postFetch = '' + unpackFile $out/* + rm $out/*.zip + mv * $out/ + ''; + }; + + nativeBuildInputs = [ autoPatchelfHook]; + + buildInputs = [ + libfprint-tod + openssl + gusb + glib + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 libfprint-2-tod1-elan.so -t "$out/lib/libfprint-2/tod-1/" + + runHook postInstall + ''; + + passthru.driverPath = "/lib/libfprint-2/tod-1"; + + meta = with lib; { + description = "Elan(04f3:0c4b) driver module for libfprint-2-tod Touch OEM Driver"; + homepage = "https://support.lenovo.com/us/en/downloads/ds560939-elan-fingerprint-driver-for-ubuntu-2204-thinkpad-e14-gen-4-e15-gen-4"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ qdlmcfresh ]; + }; +} diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index fa9562947f815..b7ccb7085fb20 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; + sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.unix; + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix index a5f1c2576b9f4..03166a423c3a5 100644 --- a/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk4 , libgee , gettext @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe656f..edfd21a469689 100644 --- a/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk3 , libgee , gettext @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index ff83b1835b500..0f7859be9dbb4 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" "MANDIR=$(man)/share/man" + ] ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [ + # The ARCH logic defaults to querying `uname`, which will return build platform arch + "ARCH=${stdenv.hostPlatform.uname.processor}" ]; # Default target builds tests as well, and the tests want a static diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 35ffc46ec618d..243c26af8e58d 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.16"; + version = "3.0.17"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-3D/0leI3LLKDFOXkKSrmMamLoaXdi/2Z4iPUXqgwtg8="; + sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; }; strictDeps = true; @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; + changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index 8823a070b81bd..fdad112994ac6 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -76,16 +76,6 @@ dependencies = [ ] [[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" @@ -135,9 +125,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", @@ -153,18 +143,11 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" dependencies = [ "arrayvec", "lodepng", - "num_cpus", "once_cell", "rayon", "rgb", @@ -173,7 +156,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.2" +version = "4.0.3" dependencies = [ "bitflags", "imagequant", @@ -182,15 +165,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -218,16 +201,6 @@ dependencies = [ ] [[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 = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,9 +208,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -245,14 +218,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 5792170b9f094..f60a1c7cab7a6 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; + hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; }; cargoLock = { @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 72fb19fd5ab94..d10020fa992dc 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-0+NVGxujFOJvxX+Tk4mVYsk2Nl7WK6hjl0oylrT6PXU="; + sha256 = "sha256-C34hcea0htc9ayytjqy/t08yA2xMC18sAkDc9PK/Hhc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 806a9729c574c..826593b9d66c6 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; }; + postPatch = '' + substituteInPlace lib/socket.c \ + --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + ''; + nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 1f0709af6cfc1..175b48f109348 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub }: @@ -6,6 +7,8 @@ stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2019-08-01"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "xnd-project"; repo = "ndtypes"; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 4f9d7d09caaad..59e16071ce714 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w="; + sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 8618986195e82..0598fd6451ef5 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic +, windows }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { version = "4.13.0"; pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; + # Don't install libpfm.so on windows as it doesn't exist + # This target is created only if `ifeq ($(SYS),Linux)` passes + patches = [ ./fix-windows.patch ]; + + # Upstream uses "WINDOWS" instead of "Windows" which is incorrect + # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 + postPatch = '' + substituteInPlace config.mk examples/Makefile \ + --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" @@ -19,6 +33,9 @@ stdenv.mkDerivation (rec { ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; + + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; @@ -29,11 +46,7 @@ stdenv.mkDerivation (rec { (PMU) of modern processors. ''; license = licenses.gpl2; - maintainers = [ maintainers.pierron ]; - platforms = platforms.linux; + maintainers = with maintainers; [ pierron t4ccer ]; + platforms = platforms.linux ++ platforms.windows; }; -} // lib.optionalAttrs ( ! enableShared ) -{ - CONFIG_PFMLIB_SHARED = "n"; -} -) +}) diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/development/libraries/libpfm/fix-windows.patch new file mode 100644 index 0000000000000..584b9ba6eb816 --- /dev/null +++ b/pkgs/development/libraries/libpfm/fix-windows.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Makefile b/lib/Makefile +index 5ca71e3..cd0717f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -428,11 +428,13 @@ install: + -mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) + ifeq ($(CONFIG_PFMLIB_SHARED),y) ++ifeq ($(SYS),Linux) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) + -$(LDCONFIG) + endif ++endif + + tags: + $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 4a17bd951aa84..afae47c96d3d7 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -4,7 +4,6 @@ , extra-cmake-modules , qtbase , qtmultimedia -, qtquick1 , qttools , libGL , libX11 @@ -25,7 +24,6 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia - qtquick1 libGL libX11 libass diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index a9dc9f349ffff..613f7d3a2b347 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -100,4 +100,9 @@ in { version = "3.7.3"; hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; + + libressl_3_8 = generic { + version = "3.8.2"; + hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a0843d4b2ef7a..7ba6f1963e717 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,6 @@ , libobjc , rustPlatform , rustc -, rust , cargo-auditable-cargo-wrapper , gi-docgen , python3Packages @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix index 690417c3e730b..5d768db366df0 100644 --- a/pkgs/development/libraries/librttopo/default.nix +++ b/pkgs/development/libraries/librttopo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "RT Topology Library"; homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 75fc2afbf1877..e9547cc2af930 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; + patches = [ + # Fixes building libshout with clang. Can be dropped once the following MR is merged: + # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; + hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; + }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; + hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b4eeed32d5967..b3a00d89a5d53 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch; + patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; - hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; # FIXME: the hardeingDisable attr above does not seems effective, so # the need to disable stackprotector via configureFlags - configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; + configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp"; doCheck = true; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 455d42c3bb45c..16c98abf44173 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; license = licenses.mit; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 372f0c479c81c..b8d1fe45e44ee 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/libtiff/4.5.nix b/pkgs/development/libraries/libtiff/4.5.nix new file mode 100644 index 0000000000000..3b24c6f1a2e1d --- /dev/null +++ b/pkgs/development/libraries/libtiff/4.5.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libtiff"; + version = "4.5.1"; + + src = fetchFromGitLab { + owner = "libtiff"; + repo = "libtiff"; + rev = "v${version}"; + hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + }; + + patches = [ + # cf. https://bugzilla.redhat.com/2224974 + (fetchpatch { + name = "CVE-2023-40745.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; + hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; + }) + # cf. https://bugzilla.redhat.com/2224971 + (fetchpatch { + name = "CVE-2023-41175.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; + hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; + }) + # FreeImage needs this patch + ./headers-4.5.patch + # libc++abi 11 has an `#include <version>`, this picks up files name + # `version` in the project's include paths + ./rename-version-4.5.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + # XXX not enabled for now to keep hydra builds running, + # but we have to keep an eye on security updates in supported version + #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4fc6449230dcf..22b0f8af20437 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,16 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; + + # if you update this, please consider adding patches and/or + # setting `knownVulnerabilities` in libtiff `4.5.nix` src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/pkgs/development/libraries/libtiff/headers-4.5.patch b/pkgs/development/libraries/libtiff/headers-4.5.patch new file mode 100644 index 0000000000000..49af1abb0a54a --- /dev/null +++ b/pkgs/development/libraries/libtiff/headers-4.5.patch @@ -0,0 +1,16 @@ +export private headers for freeimage +--- i/libtiff/Makefile.am ++++ w/libtiff/Makefile.am +@@ -36,8 +36,12 @@ EXTRA_DIST = \ + tiffconf.h.cmake.in + + libtiffinclude_HEADERS = \ ++ tif_config.h \ ++ tif_dir.h \ ++ tif_hash_set.h \ + tiff.h \ + tiffio.h \ ++ tiffiop.h \ + tiffvers.h + + if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e0ef9f3478a6e..933e06f32326e 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -1,9 +1,8 @@ -diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am -index 44522b62..d66e5948 100644 +export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/pkgs/development/libraries/libtiff/rename-version-4.5.patch new file mode 100644 index 0000000000000..3e93569d4245a --- /dev/null +++ b/pkgs/development/libraries/libtiff/rename-version-4.5.patch @@ -0,0 +1,21 @@ +fix case-insensitive build +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ docfiles = \ + README.md \ + RELEASE-DATE \ + TODO \ +- VERSION ++ VERSION.txt + + EXTRA_DIST = \ + cmake \ +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) ++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index ddd33ad490454..04fa1bfc88c72 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -1,3 +1,4 @@ +fix case-insensitive build --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ docfiles = \ @@ -6,15 +7,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 5779389dda1bb..a42aab3d59e8c 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,25 +1,15 @@ -{ lib, stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; + sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; }; - patches = [ - # Pull upstream fix for parallel build failures: - # https://github.com/axboe/liburing/pull/891 - (fetchpatch { - name = "parallel.patch"; - url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; - hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 326ee30281582..1f768a2cb261f 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , fetchpatch , autoreconfHook , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic +, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix index 1982311919ba6..090683898a16d 100644 --- a/pkgs/development/libraries/libusbsio/default.nix +++ b/pkgs/development/libraries/libusbsio/default.nix @@ -1,7 +1,13 @@ -{ lib, stdenv, fetchzip, pkg-config, libusb1, systemdMinimal }: -let - binDirPrefix = if stdenv.isDarwin then "osx_" else "linux_"; -in +{ lib +, stdenv +, fetchzip +, pkg-config +, fixDarwinDylibNames +, libusb1 +, systemdMinimal +, darwin +}: + stdenv.mkDerivation rec { pname = "libusbsio"; version = "2.1.11"; @@ -15,15 +21,30 @@ stdenv.mkDerivation rec { rm -r bin/* ''; - nativeBuildInputs = [ pkg-config ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "BINDIR=" + ]; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + buildInputs = [ libusb1 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + CoreFoundation + IOKit + ]) ++ lib.optionals stdenv.isLinux [ systemdMinimal # libudev ]; installPhase = '' runHook preInstall - install -D bin/${binDirPrefix}${stdenv.hostPlatform.parsed.cpu.name}/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} + install -D bin/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} runHook postInstall ''; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 250b09ecee5d0..d8b7cbdab5219 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , libtool @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; + patches = [ + # Disable io_uring close on selected kernels. Remove on next release + # https://github.com/libuv/libuv/pull/4141 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; + hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; + }) + ]; + outputs = [ "out" "dev" ]; postPatch = let @@ -115,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7796ec251582b..43fe69af2b0e2 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; + sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c36e3116dad64..4c3740e4ba7c2 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -155,16 +155,12 @@ stdenv.mkDerivation rec { src/storage/storage_backend_disk.c \ src/storage/storage_util.c '' + lib.optionalString isDarwin '' - sed -i '/qemucapabilitiestest/d' tests/meson.build - sed -i '/vircryptotest/d' tests/meson.build - sed -i '/domaincapstest/d' tests/meson.build + # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O. + # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235 + sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build - '' + lib.optionalString (isDarwin && isx86_64) '' - sed -i '/qemucaps2xmltest/d' tests/meson.build - sed -i '/qemuhotplugtest/d' tests/meson.build - sed -i '/virnetdaemontest/d' tests/meson.build ''; strictDeps = true; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 27ce41d20f623..0e92d28046aa3 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-ketQiAafTm7atp4UxCEvbaAZLmVpWVbcBIAWoNq4vPY="; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index c03dd99a125b6..254769349b15d 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.7.0"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; + hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; }; postPatch = '' diff --git a/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch b/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch new file mode 100644 index 0000000000000..eab2bda7b9caf --- /dev/null +++ b/pkgs/development/libraries/luabind/0.9.1-discover-luajit.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/Modules/FindLua52.cmake b/cmake/Modules/FindLua52.cmake +index f4398e4..17377c0 100644 +--- a/cmake/Modules/FindLua52.cmake ++++ b/cmake/Modules/FindLua52.cmake +@@ -61,7 +61,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h + ) + + FIND_LIBRARY(_LUA_LIBRARY_RELEASE +- NAMES lua52 lua5.2 lua-5.2 lua ++ NAMES lua52 lua5.2 lua-5.2 lua luajit-5.1 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib +@@ -75,7 +75,7 @@ FIND_LIBRARY(_LUA_LIBRARY_RELEASE + ) + + FIND_LIBRARY(_LUA_LIBRARY_DEBUG +- NAMES lua52-d lua5.2-d lua-5.2-d lua-d ++ NAMES lua52-d lua5.2-d lua-5.2-d lua-d luajit-5.1-d + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 069e13ddde117..f7f0878bdffae 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { inherit lua; }; + patches = [./0.9.1-discover-luajit.patch]; + meta = { - homepage = "https://github.com/luabind/luabind"; + homepage = "https://github.com/Oberon00/luabind"; description = "A library that helps you create bindings between C++ and Lua"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index f2eb234232517..8bb245342ca54 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ea0059e34b612..173cc2016e5db 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages_15, libffi, libomxil-bellagio, libva-minimal +, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang @@ -64,10 +64,8 @@ , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true -, libclc , jdupes , rustc -, rust-bindgen , spirv-llvm-translator , zstd , directx-headers @@ -95,13 +93,13 @@ let withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; # Align all the Mesa versions used. Required to prevent explosions when # two different LLVMs are loaded in the same process. # FIXME: these should really go into some sort of versioned LLVM package set - rust-bindgen' = rust-bindgen.override { - rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { - clang = llvmPackages.clang; + rust-bindgen' = buildPackages.rust-bindgen.override { + rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override { + clang = buildPackages.llvmPackages_15.clang; }; }; spirv-llvm-translator' = spirv-llvm-translator.override { @@ -202,7 +200,8 @@ self = stdenv.mkDerivation { "-Dglvnd=true" # Enable RT for Intel hardware - "-Dintel-clc=enabled" + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 + (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -218,26 +217,29 @@ self = stdenv.mkDerivation { ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ - expat llvmPackages.libllvm libglvnd xorgproto + expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ zstd libunwind + python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] + ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader ++ lib.optional haveDozen directx-headers; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ pkg-config ] + ++ lib.optional enableOpenCL buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optional haveWayland wayland-scanner; + ] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ] + ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm @@ -320,6 +322,9 @@ self = stdenv.mkDerivation { fi done + # Don't depend on build python + patchShebangs --host --update $out/bin/* + # NAR doesn't support hard links, so convert them to symlinks to save space. jdupes --hard-links --link-soft --recurse "$drivers" diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix index f0bd76ab4fba9..298aec48db753 100644 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gtest ]; + # error: unsafe buffer access + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index 2df349b83dcc6..76b77227130b0 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.18"; + version = "0.11.20"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-y0o33hnKoZ8gWWFNFIOUJcXMWENaYzMLZzeTOoVETOY="; + hash = "sha256-qIUqHLHTHFMtZU0GMZp5iWnoBJ/+Zv3tbLopSHolB4s="; }; installPhase = '' diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 2606edc760988..bfb7cd26fbb26 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw="; + hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5619fe7039e6f..74493a06b526c 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: stdenv.mkDerivation { pname = "minizip"; inherit (zlib) src version; + patches = [ + (fetchpatch { + name = "CVE-2023-45853.patch"; + url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch"; + hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM="; + }) + ]; + + patchFlags = [ "-p3" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dcba45f41c3dd..13816faefce9a 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 45b0abdee71b9..89665f2efc9af 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib - mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/ + mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ mkdir -p $out/include mv *.h $out/include/ diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/development/libraries/ncnn/cmakelists.patch index 30f39a7a3f501..bdb3063acec4e 100644 --- a/pkgs/development/libraries/ncnn/cmakelists.patch +++ b/pkgs/development/libraries/ncnn/cmakelists.patch @@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c453d23e..66b4aa24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -478,6 +478,8 @@ if(NCNN_VULKAN) - - find_package(Threads) - -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") +@@ -560,6 +560,8 @@ if(NCNN_VULKAN) + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") + set(NCNN_SYSTEM_GLSLANG OFF) + else() ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in index b580fcee..be2becd0 100644 --- a/src/ncnn.pc.in diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 0b07fab8668cf..69967eae160d2 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220729"; + version = "20231027"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; }; patches = [ @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tencent/ncnn"; license = licenses.bsd3; maintainers = with maintainers; [ tilcreator ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cb8333704ff12..9c1c8b422a98a 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, ncurses , pkg-config , abiVersion ? "6" , enableStatic ? stdenv.hostPlatform.isStatic @@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { "/usr/share/terminfo" # upstream default, probably all FHS-based distros "/run/current-system/sw/share/terminfo" # NixOS ]}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ncurses + # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. + ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 9335bec35ce87..8fa37141628cc 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "TUNE=${ if tune then "auto" - else if stdenv.targetPlatform.isx86 then + else if stdenv.hostPlatform.isx86 then "x86" # "chooses options that should be well suited for most x86 platforms" else "generic" # "chooses options that should be OK for most platforms" diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix index d6d0f1741d179..6002ea4646738 100644 --- a/pkgs/development/libraries/omorfi/default.nix +++ b/pkgs/development/libraries/omorfi/default.nix @@ -3,6 +3,7 @@ , autoreconfHook , cg3 , fetchFromGitHub +, fetchpatch , hfst , hfst-ospell , icu @@ -24,6 +25,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; }; + patches = [ + # allow building with python311. + # patch is incorporated upstream and should be removed on the next update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/flammie/omorfi/commit/9736452ae6624060dbea0876a722c3731e776357.patch"; + hash = "sha256-Q4fi5HMmO0fq8YI833vgv2EYp//9Um/xFoRk28WrUMk="; + }) + ]; + # Fix for omorfi-hyphenate.sh file not found error postInstall = '' ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index e6bf2a4c54966..2518cecb9b6c6 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-dC4Z1OvqIF8YhuSeVo+E0CohdXYIfkeTEw3/QuYA/90="; + hash = "sha256-br2ssI4MRk9O6u+5voBmxBZtmTFPKoJJe3ZEN2blq7Y="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 3062c3cb4e11c..a1a9dc8757353 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.8"; + version = "6.9.9"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; + sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; }; outputs = [ "dev" "lib" "out" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4a9ee61f5614c..7a8b8570f62c7 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -17,7 +17,7 @@ , microsoft-gsl , iconv , gtest -, protobuf3_21 +, protobuf_21 , pythonSupport ? true }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3Packages.python - protobuf3_21 + protobuf_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -154,6 +154,13 @@ stdenv.mkDerivation rec { "-Donnxruntime_ENABLE_PYTHON=ON" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-but-set-variable" + ]; + }; + doCheck = true; postPatch = '' @@ -177,7 +184,7 @@ stdenv.mkDerivation rec { ''; passthru = { - protobuf = protobuf3_21; + protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 26b2715658bb9..38a50b75027bc 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "opencore-amr"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; meta = { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e65f7ce01da99..e3f458d0d7339 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -3,7 +3,7 @@ , fetchpatch , callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 01e96e8f5b4d1..06360449c1ba9 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -298,7 +298,7 @@ effectiveStdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 @@ -362,7 +362,7 @@ effectiveStdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index a5ce27e270e4f..826c7b2c854f3 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.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-cV+qgx3WzdotypgpZhVFxzdKAU2rNVw0KWSdkeN0gLk="; + hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index a908b4980dadb..dd6b0ce10c0b0 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -1,12 +1,17 @@ -{ stdenv, lib, fetchzip, cmake }: +{ stdenv +, lib +, fetchzip +, cmake +, gitUpdater +}: stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2"; + version = "1.4.2.9"; src = fetchzip { - url = "http://openfec.org/files/openfec_v1_4_2.tgz"; - sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA="; }; outputs = [ "out" "dev" ]; @@ -33,6 +38,11 @@ stdenv.mkDerivation rec { ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/roc-streaming/openfec.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Application-level Forward Erasure Correction codes"; homepage = "https://github.com/roc-streaming/openfec"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 50098de03ddf1..d528e2fc0302d 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2b0d778ef3d72..3aeafccb1edb2 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,14 +18,14 @@ # files. let - common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }: stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; inherit patches; @@ -219,9 +219,11 @@ let meta = with lib; { homepage = "https://www.openssl.org/"; + changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; + maintainers = with maintainers; [ thillux ]; pkgConfigModules = [ "libcrypto" "libssl" @@ -238,7 +240,7 @@ in { # and backport this to stable release (23.05). openssl_1_1 = common { version = "1.1.1w"; - sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; + hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -255,8 +257,32 @@ in { }; openssl_3 = common { - version = "3.0.11"; - sha256 = "sha256-s0JdO7SiIY0Gl+tB9/wM3t4BbtGcpJ0Wi3jo2UeIf1U="; + version = "3.0.12"; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./use-etc-ssl-certs-darwin.patch + else ./use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; + + openssl_3_1 = common { + version = "3.1.4"; + hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index 2016f7234e5a3..b08495cae74c3 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/pkgs/development/libraries/piper-phonemize/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build , cmake @@ -22,19 +23,23 @@ let }; patches = [ + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) ./espeak-mbrola.patch ]; }); in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "2023.11.6-1"; + version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; rev = "refs/tags/${version}"; - hash = "sha256-IRvuA03Z6r8Re/ocq2G/r28uwI9RU3xmmNI7S2G40rc="; + hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch deleted file mode 100644 index fab89c4ffd937..0000000000000 --- a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 99a4b2d1..d4a4cda7 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,7 @@ endif - - spa_plugindir = pipewire_libdir / spa_name - --alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' -+alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - - pipewire_headers_dir = pipewire_name / 'pipewire' - diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch deleted file mode 100644 index 230f1b30394a5..0000000000000 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 961ae2a76..692b84dfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -179,6 +179,9 @@ option('udev', - option('udevrulesdir', - type : 'string', - description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') -+option('pipewire_pulse_prefix', -+ type : 'string', -+ description: 'Install directory for the pipewire-pulse daemon') - option('systemd-system-unit-dir', - type : 'string', - description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') -diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index d17f3794f..34afe4f1a 100644 ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -9,7 +9,7 @@ install_data( - - systemd_config = configuration_data() - systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') --systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') -+systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') - - configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch deleted file mode 100644 index b8d8fcb0f9053..0000000000000 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index b6b4553b..f21c29d8 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') - pipewire_sysconfdir = prefix / get_option('sysconfdir') - - pipewire_configdir = pipewire_sysconfdir / 'pipewire' --pipewire_confdatadir = pipewire_datadir / 'pipewire' -+pipewire_confdatadir = get_option('pipewire_confdata_dir') -+if pipewire_confdatadir == '' -+ pipewire_confdatadir = pipewire_datadir / 'pipewire' -+endif - modules_install_dir = pipewire_libdir / pipewire_name - - if host_machine.system() == 'linux' -diff --git a/meson_options.txt b/meson_options.txt -index 9bc33fcd..e4bd2dc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -61,6 +61,9 @@ option('jack-devel', - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') -+option('pipewire_confdata_dir', -+ type: 'string', -+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') - option('spa-plugins', - description: 'Enable spa plugins integration', - type: 'feature', diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch deleted file mode 100644 index ca7d351257bf9..0000000000000 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 9c885a38f..c474eb45d 100644 ---- a/src/daemon/minimal.conf.in -+++ b/src/daemon/minimal.conf.in -@@ -111,7 +111,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -359,5 +359,5 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } - ] -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 697bf094d..3a7b54ddd 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -142,7 +142,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -294,7 +294,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" -+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" - @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } - # - # You can optionally start the pulseaudio-server here as well -@@ -302,6 +302,6 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" -+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" - @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } - ] diff --git a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch deleted file mode 100644 index d8241a809f65d..0000000000000 --- a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 56599ebd1..3bed2d3e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ else - endif - - spa_plugindir = pipewire_libdir / spa_name --spa_datadir = pipewire_datadir / spa_name -+spa_datadir = pipewire_libdir / spa_name - - alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1e66d1573fc56..3876a5c892a0e 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -70,6 +70,7 @@ , tinycompress , ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado +, libselinux }: # Bluetooth codec only makes sense if general bluetooth enabled @@ -80,12 +81,10 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.80"; + version = "0.3.84"; outputs = [ "out" - "lib" - "pulse" "jack" "dev" "doc" @@ -98,30 +97,14 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; + sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; }; patches = [ - # Break up a dependency cycle between outputs. - ./0040-alsa-profiles-use-libdir.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./0050-pipewire-pulse-path.patch # Load libjack from a known location ./0060-libjack-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add option for changing the config install directory - ./0080-pipewire-config-dir.patch - # Remove output paths from the comments in the config templates to break dependency cycles - ./0090-pipewire-config-template-paths.patch - # Place SPA data files in lib output to avoid dependency cycles - ./0095-spa-data-dir.patch - - # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; - hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; - }) ]; strictDeps = true; @@ -142,6 +125,7 @@ let glib libjack2 libusb1 + libselinux libsndfile lilv ncurses @@ -174,9 +158,7 @@ let "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" @@ -185,7 +167,6 @@ let "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" "-Dudev=${mesonEnableFeature (!enableSystemd)}" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" @@ -198,7 +179,6 @@ let "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" - "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" @@ -222,15 +202,6 @@ let ''; postInstall = '' - ${lib.optionalString enableSystemd '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - ''} - - rm $out/bin/pipewire-pulse - mkdir -p $pulse/bin - ln -sf $out/bin/pipewire $pulse/bin/pipewire-pulse - moveToOutput "bin/pw-jack" "$jack" ''; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index c9b456ba831ea..d49f3e6bd5382 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/PIP_Tree.cc \ + --replace "std::auto_ptr" "std::unique_ptr" + substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ + --replace "std::mem_fun_ref" "std::mem_fn" + ''; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/protobuf/21.nix b/pkgs/development/libraries/protobuf/21.nix new file mode 100644 index 0000000000000..09a8c81b3d134 --- /dev/null +++ b/pkgs/development/libraries/protobuf/21.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/pkgs/development/libraries/protobuf/23.nix b/pkgs/development/libraries/protobuf/23.nix new file mode 100644 index 0000000000000..abb2cc2f4460a --- /dev/null +++ b/pkgs/development/libraries/protobuf/23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix new file mode 100644 index 0000000000000..6741b8afe52e3 --- /dev/null +++ b/pkgs/development/libraries/protobuf/24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix deleted file mode 100644 index fe85be8cf022f..0000000000000 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.21.12"; - sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.23.nix b/pkgs/development/libraries/protobuf/3.23.nix deleted file mode 100644 index 2d658d57419ba..0000000000000 --- a/pkgs/development/libraries/protobuf/3.23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.23.4"; - sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix deleted file mode 100644 index 60ad747194df8..0000000000000 --- a/pkgs/development/libraries/protobuf/3.24.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.24.3"; - sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic.nix index dd31aba434cee..cf00d1d50bebb 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -11,7 +11,7 @@ , gtest , zlib , version -, sha256 +, hash # downstream dependencies , python3 @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -37,28 +37,24 @@ stdenv.mkDerivation (finalAttrs: { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ + patches = lib.optionals (lib.versionOlder version "22") [ # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute # https://github.com/protocolbuffers/protobuf/pull/10090 (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./static-executables-have-no-rpath.patch ]; - nativeBuildInputs = - let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in - [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest @@ -71,23 +67,25 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; cmakeFlags = [ "-Dprotobuf_USE_EXTERNAL_GTEST=ON" "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 + # Tests fail to build on 32-bit platforms; fixed in 22.x # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 3.24 and 3.23 have different errors. + # FIXME: investigate. 24.x and 23.x have different errors. # At least some of it is not reproduced on some other machine; example: # https://hydra.nixos.org/build/235677717/nixlog/4/tail - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23"); + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index a8aec285a98e5..8c98fdbdd6f10 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -4,7 +4,6 @@ , fetchpatch , qmake , qtbase -, qtquick1 , qtmultimedia , utmp }: @@ -26,7 +25,6 @@ stdenv.mkDerivation { buildInputs = [ qtbase - qtquick1 qtmultimedia ] ++ lib.optional stdenv.isDarwin utmp; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index df60188800ab8..a2b38046c5a83 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,6 +11,7 @@ Check for any minor version changes. , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf +, llvmPackages_15, overrideSDK, overrideLibcxx , darwin # options @@ -45,13 +46,29 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch - ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch ]; + qtlocation = lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16 + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/"; + hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; + }) + ]; + qtmultimedia = lib.optionals stdenv.isDarwin [ + # build patch for qtmultimedia with xcode 15 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; + stripLen = 1; + hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; + }) + ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs @@ -272,6 +289,18 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { + # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due + # to the following errors: + # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned + # to be made into a hard error in a future version of clang. Patches are not available for + # the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial. + # * -Wincompatible-function-pointer-types: This is also a downgradable error generated + # starting with clang 16. Patches are available upstream that can be backported. + # Because the first error is non-trivial to fix and suppressing it risks future breakage, + # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. + stdenv = + let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; + in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; postPatch = '' @@ -306,7 +335,7 @@ let qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules index d6ce8822d541d..ccc7dbcb8151a 100644 --- a/pkgs/development/libraries/qt-5/5.15/modules +++ b/pkgs/development/libraries/qt-5/5.15/modules @@ -21,7 +21,6 @@ qtquickcontrols qtquickcontrols2 qtquicktimeline qtremoteobjects -qtscript qtscxml qtsensors qtserialbus diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch deleted file mode 100644 index e1aa0119aa2f2..0000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) -Author: K900 <me@0upti.me> -Date: Mon Aug 14 22:44:02 2023 +0300 - - QLibraryPrivate: Actually merge load hints - - Or old and new load hints in mergeLoadHints() instead of just storing - new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects - with no file name differently and just set load hints directly. - - Mention that load hints are merged once the file name is set - in the documentation for QLibrary::setLoadHints(). - - Add a regression test into tst_qfactoryloader. - - Update and extend tst_QPluginLoader::loadHints() to take into account - load hints merging. - - Fixes: QTBUG-114480 - Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 - Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index 5d2f024267..45b5a3fe27 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) - if (pHnd.loadRelaxed()) - return; - -- loadHintsInt.storeRelaxed(lh); -+ loadHintsInt.fetchAndOrRelaxed(lh); - } - - QFunctionPointer QLibraryPrivate::resolve(const char *symbol) -@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) - - void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) - { -+ // Set the load hints directly for a dummy if this object is not associated -+ // with a file. Such object is not shared between multiple instances. -+ if (fileName.isEmpty()) { -+ loadHintsInt.storeRelaxed(lh); -+ return; -+ } -+ - // this locks a global mutex - QMutexLocker lock(&qt_library_mutex); - mergeLoadHints(lh); -@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const - lazy symbol resolution, and will not export external symbols for resolution - in other dynamically-loaded libraries. - -+ \note Hints can only be cleared when this object is not associated with a -+ file. Hints can only be added once the file name is set (\a hints will -+ be or'ed with the old hints). -+ - \note Setting this property after the library has been loaded has no effect - and loadHints() will not reflect those changes. - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 0a63b93762..ceee5d6385 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr -+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr - d->errorString.clear(); -+ } else { -+ d->setLoadHints(loadHints); - } -- d->setLoadHints(loadHints); - } - - QLibrary::LoadHints QPluginLoader::loadHints() const 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 f67f9d66da7ce..8171293497181 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897", - "sha256": "0r1bicsjn4addsf0cw2vkf26kxlf8z1fh65w19gnqmcwkrr8hnja" + "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", + "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "7a04a93e97390de2d91e89dc907e8240dd5a0c4f", - "sha256": "1bqy5cmimnlmgd02zpv0ipf74nx350fk0d4pm2j4pqipq1spq3bh" + "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", + "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1170e17043ff51590ccee30447bef1e43a999b0d", - "sha256": "0qhlhz7ng35mb5pmva9ivpxq1ib30dz8f1p93yil78cyl9mwqbbi" + "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", + "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "e24dc54b2b4054413650904288aa7a363eee23a7", - "sha256": "0gpg0avl06jbamgk5f9034cfqwyifgv4nyqx49rp0r9wm2m1cgxb" + "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", + "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7ce22b0633eb9d1eb59854fee4f2f545e1b842e0", - "sha256": "0q173ql5xyacwb5lwyrzhgch1bbjq4mmsfwhyssm3a9phqcj083m" + "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", + "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "eeaf42bccd49e8161fbae82d110026d25a5a9a7f", - "sha256": "0daa72yizb6v28bci72fw1w8y8al0mhb9k7kxn7vg22fbb3iyksf" + "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", + "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d366b0aad8454355acac79eddbab445c1108b1e9", - "sha256": "15ad1cbfdwnl6lnafgd4chdsl9wnwfcqqnd2m0dwj10n2lsa3nmw" + "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", + "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "3e98cdb2780d052fce3d7a3694596a690cd76aca", - "sha256": "15fn0zjfz7jnjgc7m368sna2mvhcp33r85r2kwc9hy7zkp1is6a1" + "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", + "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "9dfbbfb9971db22d51eb40d6636583df5913be01", - "sha256": "1l192k1w5mjw14zq3h3pjb3m0zl56fhgxdjfxhmbncjx0ym98wzr" + "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", + "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c", - "sha256": "1vbfmyb51lv3ms0iyizi05jiba688scjwxwvyrr8qnmg4qrjqjd5" + "rev": "4b52913503e3713200265cd6bc19b301792dbf96", + "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "500ae59f809877e0ada9a68601564882f2733145", - "sha256": "0p8vxp5l7iihd1xww94asnb9xv2v94p9whqbljzn6gwr56wvys5l" + "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", + "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "5aa33ec870977863c400103db94da452edbaf414", - "sha256": "02i3ns2ijiiy0jfad3lxrvvlr38bgarl8246ka0y8aa8by1ih35b" + "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", + "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "664701dc3acfca37500bc84ba03eed4953b684e9", - "sha256": "0nlzjksfzkjhla89warkj7c5h8z2h5ivnhnq1sw2385gfd4q5d8w" + "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", + "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "f65b6a268832fc86e1263a6597f2e369aefecd19", - "sha256": "157in9bvnd9q2jigrrl955y7d2gpj308g8mg7k19r1vaz6h4zlm7" + "rev": "909b79f4810b8ac62baa3544837793cfb132593b", + "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5", - "sha256": "1yrk7kj5dvfcha8w0abvh8xfjn6nbl4njm1r2h2776l3sf46xd4c" + "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", + "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "78d05cfcec57a9e890cb5ddbea604f194e04315d", - "sha256": "1vf0gmf6bh3hadrrk0922dbagmvxi1il3pjiyhmz087bm80km1md" + "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", + "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa", - "sha256": "0sy2s7xnq2xmqm3lcp439wn6zk6znzja489gh531mmkaj13kiqa9" + "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", + "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "a3e675872e4b323f89b94b90b66caa945b576b2e", - "sha256": "0b6da91fja6w3mphsfydp0plcwmk8nywhd5v8irgc98v1hw114dg" + "rev": "736144c5827385000e391e9a55a0f0162b7e8112", + "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "353f50a9851518eb637181c00302cd354e0ae98b", - "sha256": "1y269yamhlf46rwcvwzhdqhajyqj41xxf9x0l1nrcr4n07l4mbr8" + "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", + "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "0ea7cfdfbfa72d467fe542cc48ab3206c177a387", - "sha256": "1bvg32cz4x00j9333yas7cmfzx8rlhika4a9vwdikrr5a64awsl9" + "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", + "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "0472a07a8f39587052216d85a7ed235c531eba2c", - "sha256": "1psal4kldwbhfgg0b234dhgm30s5q83g2krcik1p4sifrzgrry3r" + "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", + "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "4956b556ccb021e4691f314ab907ea2ebb1ca8a6", - "sha256": "0d6w36pvnk616ps7k1ykpk2ahcvn746svwmv3dxvf4capfij96rj" + "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", + "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "d10e7673218fa2b00191a82ad20cd3304a711fa6", - "sha256": "0z5dzgdr92yw3y5vx6l9r9kz81r0vvwi264la9r7j20jqb75i2a5" - }, - "qtscript": { - "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1", - "sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b" + "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", + "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7f276be586be79d41213a8dd05ef31144313d440", - "sha256": "0yiryqzs44nx5lg54gbs7gf5n2d5chybya71kcv0iwn48dbzy33n" + "rev": "e8727aabe55526956295407d27317ec15e12b283", + "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "45c04582b15a9bb4be01ae99aa7fda1bbba7d0df", - "sha256": "0wp9ddna0zidl18707nrqsg8sybaggam0hmm9yxyyfnsr39wms4m" + "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", + "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "b3081c36baee48b43b6285b4811dc6da451e2390", - "sha256": "167bmp5wrp9mflvzhgc2am9nnyw1vb58skdxjn7ag8jq88fhv0zz" + "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", + "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "af58a4c62415fbfd997c43422acf93e2e6ab5155", - "sha256": "1ihjj7gqjy75ccf4qniilddyiknjklc88mxns6sy8wz3ymr58vfh" + "rev": "3380465d5d4977326616c5e57789a81681be650e", + "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "75142c77cda8ef3a5c1cae69863e963797c667b5", - "sha256": "0iaw13vx80yfcchkmrmp6n79i0i6b9rv7k69xxp3wb3l5d3n0ng0" + "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", + "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "37b2c764fb599c96fc415049208e871c729217c8", - "sha256": "11h0n9k6l4r97x6h1m09nzsblwmmkkj46nl80dnvjimb395d71ri" + "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", + "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "9f7af2d08eea7c2a2a2bfe7e6a9b73d1b99f5123", - "sha256": "1vb6s9zy8nw6gd0kmk77bjvxwpnfbhaifrznp019zccckibzffsg" + "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", + "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a680686754d84b91d4cc4252a2fb8af0c58f5f49", - "sha256": "1i92mk6f2ldwq12qa4wnlz52zya4nlpjm3r2vy95vkj69xi2bfk3" + "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", + "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "72373522141dd3206183eb5fa56ae1c36a6d4c2b", - "sha256": "1ndgy8jxn9f7dwg9kydhlbll20qdivfbvdlcxk8qpzilpccd2l3z" + "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", + "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "d4f650b6c29c621c58bc7b7e7c9ddcbbbc72e3b4", - "sha256": "11xqpj36mfyfhcip89i82dyclbkvs77byffax2kscv1kdj3x7w2l" + "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", + "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "74c0625337c8a8de0a465878c7e7d238e8d979ed", - "sha256": "0yz2sg8k3l88ngsgyfb6cljh8x5sicww59m447xk7yngxgyaj75m" + "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", + "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "13202e8a8c0c6d39026344b5a19a0148592160bc", - "sha256": "0gki7hc3684qhqbq7i4wa3w7szy3j6af0yfd50q2mxb1lbxjsdrx" + "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", + "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "89fbe461e7091ae6a4689b7791293a06c9167776", - "sha256": "15vkh80rma5l9mrmg41vhxvqxlzqjzl8x20k33xm11lw2kjsszm5" + "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", + "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "7e941648610ff4033ae8f9709077edd0595364f0", - "sha256": "082w4r674fq7ks5jbh3pj3xb3sqlhn4giy7fy0h3vw170lmcqz0m" + "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", + "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "5afc77f5347113b607ca0262505f3406e1be5bf4", - "sha256": "1a7dm0dxqq817pib1y6m0f09sc2cqd1qkfb9anznsgpmzynvfp6r" + "rev": "1bf19cc6a7972d8543485786418b6631459d3469", + "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "74f81f0bfe17e5aabcebafcb0cf36f739133554c", - "sha256": "1akp4mwvfspxdq5akpyphf6p3ay0z9pzaigiiy198w9q0yvrkgl7" + "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", + "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "0c1dcfe344c03d48d753aeb58f139bc990f2611c", - "sha256": "1cab7y9asivdg9ypwc951pczf4ddgni60l1ajlfsprk48rypr7w1" + "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", + "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 6729c7c31af3b..130fcd332ba4c 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,25 +1,18 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.10"; - overrides = { - qtscript.version = "5.15.9"; - }; + version = "5.15.11"; mk = name: args: - let - override = overrides.${name} or {}; - in { - version = override.version or version; - src = override.src or - fetchgit { - inherit (args) url rev sha256; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; + inherit version; + src = fetchgit { + inherit (args) url rev sha256; + fetchLFS = false; + fetchSubmodules = true; + deepClone = false; + leaveDotGit = false; + }; }; in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) @@ -76,15 +69,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; }; + qtscript = rec { + version = "5.15.15"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtscript"; + rev = "v${version}-lts"; + hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; + }; + }; + qtwebengine = rec { - version = "5.15.14"; + version = "5.15.15"; - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebengine"; - rev = "v${version}-lts"; - hash = "sha256-jIoNwRdr0bZ2p0UMp/KDQuwgNjhzzGlb91UGjQgT60Y="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebengine"; + rev = "v${version}-lts"; + hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + fetchSubmodules = true; }; + }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 58f90763a2452..3503067aca754 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -306,7 +306,6 @@ qtModule ({ isAarch64 (patternLogicalAnd isMips isLittleEndian) ]); - broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 4a211e5cb915f..bef3f7ef62e86 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -141,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index ddd402f3c2221..e07790edad6e1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,10 +1,10 @@ { qtModule , qtbase -, qtquick3d , qtdeclarative , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { @@ -12,4 +12,18 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix a freezing bug with fcitx5. + # https://codereview.qt-project.org/c/qt/qtwayland/+/517601 + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8"; + hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc="; + }) + # 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 8670fba6bb2a6..4b4172897e080 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -60,7 +60,6 @@ , mesa , enableProprietaryCodecs ? true # darwin -, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -106,7 +105,6 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages_14.clang bootstrap_cmds cctools xcbuild diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ec9669f3c7d92..2f4a2ee6b1d9c 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; + hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index c5f74854f77ca..a1a22fb38e42a 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-09-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; + hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 28ed971a25e49..437da86e8c21e 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - # TODO: should be hostPlatform - TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; + TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix index 6dd6d46e30bb6..4e142c5845293 100644 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ b/pkgs/development/libraries/rustc-demangle/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib cp -R crates/capi/include $out ''; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index c1483f90c433e..73092a803d66c 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.50"; + version = "1.3.56"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; + hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 2ed35d26b9073..b03352c54e8a0 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -9,7 +9,7 @@ , withOpenMP ? true , blas64 ? false -, withAMDOpt ? false +, withAMDOpt ? true }: stdenv.mkDerivation rec { @@ -37,15 +37,15 @@ stdenv.mkDerivation rec { buildInputs = [ amd-blis aocl-utils ]; cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib" + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" "-DENABLE_BUILTIN_LAPACK2FLAME=ON" "-DENABLE_CBLAS_INTERFACES=ON" "-DENABLE_EXT_LAPACK_INTERFACE=ON" ] - ++ lib.optional (!withOpenMP) "ENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "ENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "ENABLE_AMD_OPT=ON"; + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 5b78afc15ed4f..2c9aa745ba12e 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -48,8 +48,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 22aa10fc6d1e7..60b9de0ab33a7 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "2.11.10"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; + stripLen = 1; + extraPrefix = "CoinUtils/"; + hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index a47d8260714ab..47a6249ebdc62 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { inherit version; pname = "libtorch"; - src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 27509ee993399..6b8588207dc33 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -24,7 +24,8 @@ , libpthreadstubs , magmaRelease , ninja -, rocmSupport ? false +, config +, rocmSupport ? config.rocmSupport , static ? false , stdenv , symlinkJoin diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 585f4c3a14e3a..f4b168b37fe2d 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -34,32 +34,32 @@ let oneapi-mkl = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-BeI5zB0rrE6C21dezNc7/WSKmTWpjsZbpg0/y0Y87VQ="; + hash = "sha256-PGLPNnR+11AmmaNxldeze/l2Kw/4+mfjB+RqsPhP6oM="; }; oneapi-mkl-common = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-NjIqTeFppwjXFlPYHPHfZa/bWBiHJru3atC4fIMXN0w="; + hash = "sha256-wztTE2R/IdG6ujGf7KFocpRmXzlZSnEKopTBOlPPlBw="; }; oneapi-mkl-common-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-GX19dlvBWRgwSOCmWcEOrnbmp4S2j0448fWpx+iPVWw="; + hash = "sha256-MWa8mpyFM4zgDLup+EzFRM+N2Oxf0o6FBBRM8mAanbI="; }; oneapi-mkl-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-F4XxtSPAjNaShEL/l44jJK+JdOOkYI19X/njRB6FkNw="; + hash = "sha256-Arq5kXktI92031XqfV0pkzQCHaFsTRKX05iOA/fPNOs="; }; oneapi-openmp = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-1SlkI01DxFvwGPBJ73phs86ka0SmCrniwiXQ9DJwIXw="; + hash = "sha256-cyBD3P4AEvyreP4pP3BE+yyDB+ptblOQ9GYI8ysGsIM="; }; oneapi-tbb = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-wIktdf1p1SS1KrnUlc8LPkm0r9dhZE6cQNr4ZKTWI6A="; + hash = "sha256-pzJpQdiYVpcKDShePak2I0uEh7u08vJgX7OBF5p5yAM="; }; in stdenvNoCC.mkDerivation ({ diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 950402315a9b5..3fc533e848db8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.21"; + version = "0.3.24"; outputs = [ "out" "dev" ]; @@ -149,18 +149,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs="; + sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; }; - patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [ - # https://github.com/xianyi/OpenBLAS/pull/3626 - (fetchpatch { - name = "openblas-0.3.21-fix-loong.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655"; - hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc"; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 67dfef186e7d8..dd2eb9478f7f6 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ] ; + env = lib.optionalAttrs stdenv.isDarwin { + # Ensure that there is enough space for the `fixDarwinDylibNames` hook to + # update the install names of the output dylibs. + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + buildFlags = [ # Build individual shared libraries, not demos "library" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 26dd00d960694..f99e86ffe478c 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { "-DUSE_XSDK_DEFAULTS=true" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + patches = [ ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 13344db9ebc34..bdaf6e6284ef1 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # name of library file ("libzn_poly.so") libbasename = "libzn_poly"; - libext = stdenv.targetPlatform.extensions.sharedLibrary; + libext = stdenv.hostPlatform.extensions.sharedLibrary; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index e8c090e392bd4..95ba1dc68e512 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-mi9mEyb25fb3W6X07TX36fW6T2SOPOkDvpIXQn5sg8Q="; + hash = "sha256-pEFfs8xjc+6r+60aJF4Sjjy/oSU/+ADWgOBpS3t9rWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index be5db122d244a..c3ecd3a9866fe 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { extraPrefix = ""; sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0="; }) + (fetchpatch { + url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch"; + hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index f0afda7a90011..fe17da91e5817 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; }; } diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5ac49ac278fc9..53a5e09413c59 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.4.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw="; + sha256 = "sha256-g1jrjRls9tJWh0koMg7MsUgRSNaty8YI+ivlwL6FCsk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f25ac14df8646..099a3d838bbbc 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { pname = "smpeg"; @@ -16,8 +16,24 @@ stdenv.mkDerivation rec { ./gcc6.patch ./libx11.patch ./gtk.patch + # These patches remove use of the `register` storage class specifier, + # allowing smpeg to build with clang 16, which defaults to C++17. + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; + hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; + }) + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; + hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; + }) ]; + postPatch = '' + substituteInPlace video/gdith.cpp \ + --replace 'register int' 'int' \ + --replace 'register Uint16' 'Uint16' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 44ad21d6a141a..3e18424d6b74e 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "sdk-${version}"; - hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f51ce3a500053..ec4cc458c4b51 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; + hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 31207ad9edf9c..6028c638a7ec2 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; + hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index c1c5819ad4219..bf84345be2d11 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "lf_cv_sane_realloc=yes" ]; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 4406aa0218486..f96bb0724bf28 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 845e815be5902..e848b4330955b 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index ff6a3343837be..b6cc969b9f783 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 7163f24815c52..4c6ec8e01691c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { --replace "stripprog=" "stripprog=\$STRIP # " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = { description = "Command-line editing library"; homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0e67ce8adea82..c12178d833de4 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=0fb94eef5062d2657d75eee686fa47238fafa312;sf=tgz"; - sha256 = "sha256-3P3xYKeAmLbBI4TdsG1VZBO7py9ktiwhXNtGsnryGNI="; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; + sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw="; name = "${pname}-${version}.tar.gz"; }; @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; + strictDeps = true; preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + enableParallelBuilding = true; + preInstall = '' mkdir -p $out/etc ''; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 21c63f71221e2..ea41b8156f7f8 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p build/externals/src/ep_catch ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include + + sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake ''; doCheck = true; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index ab973c957aed4..57a9b617d950d 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index f6c49b9cfb690..63a86ed55b526 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -11,6 +11,7 @@ , gexiv2 , tracker , meson +, mesonEmulatorHook , ninja , pkg-config , vala @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 gettext + glib itstool libxslt meson @@ -75,6 +77,8 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsNoGuiHook + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; # TODO: add libenca, libosinfo @@ -83,7 +87,6 @@ stdenv.mkDerivation rec { dbus exempi giflib - glib gexiv2 totem-pl-parser tracker diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4c2855185b0c4..627cac56bb737 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -3,7 +3,7 @@ , config , enableCuda ? config.cudaSupport , cudatoolkit -, enableRocm ? false +, enableRocm ? config.rocmSupport , rocmPackages }: diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/development/libraries/usrsctp/clang-fix-build.patch new file mode 100644 index 0000000000000..eb136e8be30ab --- /dev/null +++ b/pkgs/development/libraries/usrsctp/clang-fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c +index 57bcdaa..70cf8b7 100755 +--- a/usrsctplib/netinet/sctp_cc_functions.c ++++ b/usrsctplib/netinet/sctp_cc_functions.c +@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + #if defined(__FreeBSD__) && !defined(__Userspace__) + int old_cwnd; + #endif +- uint32_t t_ssthresh, t_cwnd, incr; ++ uint32_t t_ssthresh, incr; + uint64_t t_ucwnd_sbw; + uint64_t t_path_mptcp; + uint64_t mptcp_like_alpha; +@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + + /* MT FIXME: Don't compute this over and over again */ + t_ssthresh = 0; +- t_cwnd = 0; + t_ucwnd_sbw = 0; + t_path_mptcp = 0; + mptcp_like_alpha = 1; +@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + max_path = 0; + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + t_ssthresh += net->ssthresh; +- t_cwnd += net->cwnd; + /* lastsa>>3; we don't need to devide ...*/ + srtt = net->lastsa; + if (srtt > 0) { +diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c +index 3bce9e9..42ce111 100755 +--- a/usrsctplib/netinet/sctp_indata.c ++++ b/usrsctplib/netinet/sctp_indata.c +@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + struct sctp_tmit_chunk *tp1; + int strike_flag = 0; + struct timeval now; +- int tot_retrans = 0; + uint32_t sending_seq; + struct sctp_nets *net; + int num_dests_sacked = 0; +@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + } + + tp1->rec.data.doing_fast_retransmit = 1; +- tot_retrans++; + /* mark the sending seq for possible subsequent FR's */ + /* + * SCTP_PRINTF("Marking TSN for FR new value %x\n", +diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c +index 6a7dff9..a914b3b 100755 +--- a/usrsctplib/netinet/sctp_output.c ++++ b/usrsctplib/netinet/sctp_output.c +@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + struct mbuf *m, *endofchain; + struct sctp_nets *net = NULL; + uint32_t tsns_sent = 0; +- int no_fragmentflg, bundle_at, cnt_thru; ++ int no_fragmentflg, bundle_at; + unsigned int mtu; + int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; + struct sctp_auth_chunk *auth = NULL; +@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + } + } + one_chunk = 0; +- cnt_thru = 0; + /* do we have control chunks to retransmit? */ + if (m != NULL) { + /* Start a timer no matter if we succeed or fail */ +@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ + + /* For auto-close */ +- cnt_thru++; + if (*now_filled == 0) { + (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); + *now = asoc->time_last_sent; +@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, + struct epoch_tracker et; + #endif + ssize_t sndlen = 0, max_len, local_add_more; +- int error, len; ++ int error; + struct mbuf *top = NULL; + int queue_only = 0, queue_only_for_init = 0; + int free_cnt_applied = 0; +@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, + */ + local_add_more = sndlen; + } +- len = 0; + if (non_blocking) { + goto skip_preblock; + } +@@ -14265,7 +14262,6 @@ skip_preblock: + } + sctp_snd_sb_alloc(stcb, sndout); + atomic_add_int(&sp->length, sndout); +- len += sndout; + if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { + sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; + } +diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c +index 89a66bc..a952921 100755 +--- a/usrsctplib/netinet/sctp_pcb.c ++++ b/usrsctplib/netinet/sctp_pcb.c +@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) + } + + void +-sctp_drain() ++sctp_drain(void) + { + /* + * We must walk the PCB lists for ALL associations here. The system +diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c +index bb49e17..8b77f7e 100755 +--- a/usrsctplib/netinet/sctp_sysctl.c ++++ b/usrsctplib/netinet/sctp_sysctl.c +@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); + */ + + void +-sctp_init_sysctls() ++sctp_init_sysctls(void) + { + SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; + SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; +diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c +index 513a5a9..89e9eb2 100755 +--- a/usrsctplib/user_socket.c ++++ b/usrsctplib/user_socket.c +@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip *ip; + struct udphdr *udp; + struct sockaddr_in dst; +@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + +@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip6_hdr *ip6; + struct udphdr *udp; + struct sockaddr_in6 dst; +@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip6_hdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + if (m != NULL) { diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index af8979c79d13f..9723f887b82b9 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; + patches = [ + # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype + # errors. These issues are fixed in the master branch, but a new release with them has not + # been made. The following patch can be dropped once a release has been made. + ./clang-fix-build.patch + ]; + nativeBuildInputs = [ cmake ]; # https://github.com/sctplab/usrsctp/issues/662 diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index a9891a9d328c6..7edf2cdf7c46b 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = "-O2"; - FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; + FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ myGn diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 064893a3dbcd9..f962634b131e7 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -36,7 +36,7 @@ plugins: let $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" ''; - ext = stdenv.targetPlatform.extensions.sharedLibrary; + ext = stdenv.hostPlatform.extensions.sharedLibrary; in runCommand "${vapoursynth.name}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index c171731929254..02309b275bdcb 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -83,6 +83,10 @@ in stdenv.mkDerivation { "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + postPatch = optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 48e036ad030d0..f6c9dcb953e39 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.261"; + version = "1.3.268.0"; nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; - hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 7f6292ed23b74..da4e42ded84a2 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -3,7 +3,7 @@ set -euf -o pipefail -V_PACKAGES=( +SDK_PACKAGES=( "vulkan-headers" "vulkan-loader" "vulkan-validation-layers" @@ -11,9 +11,6 @@ V_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" -) - -SDK_PACKAGES=( "spirv-headers" "spirv-cross" "spirv-tools" @@ -21,10 +18,6 @@ SDK_PACKAGES=( nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit -for P in "${V_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:v)(.*)" --commit -done - for P in "${SDK_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit + nix-update "$P" --version-regex "(?:vulkan-sdk-)(.*)" --commit done diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 6e994eaa78c62..163cea7565c09 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "v${version}"; - hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index 42295a67d4667..b9c5e8ad45362 100644 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,8 +5,8 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index f82fad836273f..afa2efa62852c 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.269"; + version = "1.3.268"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-7BN+U97dqpSyCYhHuFTPqokRnABH7Gt91njZPxItpzg="; + hash = "sha256-O1agpzZpXiQZFYx1jPosIhxJovZtfZSLBNFj1LVB1VI="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 0dce309ef5c7c..4c49788464d46 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "19"; + version = "20"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; + hash = "sha256-H92PDrH1FL7S3eMCK1+wqclryjhwghl21bOlRCAr1U4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index dc53bbb54d2a7..0fadb103ce33d 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b0f9ce53e72e6..ad2b12de8910b 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/development/libraries/whereami/default.nix index 26908d2b10841..f68895ca17d03 100644 --- a/pkgs/development/libraries/whereami/default.nix +++ b/pkgs/development/libraries/whereami/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=strict-prototypes"; + makeFlags = [ "-C_gnu-make" "build-library" diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index c3ad173b09338..ca5157c6d71ab 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 7b018c89f50db..5e9b9f2fcb720 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , cairo +, expat , ffmpeg , libexif , pango @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + expat ffmpeg libexif pango diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 280602eee59b1..91a0b00670c94 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-tuLNNhQA9HGax1aueZHQ+eB2dyIQnKjlmarp7e6Jplc="; + hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 2fb4f995fe4cb..7e62812df8904 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -26,26 +26,6 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; isCross = stdenv.buildPlatform != stdenv.hostPlatform; - - cmakeCommonFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; - - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ]; - in stdenv.mkDerivation rec { @@ -96,32 +76,54 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + cmakeFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; + + preConfigure = lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"} + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_<version>/source/build) - preBuild = lib.optionalString (multibitdepthSupport) '' - cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + preBuild = lib.optionalString multibitdepthSupport '' make -C ../build-10bits -j $NIX_BUILD_CORES - cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON make -C ../build-12bits -j $NIX_BUILD_CORES ln -s ../build-10bits/libx265.a ./libx265-10.a ln -s ../build-12bits/libx265.a ./libx265-12.a ''; - cmakeFlags = cmakeCommonFlags ++ [ - "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=ON" - (mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM") - (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ] ++ lib.optionals (multibitdepthSupport) [ - "-DEXTRA_LIB=x265-10.a;x265-12.a" - "-DEXTRA_LINK_FLAGS=-L." - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" - ]; - doCheck = unittestsSupport; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c70b5e195708e..73c3b1b571737 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -28,8 +28,6 @@ let doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; - # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +44,7 @@ let homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; }; @@ -54,5 +52,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; + xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch deleted file mode 100644 index d763a2a2b4344..0000000000000 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc ---- xapian-core.old/tests/api_db.cc -+++ xapian-core.new/tests/api_db.cc -@@ -1020,6 +1020,7 @@ - - // test for keepalives - DEFINE_TESTCASE(keepalive1, remote) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); - - /* Test that keep-alives work */ -diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc ---- xapian-core.old/tests/api_scalability.cc -+++ xapian-core.new/tests/api_scalability.cc -@@ -53,6 +53,7 @@ - } - - DEFINE_TESTCASE(bigoaddvalue1, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - // O(n*n) is bad, but O(n*log(n)) is acceptable. - test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); - return true; -diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc ---- xapian-core.old/tests/api_serialise.cc -+++ xapian-core.new/tests/api_serialise.cc -@@ -110,6 +110,7 @@ - - // Test for serialising a document obtained from a database. - DEFINE_TESTCASE(serialise_document2, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Document origdoc; - origdoc.add_term("foo", 2); - origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index f5ae2ecfaa5a5..cba74b977de71 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; + hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/pkgs/development/libraries/xsimd/10.nix b/pkgs/development/libraries/xsimd/10.nix deleted file mode 100644 index afea6b94ef372..0000000000000 --- a/pkgs/development/libraries/xsimd/10.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, doctest -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xsimd"; - version = "10.0.0"; - - src = fetchFromGitHub { - owner = "xtensor-stack"; - repo = "xsimd"; - rev = finalAttrs.version; - sha256 = "sha256-+ewKbce+rjNWQ0nQzm6O4xSwgzizSPpDPidkQYuoSTU="; - }; - - nativeBuildInputs = [ - cmake - ]; - patches = lib.optionals stdenv.isDarwin [ - # https://github.com/xtensor-stack/xsimd/issues/807 - ./disable-test_error_gamma-test.patch - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-polar-test.patch - ]; - - cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" - ]; - - doCheck = true; - nativeCheckInputs = [ - doctest - ]; - checkTarget = "xtest"; - - meta = with lib; { - description = "C++ wrappers for SIMD intrinsics"; - homepage = "https://github.com/xtensor-stack/xsimd"; - license = licenses.bsd3; - maintainers = with maintainers; [ tobim ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index 7873da993fde9..bb01b7f875ea4 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -1,16 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doctest , enableAssertions ? false , enableBoundChecks ? false # Broadcasts don't pass bound checks , nlohmann_json , xtl -# Although this dependency is of the same GitHub organization, xtensor don't -# support xsimd 11 yet, see: -# https://github.com/xtensor-stack/xtensor/issues/2721 -, xsimd10 +, xsimd }: stdenv.mkDerivation (finalAttrs: { @@ -23,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { rev = finalAttrs.version; hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk="; }; + patches = [ + # Support for xsimd 11 + (fetchpatch { + url = "https://github.com/xtensor-stack/xtensor/commit/77a650a8018e0be6fcc76bf66685ff352ae23ef1.patch"; + hash = "sha256-vOdUzzsSK+lYcA7fZXWOTVV202GZC0DhkMMjzggnmWE="; + }) + # A single test fails on Darwin, see: + # https://github.com/xtensor-stack/xtensor/issues/2718 + ./remove-failing-test_xinfo.patch + ]; nativeBuildInputs = [ cmake @@ -33,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!(stdenv.isAarch64 && stdenv.isLinux)) [ # xsimd support is broken on aarch64-linux, see: # https://github.com/xtensor-stack/xsimd/issues/945 - xsimd10 + xsimd ]; cmakeFlags = let diff --git a/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch b/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch new file mode 100644 index 0000000000000..c3352c453c598 --- /dev/null +++ b/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch @@ -0,0 +1,12 @@ +diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt +index 46127597..727b66bd 100644 +--- i/test/CMakeLists.txt ++++ w/test/CMakeLists.txt +@@ -189,7 +189,6 @@ set(XTENSOR_TESTS + test_xhistogram.cpp + test_xpad.cpp + test_xindex_view.cpp +- test_xinfo.cpp + test_xio.cpp + test_xlayout.cpp + test_xmanipulation.cpp diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fa429f9a4cac..6a0e173db3a90 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -11,25 +10,15 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; + sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - patches = [ - # Backport gcc-13 fix: - # https://github.com/zeromq/libzmq/pull/4480 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; - hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; - }) - ]; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; - license = licenses.lgpl3Plus; + license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 47a097fd7f79f..8f4ed9799c2ce 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -39,5 +39,6 @@ let in mapAliases { - "lpty" = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f05933bdde38f..fcde2f41ddceb 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,10 +5,10 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { -alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: +alt-getopt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; @@ -22,12 +22,13 @@ buildLuarocksPackage { "date": "2017-01-06T13:50:55+03:00", "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "hash": "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -40,23 +41,18 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ luaOlder, buildLuarocksPackage, luaAtLeast, lua, fetchgit }: +argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "argparse"; - version = "scm-2"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/luarocks/argparse.git", - "rev": "27967d7b52295ea7885671af734332038c132837", - "date": "2020-07-08T11:17:50+10:00", - "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", - "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "0.7.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; + sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; + }).outPath; + src = fetchzip { + url = "https://github.com/luarocks/argparse/archive/0.7.1.zip"; + sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -68,15 +64,17 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +basexx = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "basexx"; - version = "scm-0"; - rockspecDir = "dist"; - + version = "0.4.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = "https://github.com/aiq/basexx/archive/master.tar.gz"; - sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; disabled = (luaOlder "5.1"); @@ -89,11 +87,14 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +binaryheap = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; - + knownRockspec = (fetchurl { + url = "mirror://luarocks/binaryheap-0.4-1.rockspec"; + sha256 = "1ah37lhskmrb26by5ygs7jblx7qnf6mphgw8kwhw0yacvmkcbql4"; + }).outPath; src = fetchurl { url = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz"; sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; @@ -110,7 +111,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +bit32 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -124,12 +125,13 @@ buildLuarocksPackage { "date": "2015-02-17T10:44:04+01:00", "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "hash": "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -142,26 +144,27 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, luafilesystem, luasystem, fetchgit, luaOlder, lua-term, say, mediator_lua, penlight, luassert, lua_cliargs, lua, dkjson }: +busted = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, lua, lua-term, luaOlder, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; - version = "2.1.1-1"; + version = "2.1.2-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.1.1-1.rockspec"; - sha256 = "0f9iz3pa2gmb2vccvygp6zdiji7l8bap0vlgqgrcg331qsrkf70h"; + url = "mirror://luarocks/busted-2.1.2-3.rockspec"; + sha256 = "0ll8jzbpp6a9zdbbjglmq30jmx2zvr0rs83jgsjxmlfzzylkry8p"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/busted.git", - "rev": "e3ed48759b625f2e37bf02ccc057b2b98108f108", - "date": "2022-08-24T17:34:58+03:00", - "path": "/nix/store/7g9rxkyhabgx0acwmzl4r4xfh193avpw-busted", - "sha256": "0nab0s5lhk0nhh58c4jspv5sj4g7839gb5q145hrlgbsxqncp8wy", + "rev": "673cb6bad2ee3876d45e004fcac1c2f8a816344f", + "date": "2023-03-20T10:00:33+01:00", + "path": "/nix/store/k7xnpg0s36gxk5mb59wx1dj8ikiz92ja-busted", + "sha256": "1wsiiiw26yqglqkkailksinzcb9gaffcldrcfhga3zawf2518h8y", + "hash": "sha256-HkEUinBc/aEedCw3ypxTLy32bdSTRjUnpg97I3iMUfM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; @@ -173,7 +176,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, fetchgit, penlight, luaOlder, lua }: +cassowary = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -187,12 +190,13 @@ buildLuarocksPackage { "date": "2022-04-22T11:23:46+03:00", "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", + "hash": "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -205,7 +209,7 @@ buildLuarocksPackage { }; }) {}; -cldr = callPackage({ penlight, luaOlder, lua, fetchgit, buildLuarocksPackage }: +cldr = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -219,12 +223,13 @@ buildLuarocksPackage { "date": "2022-12-06T12:36:06+03:00", "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", + "hash": "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -237,7 +242,7 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ lua, luaAtLeast, fetchzip, luaOlder, buildLuarocksPackage }: +compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; @@ -261,7 +266,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, fetchgit, lpeg }: +cosmo = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -275,12 +280,13 @@ buildLuarocksPackage { "date": "2016-06-17T05:39:58-07:00", "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "hash": "sha256-V3hcEB/PpJFFrx35vE7HO55rUM8GigZOOue0/jR/ZQ0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ lpeg ]; @@ -292,7 +298,7 @@ buildLuarocksPackage { }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, fetchgit }: +coxpcall = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -306,12 +312,13 @@ buildLuarocksPackage { "date": "2018-02-26T19:53:11-03:00", "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "hash": "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -321,7 +328,7 @@ buildLuarocksPackage { }; }) {}; -cqueues = callPackage({ fetchurl, buildLuarocksPackage, lua }: +cqueues = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; @@ -345,7 +352,7 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, tl, fetchgit, luafilesystem }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, luafilesystem, tl }: buildLuarocksPackage { pname = "cyan"; version = "0.3.0-1"; @@ -359,12 +366,13 @@ buildLuarocksPackage { "date": "2023-02-19T18:58:20-06:00", "path": "/nix/store/smpj81z2a2blb3qfpjwx9n52d50rp39w-cyan", "sha256": "0pskargvjn2phgz481b08ndhp3z23s7lqfs8qlwailr7a4f2fc7h", + "hash": "sha256-8DAnHFEn06g4xUg7TI8e4o8Lm0VgBUT+g1dYuV9WU18=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -375,51 +383,24 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: -buildLuarocksPackage { - pname = "cyrussasl"; - version = "1.1.0-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/JorjBauer/lua-cyrussasl", - "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", - "date": "2015-08-21T18:24:54-04:00", - "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", - "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; - description = "Cyrus SASL library for Lua 5.1+"; - license.fullName = "BSD"; - }; -}) {}; - -digestif = callPackage({ luafilesystem, fetchgit, lpeg, lua, buildLuarocksPackage, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "8f8448fa3f27611b32fe6398fe22ef24b8602ec9", - "date": "2023-02-24T22:38:11+01:00", - "path": "/nix/store/s7wxqcj3k8pgb3m86d8rs2ggpl63jxwn-digestif", - "sha256": "0k3srmilrz3ajj76kklksmifkgqrm0y7gr25h0vrrldrf1xp4pk0", + "rev": "c0199f9cd86021c0a89662002d7a3411d12fb168", + "date": "2023-03-10T15:04:26+01:00", + "path": "/nix/store/3s849fwc80lf7pvgsiavqmvc5538cwwd-digestif", + "sha256": "0xccrrfwvcj03nnrzs3iwig7y2ahl706h413hkywcplyd5407dv9", + "hash": "sha256-abcDSGmeXsb9hCMQaMChUAl/XuRx6J+tHUCyzV3OjHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lpeg lua luafilesystem ]; @@ -431,7 +412,7 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, lua, luaAtLeast, luaOlder, fetchurl }: +dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; @@ -454,17 +435,17 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +fennel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.3.0-1.rockspec"; - sha256 = "1by78423n8k8i5sz7ji6w5igm8jkmyvd5x1y519hzmknphjqa263"; + url = "mirror://luarocks/fennel-1.3.1-1.rockspec"; + sha256 = "1dsavrsvngwx8vf1l2sj44arvip3bqkhsfh2sdkwa6r9mnw9zx87"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.3.0.tar.gz"; - sha256 = "0m754c74pj10c1qmc4zl89ifjiqcwafn8qagzfpfmcqv6r46pr23"; + url = "https://fennel-lang.org/downloads/fennel-1.3.1.tar.gz"; + sha256 = "1c7iwyc9f3a9k34fjq77zjk0minl3bl3f7wqlj8i1n2x7598nzgx"; }; disabled = (luaOlder "5.1"); @@ -478,7 +459,7 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: +fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; @@ -500,7 +481,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ lua, luaepnf, fetchgit, cldr, buildLuarocksPackage, penlight, luaOlder }: +fluent = callPackage({ buildLuarocksPackage, cldr, fetchgit, fetchurl, lua, luaOlder, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -514,12 +495,13 @@ buildLuarocksPackage { "date": "2022-04-16T23:08:20+03:00", "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", + "hash": "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ cldr lua luaepnf penlight ]; @@ -532,23 +514,24 @@ buildLuarocksPackage { }; }) {}; -gitsigns-nvim = callPackage({ lua, fetchgit, buildLuarocksPackage }: +gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "f388995990aba04cfdc7c3ab870c33e280601109", - "date": "2023-02-16T11:22:47+00:00", - "path": "/nix/store/i4acpc5h3sv909gyppm1qv2vqjq84xs1-gitsigns.nvim", - "sha256": "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx", + "rev": "ff01d34daaed72f271a8ffa088a7e839a60c640f", + "date": "2023-10-06T09:04:46+01:00", + "path": "/nix/store/2m4fyzkkg6bdbfb4kpjrqgbawvs3khqg-gitsigns.nvim", + "sha256": "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17", + "hash": "sha256-J9j2OeoEvhl1V8Pzr7i/usVZ2LGI4emlpRGDX+uznjI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; @@ -560,17 +543,17 @@ buildLuarocksPackage { }; }) {}; -haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "2.3.0-1"; + version = "2.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-2.3.0-1.rockspec"; - sha256 = "0jcmb0hzyhq14b2xcwdhwr9a9wbmfaw27vzfzkv52is24mwfr0p0"; + url = "mirror://luarocks/haskell-tools.nvim-2.4.0-1.rockspec"; + sha256 = "1sapapkz3ay9yrljmc1lwxjglv27f1zbh6m014r2z59px4ir61dz"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.3.0.zip"; - sha256 = "0lg8g2j9fbikgmhimvz9d0yb63csn85racc09qyszba2kviipr24"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.4.0.zip"; + sha256 = "054vfqsccq1qmqmglnppi2n7ksckldx8b5p62y35y0cbcdyh7wz3"; }; disabled = (luaOlder "5.1"); @@ -583,7 +566,7 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: +http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, lua, luaOlder, luaossl }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -607,7 +590,7 @@ buildLuarocksPackage { }; }) {}; -inspect = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -630,7 +613,7 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit }: +jsregexp = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "jsregexp"; version = "0.0.6-1"; @@ -644,12 +627,13 @@ buildLuarocksPackage { "date": "2023-02-12T14:19:03+01:00", "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", + "hash": "sha256-NSHsqyJEBgNS77e8OLwUKbD33dfirBnvEpZQKVyx8FA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -661,7 +645,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ luaOlder, fetchgit, lua, luaAtLeast, buildLuarocksPackage }: +ldbus = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -675,12 +659,13 @@ buildLuarocksPackage { "date": "2021-11-10T23:58:54+11:00", "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus", "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j", + "hash": "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -692,34 +677,35 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ fetchgit, buildLuarocksPackage, markdown, penlight }: +ldoc = callPackage({ buildLuarocksPackage, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; - version = "scm-3"; + version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "01d648f4ad50c3d14f2acadee6acb26beda56990", - "date": "2022-11-18T00:01:45+01:00", - "path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc", - "sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm", + "url": "https://github.com/lunarmodules/ldoc.git", + "rev": "e4940daf748affb86489b0782ed8abab2e88bebc", + "date": "2023-05-13T08:12:31+03:00", + "path": "/nix/store/sqhilwlh0glw1dxcx6w98wjkp65amvil-ldoc", + "sha256": "0an92jxvhbw2lvg269x6z3874x3wqmbmx52j4gsgxf9ldpizssgd", + "hash": "sha256-7Wn94200uf70I1KUXlfFfHRy0PimJyPepoIvuLsUySo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ markdown penlight ]; meta = { - homepage = "https://github.com/lunarmodules/LDoc"; + homepage = "http://lunarmodules.github.io/ldoc"; description = "A Lua Documentation Tool"; - license.fullName = "MIT/X11"; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; -lgi = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua }: +lgi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -733,12 +719,13 @@ buildLuarocksPackage { "date": "2017-10-09T20:55:55+02:00", "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "hash": "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -750,7 +737,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +linenoise = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -770,7 +757,7 @@ buildLuarocksPackage { }; }) {}; -ljsyscall = callPackage({ lua, fetchurl, buildLuarocksPackage }: +ljsyscall = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; @@ -794,7 +781,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ fetchurl, buildLuarocksPackage, lua }: +lmathx = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -817,7 +804,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, lua, luaOlder }: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -827,7 +814,7 @@ buildLuarocksPackage { }).outPath; src = fetchurl { url = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.c"; - sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; + sha256 = "1bkfwdacj1drzqsfxf352fjppqqwi5d4j084jr9vj9dvjb31rbc1"; }; disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); @@ -841,7 +828,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit }: +loadkit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -851,16 +838,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/loadkit.git", - "rev": "c6c712dab45f6c568821f9ed7b49c790a44d12e7", - "date": "2021-01-07T14:41:10-08:00", - "path": "/nix/store/xvwq7b2za8ciww1gjw7vnspg9183xmfa-loadkit", - "sha256": "15znriijs7izf9f6vmhr6dnvw3pzr0yr0mh6ah41fmdwjqi7jzcz", + "rev": "95b13a36442f59b41ab52df96d52233c4a725dfd", + "date": "2023-08-17T11:36:25-07:00", + "path": "/nix/store/9xcy2p5pxiq0p17szv8p2lagb6xzb8c8-loadkit", + "sha256": "0hivmn5r1scxv3nckm4hqfplq33wiab3ypjwsfdkmp3bdri0dhxs", + "hash": "sha256-usMGYm5r3Dqb01xeP5aKfAxMr8OQ1Mns2J3pkIutO0I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -873,17 +861,17 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +lpeg = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeg"; - version = "1.0.2-1"; + version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lpeg-1.0.2-1.rockspec"; - sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; + url = "mirror://luarocks/lpeg-1.1.0-1.rockspec"; + sha256 = "03af1p00madfhfxjzrsxb0jm0n49ixwadnkdp0vbgs77d2v985jn"; }).outPath; src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"; }; disabled = (luaOlder "5.1"); @@ -897,7 +885,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ lpeg, fetchzip, buildLuarocksPackage, lua }: +lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -919,7 +907,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ fetchurl, lua, luaOlder, buildLuarocksPackage }: +lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -942,7 +930,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: +lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; @@ -956,12 +944,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -973,7 +962,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-pcre = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; @@ -987,12 +976,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1005,7 +995,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-posix = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-posix = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; @@ -1019,12 +1009,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1036,7 +1027,7 @@ buildLuarocksPackage { }; }) {}; -lua-cjson = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cjson = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1050,12 +1041,13 @@ buildLuarocksPackage { "date": "2021-12-10T20:19:58+08:00", "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", + "hash": "sha256-6m8cNI4TM3lzoh47CiohpQW4Lq0OTVR0fK+e087WDQ4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1067,7 +1059,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1081,12 +1073,13 @@ buildLuarocksPackage { "date": "2015-06-03T08:39:04+02:00", "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", + "hash": "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1098,7 +1091,7 @@ buildLuarocksPackage { }; }) {}; -lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }: +lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-curl"; version = "0.3.13-1"; @@ -1121,30 +1114,61 @@ buildLuarocksPackage { }; }) {}; -lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }: +lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "lua-ffi-zlib"; + version = "0.6-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; + sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hamishforbes/lua-ffi-zlib", + "rev": "61e95cb434e4047c8bc65a180c293a05bf754416", + "date": "2023-08-11T09:28:16+12:00", + "path": "/nix/store/gfyr81q84mgpgwyh28xpzlf34ndjkfwc-lua-ffi-zlib", + "sha256": "0r6vima495h0d4f8ibf3fv9b6k7rqnavgvsy78dybslrm7lwsz4p", + "hash": "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/hamishforbes/lua-ffi-zlib"; + description = "A Lua module using LuaJIT's FFI feature to access zlib."; + }; +}) {}; + +lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; - version = "7-3"; + version = "7.0.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-iconv-7-3.rockspec"; - sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72"; + url = "mirror://luarocks/lua-iconv-7.0.0-2.rockspec"; + sha256 = "1bj512kqcj2cxna7si4648fci51fs4bqvdn592i9cahscsc0kk9g"; }).outPath; src = fetchurl { - url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz"; - sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; + url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz"; + sha256 = "0arp0h342hpp4kfdxc69yxspziky4v7c13jbf12yrs8f1lnjzr0x"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://ittner.github.com/lua-iconv/"; + homepage = "https://github.com/lunarmodules/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; }; }) {}; -lua-lsp = callPackage({ fetchgit, inspect, lua, lpeglabel, dkjson, luaAtLeast, luaOlder, buildLuarocksPackage }: +lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, inspect, lpeglabel, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; @@ -1158,12 +1182,13 @@ buildLuarocksPackage { "date": "2020-10-17T15:07:11-04:00", "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", + "hash": "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; @@ -1175,17 +1200,17 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; - version = "0.5.2-1"; + version = "0.5.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec"; - sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc"; + url = "mirror://luarocks/lua-messagepack-0.5.3-1.rockspec"; + sha256 = "0sc11ckizivijgdnqvb0xnagrak6d2caxc5j8jz8ad1b2plp50pq"; }).outPath; src = fetchurl { - url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.2.tar.gz"; - sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; + url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.3.tar.gz"; + sha256 = "17qdigs2pzi38rfqgs63xh44n1vylb6bcmmbz3sby68f0n9p8kq6"; }; disabled = (luaOlder "5.1"); @@ -1198,26 +1223,27 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-protobuf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.4.1-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec"; - sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i"; + url = "mirror://luarocks/lua-protobuf-0.5.0-1.rockspec"; + sha256 = "08z73rsqi7ysdyjcwfqyr8z6i5r43kx5fd8l32wlzv6cx6yvlqc9"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869", - "date": "2022-11-29T21:34:24+08:00", - "path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf", - "sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr", + "rev": "a256c34e12cad643d6ad189bddcbc314da9b0658", + "date": "2023-04-30T02:11:27+08:00", + "path": "/nix/store/n7ihjh36kp2f80016f9y8xydia2pclzq-lua-protobuf", + "sha256": "1kbanbgvmzcfnxq30f8hmirgc1d768lacpjihis9961pc7w96l9n", + "hash": "sha256-NlGT+GE3mJR0hFFepigypwX2cqwQOTBwt479ut+yas0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1230,26 +1256,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +lua-resty-http = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-resty-http"; - version = "0.17.0.beta.1-0"; + version = "0.17.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec"; - sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80"; + url = "mirror://luarocks/lua-resty-http-0.17.1-0.rockspec"; + sha256 = "05gid7c5i459clw707z1jic42s52ap4z66dbr9ims5znaq5s3wdk"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/ledgetech/lua-resty-http", - "rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34", - "date": "2022-02-11T16:44:50+00:00", - "path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http", - "sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb", + "rev": "4ab4269cf442ba52507aa2c718f606054452fcad", + "date": "2023-03-22T09:48:56+00:00", + "path": "/nix/store/ykd1d5fa56i1c286k58jm233lqvdv2mi-lua-resty-http", + "sha256": "0xdhygjqjpfkq1bq8b09fichww57q1z694lz16i3hcc3g4sr4hxg", + "hash": "sha256-r0OSNXmDMTiiCZ+SZH7Ap3AOWXQJLIRXwNNdieXzsHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1261,7 +1288,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ luaOlder, lua-resty-openssl, fetchgit, lua, buildLuarocksPackage }: +lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1275,12 +1302,13 @@ buildLuarocksPackage { "date": "2021-01-20T16:53:57-05:00", "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "hash": "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; @@ -1292,7 +1320,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ lua-resty-http, buildLuarocksPackage, fetchgit, lua-resty-session, luaOlder, lua, lua-resty-jwt }: +lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.6-3"; @@ -1306,12 +1334,13 @@ buildLuarocksPackage { "date": "2023-01-30T19:06:51+01:00", "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", + "hash": "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; @@ -1323,26 +1352,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ fetchgit, buildLuarocksPackage }: +lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.17-1"; + version = "0.8.25-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.17-1.rockspec"; - sha256 = "1b4dv9mdb90n0f6982pnjb05rgb12nkn1j66a1ywcs5fqcmj4sb5"; + url = "mirror://luarocks/lua-resty-openssl-0.8.25-1.rockspec"; + sha256 = "0wy0fjb50kpcyk6mkjj364p4lrfxl0b34xnv2n0wib1brk536s1l"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "dc17f6b2ff3adaa3bcb586f1d09073a4f4f4ec9d", - "date": "2023-01-20T01:36:57+08:00", - "path": "/nix/store/hh9i8ndb861iplkf9mz6vs2akkyibazn-lua-resty-openssl", - "sha256": "14xmxskbw3clqr97y69d311rs6i97vl7dg8pzixsqf4ypgllzvig", + "rev": "f9a153288238e9b7e3d5d40144610410a06a83cd", + "date": "2023-09-05T15:19:20+08:00", + "path": "/nix/store/jnvr2pzvxl2psd5w030m4qnv5dsm8spb-lua-resty-openssl", + "sha256": "08fqgdfi0dr3n2lqrbgwa94dd2f6crn1kb0cfpccphknaypaw7dp", + "hash": "sha256-tx2urld2wsvYdQysGWxmxonWSFL8rYypsCM3EF172CE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -1352,35 +1382,35 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua, lua-resty-openssl /*, lua_pack, lua-ffi-zlib */ }: +lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-ffi-zlib, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.0.3-1"; + version = "4.0.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.0.3-1.rockspec"; - sha256 = "17q8gf0zjdbfgphvjsnlzw1d6158v4ppiqxap6hjqr0prqa5yyfq"; + url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; + sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "3373d8138930b6d1e255bb80d9127503019301d7", - "date": "2023-02-21T20:52:32+02:00", - "path": "/nix/store/pdwd03w7505wkv4fw79a3mdlfijk9ngd-lua-resty-session", - "sha256": "1d105785jzn9x3by4r0baaffr5xmc2ilgd7z7izcwq9z29pnfv02", + "rev": "5f2aed616d16fa7ca04dc40e23d6941740cd634d", + "date": "2023-08-16T18:24:43+03:00", + "path": "/nix/store/s6i1idv9lx52x7lcl0kc2c9sm9pic4kq-lua-resty-session", + "sha256": "08pih1baqhlvsqvcr1zzympmn8v7gskmis6ffhigll37hbzvljcz", + "hash": "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl /* lua_pack lua-ffi-zlib */ ]; + propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl ]; meta = { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty - Flexible and Secure"; license.fullName = "BSD"; - broken = true; # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate }; }) {}; @@ -1413,7 +1443,7 @@ buildLuarocksPackage { }; }) {}; -lua-subprocess = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; @@ -1424,12 +1454,13 @@ buildLuarocksPackage { "date": "2021-01-09T22:31:54+01:00", "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", + "hash": "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1442,7 +1473,7 @@ buildLuarocksPackage { }; }) {}; -lua-term = callPackage({ fetchurl, buildLuarocksPackage }: +lua-term = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -1463,7 +1494,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1477,12 +1508,13 @@ buildLuarocksPackage { "date": "2017-12-08T16:30:50-08:00", "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "hash": "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1494,7 +1526,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-yajl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; @@ -1508,12 +1540,13 @@ buildLuarocksPackage { "date": "2020-11-12T06:22:23-08:00", "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "hash": "sha256-7oKX8x1HLc5Nk3VC94iwAFpPo57WtdBy4Bbv40HyObs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1526,7 +1559,7 @@ buildLuarocksPackage { }; }) {}; -lua-zlib = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-2"; @@ -1540,12 +1573,13 @@ buildLuarocksPackage { "date": "2017-10-07T08:26:37-07:00", "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", + "hash": "sha256-rOjgjdZxVrQRIWdduYKH0Y/gcAE/gwWHqzDSwooWYbM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1558,7 +1592,7 @@ buildLuarocksPackage { }; }) {}; -lua_cliargs = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchurl }: +lua_cliargs = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1578,7 +1612,7 @@ buildLuarocksPackage { }; }) {}; -luabitop = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +luabitop = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1589,12 +1623,13 @@ buildLuarocksPackage { "date": "2021-08-30T10:14:03+02:00", "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", + "hash": "sha256-PPN3ZRR5+p+F7hVk3gfsdzUg7yyYDVFJ1HzJTFNyp6w=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; @@ -1606,26 +1641,27 @@ buildLuarocksPackage { }; }) {}; -luacheck = callPackage({ argparse, luafilesystem, lua, luaOlder, fetchgit, buildLuarocksPackage }: +luacheck = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.0-1"; + version = "1.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.0-1.rockspec"; - sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza"; + url = "mirror://luarocks/luacheck-1.1.1-1.rockspec"; + sha256 = "11nrryqff2yis5s7jscbyv221p21i9sh924x7g9l3d6ijns8zmba"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f", - "date": "2022-12-19T20:51:56+03:00", - "path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck", - "sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h", + "rev": "ababb6d403d634eb74d2c541035e9ede966e710d", + "date": "2023-06-10T11:27:25+03:00", + "path": "/nix/store/wkrhda7nww45g1waxdv9ghm35mwbvlfq-luacheck", + "sha256": "0abd5rfxv667n8d8v3g9cnkyghiwzhj3yk498gr2agd3mfcni7d7", + "hash": "sha256-p51omaujPSXyQ4lMPyT8PMLnp2XpjY0asseY3V0ubSk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lua luafilesystem ]; @@ -1637,7 +1673,7 @@ buildLuarocksPackage { }; }) {}; -luacov = callPackage({ luaAtLeast, buildLuarocksPackage, luaOlder, lua, fetchgit }: +luacov = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; @@ -1651,12 +1687,13 @@ buildLuarocksPackage { "date": "2021-02-15T18:47:58-03:00", "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "hash": "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -1668,7 +1705,7 @@ buildLuarocksPackage { }; }) {}; -luadbi = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +luadbi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; @@ -1682,12 +1719,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -1699,7 +1737,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-mysql = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit, luadbi, luaAtLeast }: +luadbi-mysql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; @@ -1713,12 +1751,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1730,7 +1769,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-postgresql = callPackage({ lua, fetchgit, buildLuarocksPackage, luaOlder, luaAtLeast, luadbi }: +luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; @@ -1744,12 +1783,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1761,7 +1801,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-sqlite3 = callPackage({ luaAtLeast, lua, luaOlder, buildLuarocksPackage, fetchgit, luadbi }: +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; @@ -1775,12 +1815,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1792,7 +1833,7 @@ buildLuarocksPackage { }; }) {}; -luaepnf = callPackage({ luaOlder, buildLuarocksPackage, lpeg, luaAtLeast, lua, fetchgit }: +luaepnf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; @@ -1806,12 +1847,13 @@ buildLuarocksPackage { "date": "2015-01-15T16:54:10+01:00", "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "hash": "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lpeg lua ]; @@ -1823,7 +1865,7 @@ buildLuarocksPackage { }; }) {}; -luaevent = callPackage({ lua, fetchurl, luaOlder, buildLuarocksPackage }: +luaevent = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; @@ -1846,7 +1888,7 @@ buildLuarocksPackage { }; }) {}; -luaexpat = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua }: +luaexpat = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaexpat"; version = "1.4.1-1"; @@ -1860,12 +1902,13 @@ buildLuarocksPackage { "date": "2022-10-04T16:36:23+02:00", "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", + "hash": "sha256-hmAQcU6AfYar4JzsYfaWZk3hxrDJKq8eHHoGcIeYjKw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1878,7 +1921,7 @@ buildLuarocksPackage { }; }) {}; -luaffi = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +luaffi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1892,12 +1935,13 @@ buildLuarocksPackage { "date": "2021-03-01T11:46:30-05:00", "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "hash": "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1909,7 +1953,7 @@ buildLuarocksPackage { }; }) {}; -luafilesystem = callPackage({ luaOlder, lua, fetchgit, buildLuarocksPackage }: +luafilesystem = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luafilesystem"; version = "1.8.0-1"; @@ -1923,44 +1967,46 @@ buildLuarocksPackage { "date": "2020-04-22T22:16:42-03:00", "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", + "hash": "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/keplerproject/luafilesystem"; + homepage = "https://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }) {}; -lualdap = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +lualdap = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lualdap"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; - sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + url = "mirror://luarocks/lualdap-1.3.1-1.rockspec"; + sha256 = "0c0j9dmrphg0dil4yhahcqzzyxhrv525g65jsz0q6iqwyx10bqbp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lualdap/lualdap", - "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", - "date": "2021-06-05T15:49:42+02:00", - "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", - "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "rev": "5c21b3e0d97a07b103f63edc7e649018e0453427", + "date": "2023-03-15T09:02:07+01:00", + "path": "/nix/store/ah7y5wpp3l0v5bk0gwzdvgzfpczb691k-lualdap", + "sha256": "1y3ap9si894xjlbrwx3c6bcfg60y80av802rscldg9scvm984jrg", + "hash": "sha256-L0uCUt1Mp9co01kAtBVAHpjn2DJsdJ4XlZ0kFHW6avg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1973,7 +2019,7 @@ buildLuarocksPackage { }; }) {}; -lualogging = callPackage({ luasocket, buildLuarocksPackage, fetchgit }: +lualogging = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luasocket }: buildLuarocksPackage { pname = "lualogging"; version = "1.8.2-1"; @@ -1987,12 +2033,13 @@ buildLuarocksPackage { "date": "2023-01-27T20:29:41+01:00", "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", + "hash": "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luasocket ]; @@ -2003,7 +2050,7 @@ buildLuarocksPackage { }; }) {}; -luaossl = callPackage({ buildLuarocksPackage, lua, fetchzip }: +luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "luaossl"; version = "20220711-0"; @@ -2025,7 +2072,7 @@ buildLuarocksPackage { }; }) {}; -luaposix = callPackage({ bit32, lua, luaOlder, fetchzip, luaAtLeast, buildLuarocksPackage }: +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; @@ -2049,7 +2096,7 @@ buildLuarocksPackage { }; }) {}; -luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder, lua }: +luarepl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luarepl"; version = "0.10-1"; @@ -2072,7 +2119,7 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-rust-mlua = callPackage({ fetchgit, buildLuarocksPackage }: +luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua"; version = "0.1.2-1"; @@ -2086,41 +2133,44 @@ buildLuarocksPackage { "date": "2023-06-29T16:47:41+01:00", "path": "/nix/store/n7id28r1m11xd550hayv99xhz96vpdjq-luarocks-build-rust-mlua", "sha256": "1zh1p5k7xpczi5db3k0fw0ljw9w0xxk1qjjcfg5rcznqjf48i3x7", + "hash": "sha256-p4+IiJPYfpbLc0xKHGbvgCcuKeAOzLFaiZ/dfma5Af4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; -luasec = callPackage({ fetchgit, luaOlder, luasocket, buildLuarocksPackage, lua }: +luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: buildLuarocksPackage { pname = "luasec"; - version = "1.2.0-1"; + version = "1.3.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.2.0-1.rockspec"; - sha256 = "0zavdkwd701j8zqyzrpn1n5xd242vziq2l79amjdn5mcw81nrsdf"; + url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; + sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/brunoos/luasec", - "rev": "d9215ee00f6694a228daad50ee85827a4cd13583", - "date": "2022-07-30T08:42:53-03:00", - "path": "/nix/store/77m3g768a230h77nxiw23ay73aryq1zh-luasec", - "sha256": "1rz2lhf243lrsjsyjwxhijhqr88l8l8sndzzv9w4x1j0zpa9sblb", + "rev": "4c06287052d68fdbe7429b8f967cdc8ee94aa44a", + "date": "2023-08-31T17:09:53-03:00", + "path": "/nix/store/wnl78b5l3dxw52slphmi4rmr1cd8bd3r-luasec", + "sha256": "0rrdfbnkd8pgqwh3f0iyd5cxy7g1h0568a88m3sq1z7715js4yx3", + "hash": "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -2133,7 +2183,7 @@ buildLuarocksPackage { }; }) {}; -luasocket = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; version = "3.1.0-1"; @@ -2147,12 +2197,13 @@ buildLuarocksPackage { "date": "2022-07-27T10:07:00+03:00", "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", + "hash": "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2164,26 +2215,27 @@ buildLuarocksPackage { }; }) {}; -luasql-sqlite3 = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.6.0-1"; + version = "2.6.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec"; - sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; + url = "mirror://luarocks/luasql-sqlite3-2.6.0-2.rockspec"; + sha256 = "1xpbcpl4qhnzpyyszhdsrxhx2qc1dmndh926lv91xwphw7inwdwg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "e2660cbaeb13cb33d8346bb816c6a526241b3c2d", - "date": "2022-10-03T18:44:40-03:00", - "path": "/nix/store/mxzq779w3l19bgb424aa4cqdzxczmwr3-luasql", - "sha256": "052hc174am05plidilzf36vr736sp8vyydfb12qa8xr6mk74f6d1", + "rev": "25bf4ffce9323d28cb6f382f7ec9e8951e3084f9", + "date": "2023-07-19T14:20:27-03:00", + "path": "/nix/store/949886jxp7sx3yx910lc6d1yf3ym9mx5-luasql", + "sha256": "00q73j2nzqsm0vmxjkv83qh1dncmr5dgmkrkyxnb5ggygvcbh7w5", + "hash": "sha256-hR+42H7+vbJs9zPP+lrJldkWIB5oT9nrBlXjb4UcBwM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2196,7 +2248,7 @@ buildLuarocksPackage { }; }) {}; -luassert = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua, say }: +luassert = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, say }: buildLuarocksPackage { pname = "luassert"; version = "1.9.0-1"; @@ -2210,12 +2262,13 @@ buildLuarocksPackage { "date": "2022-08-24T00:00:45+03:00", "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", + "hash": "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; @@ -2227,7 +2280,7 @@ buildLuarocksPackage { }; }) {}; -luasystem = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchurl }: +luasystem = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; @@ -2250,7 +2303,7 @@ buildLuarocksPackage { }; }) {}; -luaunbound = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder, luaAtLeast }: +luaunbound = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunbound"; version = "1.0.0-1"; @@ -2273,7 +2326,7 @@ buildLuarocksPackage { }; }) {}; -luaunit = callPackage({ buildLuarocksPackage, fetchzip, lua, luaAtLeast, luaOlder }: +luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunit"; version = "3.4-1"; @@ -2297,7 +2350,7 @@ buildLuarocksPackage { }; }) {}; -luautf8 = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +luautf8 = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luautf8"; version = "0.1.5-2"; @@ -2321,7 +2374,7 @@ buildLuarocksPackage { }; }) {}; -luazip = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, lua, fetchgit }: +luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2335,12 +2388,13 @@ buildLuarocksPackage { "date": "2017-09-05T14:02:52+03:00", "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "hash": "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2352,23 +2406,24 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, luaAtLeast, luaOlder, lua }: +lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d", - "date": "2023-01-03T10:45:29+11:00", - "path": "/nix/store/wpnvi5bjlp7sl8g2li21qkcd7m1f3d3w-lush.nvim", - "sha256": "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq", + "rev": "966aad1accd47fa11fbe2539234f81f678fef2de", + "date": "2023-09-23T12:10:39+10:00", + "path": "/nix/store/67046ilc92czfvwc5zdkkxg7iw2xjj45-lush.nvim", + "sha256": "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h", + "hash": "sha256-sIRphtmkf340BSuX2V5uIGZRJg7hS8YwTv4KMsWKPTw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2381,7 +2436,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, fetchurl, lua }: +luuid = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2404,7 +2459,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +luv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.44.2-1"; @@ -2427,7 +2482,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, fetchzip, lua, luaOlder, luaAtLeast }: +lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2451,7 +2506,7 @@ buildLuarocksPackage { }; }) {}; -magick = callPackage({ fetchgit, buildLuarocksPackage, lua }: +magick = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; version = "1.6.0-1"; @@ -2465,24 +2520,26 @@ buildLuarocksPackage { "date": "2022-03-10T20:02:11-08:00", "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", + "hash": "sha256-lVnHM6Q2BbG4nLxBFjU5U/WvIL5qn19+TiK5I77GaQU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/leafo/magick.git"; + homepage = "https://github.com/leafo/magick.git"; description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI"; + maintainers = with lib.maintainers; [ donovanglover ]; license.fullName = "MIT"; }; }) {}; -markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: +markdown = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2496,12 +2553,13 @@ buildLuarocksPackage { "date": "2015-09-27T17:49:28+03:00", "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "hash": "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2513,7 +2571,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: +mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2536,7 +2594,7 @@ buildLuarocksPackage { }; }) {}; -middleclass = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +middleclass = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "middleclass"; version = "4.1.1-0"; @@ -2559,23 +2617,24 @@ buildLuarocksPackage { }; }) {}; -moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: +moonscript = callPackage({ argparse, buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", - "rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a", - "date": "2022-11-04T13:38:05-07:00", - "path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript", - "sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97", + "rev": "fbd8ad48737651114a3d3a672b9f8f8b3a7022b7", + "date": "2023-06-23T09:33:37-07:00", + "path": "/nix/store/sy1dkcfp3rg7lvazba36sivpk0bs12r5-moonscript", + "sha256": "02w6lp5kid73dcd5x71666my7413l05ak0xvva6hp8ixbn6qraqn", + "hash": "sha256-FquMjV09oguN2ruDqQqgI5DjqzEmnF4aa+O0OMulhgs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; @@ -2591,14 +2650,14 @@ buildLuarocksPackage { mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; - version = "1.0.9-0"; + version = "1.0.11-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.9-0.rockspec"; - sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn"; + url = "mirror://luarocks/mpack-1.0.11-0.rockspec"; + sha256 = "0alydkccamxldij7ki42imd37630d9qnqg22pndcgkawfclfqzqa"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz"; - sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.11/libmpack-lua-1.0.11.tar.gz"; + sha256 = "15np7603rijavycvrjgjp12y64zs36390lg2hsnr5av790cfrnd2"; }; @@ -2609,7 +2668,7 @@ buildLuarocksPackage { }; }) {}; -nui-nvim = callPackage( { fetchgit, buildLuarocksPackage }: +nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "nui.nvim"; version = "0.2.0-1"; @@ -2623,12 +2682,13 @@ buildLuarocksPackage { "date": "2023-07-20T10:45:09+06:00", "path": "/nix/store/8zdhjgipjjhi9b1y40r2yk5np4lp39as-nui.nvim", "sha256": "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx", + "hash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -2639,7 +2699,7 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ coxpcall, fetchurl, mpack, lua, luaOlder, luv, buildLuarocksPackage }: +nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }: buildLuarocksPackage { pname = "nvim-client"; version = "0.2.4-1"; @@ -2659,23 +2719,24 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40", - "date": "2023-02-24T12:23:36+09:00", - "path": "/nix/store/s1qark9y2zkbwyl2mzg60z9r0h4hajf4-nvim-cmp", - "sha256": "0cy93aj02nkspr83sqsrix12jcnhkl5s2mbpjr5ffhpcrk19vlmx", + "rev": "5dce1b778b85c717f6614e3f4da45e9f19f54435", + "date": "2023-08-26T15:31:42+00:00", + "path": "/nix/store/lvpzc5q7mv66knxh1igvzkrcwkpg8l8q-nvim-cmp", + "sha256": "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq", + "hash": "sha256-WGck3By9GhnBUmzLGi2wnKjDreQx5kBOmHCbC5BZhfo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2687,23 +2748,24 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ luafilesystem, luaOlder, fetchgit, buildLuarocksPackage, lua }: +penlight = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "7e67bcb1c4d95e7ca817356533419b4a72049b96", - "date": "2022-12-28T23:34:46+01:00", - "path": "/nix/store/14kax7nswd7in005cgb0f0r8194s9nsd-penlight", - "sha256": "17gcfi8hqpdp8m0f1nr9n5p1mzxxpq2qwf8zkqvjkb7qv1zqabj1", + "rev": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140", + "date": "2023-09-21T10:51:09+02:00", + "path": "/nix/store/vbi0d32mbaqcra3jligv8ajq17m1wxa4-penlight", + "sha256": "12ppgby8ldh4zxwcr7cknacbdvk30fi92sgyzh1zbgvym4l44g0c", + "hash": "sha256-DDxCKKl+v/UD/P5pkaIDY+62mLKTncx4/wQ2ivx694o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; @@ -2716,23 +2778,24 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ lua, fetchgit, luaOlder, luaAtLeast, luassert, buildLuarocksPackage }: +plenary-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "253d34830709d690f013daf2853a9d21ad7accab", - "date": "2023-02-19T10:05:49+01:00", - "path": "/nix/store/dnzlin3gqpvd35a8c5g5hwg3fl28vxgs-plenary.nvim", - "sha256": "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng", + "rev": "50012918b2fc8357b87cff2a7f7f0446e47da174", + "date": "2023-10-11T15:43:47+02:00", + "path": "/nix/store/jsgaq274w8pbl4pnmpii3izxafpl346g-plenary.nvim", + "sha256": "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd", + "hash": "sha256-zR44d9MowLG1lIbvrRaFTpO/HXKKrO6lbtZfvvTdx+o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; @@ -2744,7 +2807,7 @@ buildLuarocksPackage { }; }) {}; -rapidjson = callPackage({ lua, buildLuarocksPackage, luaOlder, fetchgit }: +rapidjson = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2755,12 +2818,13 @@ buildLuarocksPackage { "date": "2021-04-09T19:59:20+08:00", "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "hash": "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2772,44 +2836,21 @@ buildLuarocksPackage { }; }) {}; -readline = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: -buildLuarocksPackage { - pname = "readline"; - version = "3.2-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/readline-3.2-0.rockspec"; - sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; - }).outPath; - src = fetchurl { - url = "http://www.pjb.com.au/comp/lua/readline-3.2.tar.gz"; - sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua luaposix ]; - - meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; - description = "Interface to the readline library"; - license.fullName = "MIT/X11"; - }; -}) {}; - -rest-nvim = callPackage({ lua, luaAtLeast, buildLuarocksPackage, luaOlder, fetchzip, plenary-nvim }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: buildLuarocksPackage { pname = "rest.nvim"; - version = "0.1-2"; + version = "0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-0.1-2.rockspec"; - sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh"; + url = "mirror://luarocks/rest.nvim-0.2-1.rockspec"; + sha256 = "1yq8gx585c10j8kybp20swyv9q0i3lm5k0rrv4bgsbwz3ychn0k1"; }).outPath; src = fetchzip { - url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip"; - sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; + url = "https://github.com/rest-nvim/rest.nvim/archive/0.2.zip"; + sha256 = "0ycjrrl37z465p71bdkas3q2ky1jmgr2cjnirnskdc6wz14wl09g"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2843,23 +2884,24 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +say = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "say"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/say.git", - "rev": "45a3057e68c52b34ab59ef167efeb2340e356661", - "date": "2022-08-27T11:00:01+03:00", - "path": "/nix/store/324ryi5hlaisnyp4wpd1hvzcfv508i4s-say", - "sha256": "178pdsswwnja2f106701xmdxsdijjl5smm28dhhdcmjyb4mn8cr2", + "rev": "3e1f783d0aa496eb21d16e85b2235335cb9332df", + "date": "2023-08-13T02:37:27+03:00", + "path": "/nix/store/5biavac0k8z0xg4rr3bm8z3kdi8mm8c0-say", + "sha256": "04dkf0av6n71vmz0h86i5brklvaf9p91lkldn1xldpdr0qqs0x63", + "hash": "sha256-w3SgMQa53UZ7sI1OGtJNTm068yrRIAh+3eFYsxVwsxE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2871,7 +2913,7 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ fetchgit, luaAtLeast, lua, buildLuarocksPackage, luaOlder }: +serpent = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; @@ -2885,12 +2927,13 @@ buildLuarocksPackage { "date": "2017-09-01T21:35:14-07:00", "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "hash": "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2903,7 +2946,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ fetchgit, buildLuarocksPackage, luv }: +sqlite = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2917,12 +2960,13 @@ buildLuarocksPackage { "date": "2022-06-17T15:57:13+03:00", "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", + "hash": "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luv ]; @@ -2933,7 +2977,7 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +std-_debug = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "std._debug"; version = "git-1"; @@ -2944,12 +2988,13 @@ buildLuarocksPackage { "date": "2023-01-31T16:39:35-07:00", "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", + "hash": "sha256-zRU7RaOoaAFPx9XB5fWIgsjJNjJ75HT0/J8j/8an5R8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2961,23 +3006,18 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, std-_debug, luaOlder }: +std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; - version = "git-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/normalize.git", - "rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c", - "date": "2022-01-02T16:33:35-08:00", - "path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize", - "sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "2.0.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/std.normalize-2.0.3-1.rockspec"; + sha256 = "1l83ikiaw4dch2r69cxpl93b9d4wf54vbjb6fcggnkxxgm0amj3a"; + }).outPath; + src = fetchzip { + url = "http://github.com/lua-stdlib/normalize/archive/v2.0.3.zip"; + sha256 = "1gyywglxd2y7ck3hk8ap73w0x7hf9irpg6vgs8yc6k9k4c5g3fgi"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; @@ -2989,7 +3029,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, luaAtLeast, fetchzip, lua, luaOlder }: +stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -3013,7 +3053,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ luafilesystem, buildLuarocksPackage, dkjson, cyan, fetchgit }: +teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -3027,12 +3067,13 @@ buildLuarocksPackage { "date": "2022-12-21T20:33:53-06:00", "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", + "hash": "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ cyan dkjson luafilesystem ]; @@ -3043,17 +3084,17 @@ buildLuarocksPackage { }; }) {}; -telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "0.4.0-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; - sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + url = "mirror://luarocks/telescope-manix-0.5.0-1.rockspec"; + sha256 = "0i5q9sr0vn0w6yqg530jx2fx52k9jr7rss4ibl49f1x3wv6sckv1"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; - sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + url = "https://github.com/mrcjkb/telescope-manix/archive/0.5.0.zip"; + sha256 = "093vkh822ycnc1pri3zmzzqnz235xxam3z1l67zyyqlc1apbarax"; }; disabled = (luaOlder "5.1"); @@ -3066,7 +3107,7 @@ buildLuarocksPackage { }; }) {}; -telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +telescope-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, plenary-nvim }: buildLuarocksPackage { pname = "telescope.nvim"; version = "scm-1"; @@ -3076,16 +3117,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-telescope/telescope.nvim", - "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", - "date": "2023-02-26T13:26:12+01:00", - "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", - "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "rev": "74ce793a60759e3db0d265174f137fb627430355", + "date": "2023-10-11T12:29:23+02:00", + "path": "/nix/store/7k50qqgamc2ldxdf54jqs8sy8m8vcfzr-telescope.nvim", + "sha256": "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4", + "hash": "sha256-RN1J2va4E/HBfaZ1qVvohJvyR4wYhylOqfJ65E8Cm9Q=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; @@ -3097,26 +3139,27 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; - version = "0.15.1-1"; + version = "0.15.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.15.1-1.rockspec"; - sha256 = "0f9wr91pxcvx43jp9ma4yb6f0r9yrc2fm437nx7xm0dyh7kac9p6"; + url = "mirror://luarocks/tl-0.15.2-1.rockspec"; + sha256 = "1qisdflgikry0jdqvnzdcqib2svbafp10n0gfwm3fcrzqsdxy0xr"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "a10fb2c69827c1b0f8e1b8a5c848a06d6da5d3be", - "date": "2023-01-23T18:14:26-03:00", - "path": "/nix/store/x5p9v443g53sz2c8rvxa465gzfiv47wb-tl", - "sha256": "0hql1274wxji54cadalv4j3k82vd9xasvi119cdnm16mh85ir70s", + "rev": "d2fc36b5ff9a52d7265e63eb74cce70fd1cdbcb2", + "date": "2023-04-27T11:28:21-03:00", + "path": "/nix/store/ramhj3a29lrn0bblbgyxn4712a7caq8k-tl", + "sha256": "1dgldi9pgg23iz3xis4i43bnvkwirh7kkycmr5xp75s2cc85zhg0", + "hash": "sha256-4MFfEGNCl3N7yZX5OQ/Mkc9t1yCR6NjHj0O8d1Ns9LU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; @@ -3128,7 +3171,7 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "toml"; version = "0.3.0-0"; @@ -3142,12 +3185,13 @@ buildLuarocksPackage { "date": "2023-02-19T23:00:49-05:00", "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", + "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3160,7 +3204,7 @@ buildLuarocksPackage { }; }) {}; -toml-edit = callPackage({ luaOlder, luarocks-build-rust-mlua, buildLuarocksPackage, lua, fetchgit }: +toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; version = "0.1.4-1"; @@ -3174,12 +3218,13 @@ buildLuarocksPackage { "date": "2023-10-02T16:54:10+02:00", "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", + "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; @@ -3192,7 +3237,7 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ fetchgit, lua, buildLuarocksPackage, luaOlder }: +vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -3203,12 +3248,13 @@ buildLuarocksPackage { "date": "2020-05-06T23:13:06-04:00", "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "hash": "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3219,26 +3265,27 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, fetchgit, busted }: +vusted = callPackage({ buildLuarocksPackage, busted, fetchgit, fetchurl }: buildLuarocksPackage { pname = "vusted"; - version = "2.2.0-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.2.0-1.rockspec"; - sha256 = "1ri96pdwhck1sbdnkqj9ksv9hs86pv8v2f6vl25696v9snp9jkzs"; + url = "mirror://luarocks/vusted-2.3.1-1.rockspec"; + sha256 = "03h7l12xk43rql9vxb5nzfimx9srwaazx2r3j2zm1ba2qz06h0qc"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/notomo/vusted.git", - "rev": "f142170d3b802f6cedfcff67b945a260087ecf65", - "date": "2023-01-03T11:23:56+09:00", - "path": "/nix/store/la7h2a39wnjkdg1fzhkgw3hbrhs4c5kf-vusted", - "sha256": "17pdwaqjfkv2b7a801k5fdg2s0s75miiilfdjgmsyv7phighvkvw", + "rev": "2bc6818a756e47240d9284f1dfac21b011ca84ea", + "date": "2023-10-09T11:47:28+09:00", + "path": "/nix/store/jq2yl4adpnyilp3yyw161j1a29bwahqi-vusted", + "sha256": "04lxc78n3h1qhby6b4k9x8hb1c3sgqdid71fsvyg4y6j7rb55a8z", + "hash": "sha256-H6lSVj7SePL81i6cFht+erCwIOppkmX8gjjAYdFhnRI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ busted ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ba36225a13b75..e62b32ce6b60e 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -117,12 +117,6 @@ with prev; ''; }); - cyrussasl = prev.cyrussasl.overrideAttrs (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = cyrus_sasl; } - ]; - }); - fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles @@ -322,7 +316,7 @@ with prev; externalDeps = [ { name = "EVENT"; dep = libevent; } ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaexpat.overrideAttrs (_: { @@ -386,6 +380,11 @@ with prev; ]; }); + # lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { + # # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + # meta.broken = true; + # }); + lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -525,8 +524,21 @@ with prev; ''; }); - readline = prev.readline.overrideAttrs (oa: { - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ]; + readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: + buildLuarocksPackage ({ + pname = "readline"; + version = "3.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + extraVariables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -535,9 +547,19 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - # Without this, source root is wrongly set to ./readline-2.6/doc - sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; - }); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua luaposix + readline.out + ]; + + meta = { + homepage = "http://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; + })) {}; + sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/pkgs/development/misc/haskell/changelog-d/changelog-d.nix b/pkgs/development/misc/haskell/changelog-d/changelog-d.nix deleted file mode 100644 index 7abc707540ce4..0000000000000 --- a/pkgs/development/misc/haskell/changelog-d/changelog-d.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, base, bytestring, cabal-install-parsers -, Cabal-syntax, containers, directory, fetchgit, filepath -, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty -, regex-applicative -}: -mkDerivation { - pname = "changelog-d"; - version = "0.1"; - src = fetchgit { - url = "https://codeberg.org/fgaz/changelog-d"; - sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; - rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; - fetchSubmodules = true; - }; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cabal-install-parsers Cabal-syntax containers - directory filepath generic-lens-lite mtl parsec pretty - regex-applicative - ]; - executableHaskellDepends = [ - base bytestring Cabal-syntax directory filepath - optparse-applicative - ]; - doHaddock = false; - description = "Concatenate changelog entries into a single one"; - license = lib.licenses.gpl3Plus; - mainProgram = "changelog-d"; -} diff --git a/pkgs/development/misc/haskell/changelog-d/default.nix b/pkgs/development/misc/haskell/changelog-d/default.nix index e4ba565808cf6..7abc707540ce4 100644 --- a/pkgs/development/misc/haskell/changelog-d/default.nix +++ b/pkgs/development/misc/haskell/changelog-d/default.nix @@ -1,51 +1,30 @@ -{ callPackage -, lib -, pkgs +{ mkDerivation, base, bytestring, cabal-install-parsers +, Cabal-syntax, containers, directory, fetchgit, filepath +, generic-lens-lite, lib, mtl, optparse-applicative, parsec, pretty +, regex-applicative }: - -(callPackage ./changelog-d.nix { }).overrideAttrs (finalAttrs: oldAttrs: { - - version = oldAttrs.version + "-git-${lib.strings.substring 0 7 oldAttrs.src.rev}"; - - passthru.updateScript = lib.getExe (pkgs.writeShellApplication { - name = "update-changelog-d"; - runtimeInputs = [ - pkgs.cabal2nix - ]; - text = '' - cd pkgs/development/misc/haskell/changelog-d - cabal2nix https://codeberg.org/fgaz/changelog-d >changelog-d.nix - ''; - }); - passthru.tests = { - basic = pkgs.runCommand "changelog-d-basic-test" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - } '' - mkdir changelogs - cat > changelogs/config <<EOF - organization: NixOS - repository: boondoggle - EOF - cat > changelogs/a <<EOF - synopsis: Support numbers with incrementing base-10 digits - issues: #1234 - description: { - This didn't work before. - } - EOF - changelog-d changelogs >$out - cat -n $out - echo Checking the generated output - set -x - grep -F 'Support numbers with incrementing base-10 digits' $out >/dev/null - grep -F 'https://github.com/NixOS/boondoggle/issues/1234' $out >/dev/null - set +x - ''; +mkDerivation { + pname = "changelog-d"; + version = "0.1"; + src = fetchgit { + url = "https://codeberg.org/fgaz/changelog-d"; + sha256 = "0r0gr3bl88am9jivic3i8lfi9l5v1dj7xx4fvw6hhy3wdx7z50z7"; + rev = "2816ddb78cec8b7fa4462c25028437ebfe3ad314"; + fetchSubmodules = true; }; - - meta = oldAttrs.meta // { - homepage = "https://codeberg.org/fgaz/changelog-d"; - maintainers = [ lib.maintainers.roberth ]; - }; - -}) + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cabal-install-parsers Cabal-syntax containers + directory filepath generic-lens-lite mtl parsec pretty + regex-applicative + ]; + executableHaskellDepends = [ + base bytestring Cabal-syntax directory filepath + optparse-applicative + ]; + doHaddock = false; + description = "Concatenate changelog entries into a single one"; + license = lib.licenses.gpl3Plus; + mainProgram = "changelog-d"; +} diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 113cabc0440f6..6c409a18e7aad 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: { libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.WebKit + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.MetalKit + darwin.apple_sdk.frameworks.WebKit ]; meta = with lib; { diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 8aed144ff65c2..56c644af140ac 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # logic was not fixed. So we must disable it. '' substituteInPlace configure --replace 'noconfigdirs target-newlib target-libgloss' 'noconfigdirs' + substituteInPlace configure --replace 'cross_only="target-libgloss target-newlib' 'cross_only="' ''; diff --git a/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch new file mode 100644 index 0000000000000..52d5e6adfe74e --- /dev/null +++ b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch @@ -0,0 +1,42 @@ +diff -ur a/decoder.c b/decoder.c +--- a/decoder.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/decoder.c 2023-11-08 17:42:43.981838074 -0500 +@@ -94,7 +94,7 @@ + return PlaceObject(ctx, PyBool_FromLong((long)(value))); + } + +-static int handle_number(void *ctx, const char *value, unsigned int length) ++static int handle_number(void *ctx, const char *value, size_t length) + { + //fprintf(stderr, "handle_number: "); + //fwrite(value, length, 1, stderr); +@@ -127,7 +127,7 @@ + return status; + } + +-static int handle_string(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_string(void *ctx, const unsigned char *value, size_t length) + { + return PlaceObject(ctx, PyString_FromStringAndSize((char *)value, length)); + } +@@ -142,7 +142,7 @@ + return success; + } + +-static int handle_dict_key(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_dict_key(void *ctx, const unsigned char *value, size_t length) + { + PyObject *object = PyString_FromStringAndSize((const char *) value, length); + +diff -ur a/yajl.c b/yajl.c +--- a/yajl.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/yajl.c 2023-11-08 17:41:18.781350335 -0500 +@@ -161,7 +161,7 @@ + } + + static struct PyMethodDef yajl_methods[] = { +- {"dumps", (PyCFunctionWithKeywords)(py_dumps), METH_VARARGS | METH_KEYWORDS, ++ {"dumps", (PyCFunction)(py_dumps), METH_VARARGS | METH_KEYWORDS, + "yajl.dumps(obj [, indent=None])\n\n\ + Returns an encoded JSON string of the specified `obj`\n\ + \n\ diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 3e7dbc8e0108c..2459c492ebc04 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -42,6 +42,10 @@ rec { hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; + patches = [ + # Fixes several incompatible function pointer conversions, which are errors in clang 16. + ./0014-clang_incompatible_function_pointer_conversions.patch + ]; # just for submodule IIRC nativeBuildInputs = [ git ]; }; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5963f7ebdf4f4..8041c85ff10a2 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "DSzEEkbMYbAUVlhy7fg+BzccoRuSQzqHbIPGxGv19OJ2WKwS3/9ChAnQcII4g+GujcHhyJ8BUuOVAx/S5uAfQg=="; }; }; - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@akryum/winattr-3.0.0" = { @@ -67,33 +67,6 @@ let sha512 = "3yWxPTq3UQ/FY9p1ErPxIyfT64elWaMvM9lIHnaqpyft63tkxodF5aUElYHrdisWve5cETkh1+KBw1yJuW0aRw=="; }; }; - "@alcalzone/jsonl-db-3.1.0" = { - name = "_at_alcalzone_slash_jsonl-db"; - packageName = "@alcalzone/jsonl-db"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/jsonl-db/-/jsonl-db-3.1.0.tgz"; - sha512 = "Wc1nxOyJVBF0NWrG1X7SQcb6mWWtr2i9e1cOSHQsjmnHlBYlFoj82fsP1NCZrHdXBhqQyYpdXP8ZQ8zz0iddFQ=="; - }; - }; - "@alcalzone/pak-0.9.0" = { - name = "_at_alcalzone_slash_pak"; - packageName = "@alcalzone/pak"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.9.0.tgz"; - sha512 = "to2mQdMPxu/fF3at1QozRfEqrKTv7p0kLFXdv/kadjFm9Tph5JZCPC+gzQQhe5Cw2pQc8JkbmvOasENNHlezPQ=="; - }; - }; - "@alcalzone/proper-lockfile-4.1.3-0" = { - name = "_at_alcalzone_slash_proper-lockfile"; - packageName = "@alcalzone/proper-lockfile"; - version = "4.1.3-0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/proper-lockfile/-/proper-lockfile-4.1.3-0.tgz"; - sha512 = "8mlX3l5Xc+pYyiK9G156NyMosNuvvukL+TtNMqw7ti2zgVpz+WqPMPb2J1WU8I03Jbm4cXF+Q0D53hWvQqLQ0Q=="; - }; - }; "@alloc/quick-lru-5.2.0" = { name = "_at_alloc_slash_quick-lru"; packageName = "@alloc/quick-lru"; @@ -112,31 +85,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1602.9" = { + "@angular-devkit/architect-0.1700.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1602.9"; + version = "0.1700.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz"; - sha512 = "U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.0.tgz"; + sha512 = "whi7HvOjv1J3He9f+H8xNJWKyjAmWuWNl8gxNW6EZP/XLcrOu+/5QT4bPtXQBRIL/avZuc++5sNQS+kReaNCig=="; }; }; - "@angular-devkit/core-16.2.9" = { + "@angular-devkit/core-17.0.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz"; - sha512 = "dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-17.0.0.tgz"; + sha512 = "QUu3LnEi4A8t733v2+I0sLtyBJx3Q7zdTAhaauCbxbFhDid0cbYm8hYsyG/njor1irTPxSJbn6UoetVkwUQZxg=="; }; }; - "@angular-devkit/schematics-16.2.9" = { + "@angular-devkit/schematics-17.0.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz"; - sha512 = "lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.0.0.tgz"; + sha512 = "LD7fjDORuBf139/oJ/gSwbIzQPfsm6Y67s1FD+XLi0QXaRt6dw4r7BMD08l1r//oPQofNgbEH4coGVO4NdCL/A=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -319,13 +292,13 @@ let sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; }; }; - "@astrojs/compiler-2.2.1" = { + "@astrojs/compiler-2.3.0" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.2.1.tgz"; - sha512 = "NJ1lWKzMkyEjE3W5NpPNAVot4/PLF5om/P6ekxNu3iLS05CaYFTcp7WpYMjdCC252b7wkNVAs45FNkVQ+RHW/g=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.3.0.tgz"; + sha512 = "pxYRAaRdMS6XUll8lbFM+Lr0DI1HKIDT+VpiC+S+9di5H/nmm3znZOgdMlLiMxADot+56eps+M1BvtKfQremXA=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -436,13 +409,13 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; - "@aws-sdk/client-cloudformation-3.441.0" = { + "@aws-sdk/client-cloudformation-3.445.0" = { name = "_at_aws-sdk_slash_client-cloudformation"; packageName = "@aws-sdk/client-cloudformation"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.441.0.tgz"; - sha512 = "AeeSHYhEAUwV9ixw63i9QC4W8/EMKkHWJOo3tx8hMT9T5ZYNGz+SKaWFvS/3g0BQPneU7H3D/HurTKF2IbSc7g=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.445.0.tgz"; + sha512 = "rhkU/a5iV1ntUw0ggfde8DRkjdRHmPEwlThZF/TT7leEhRKG97gJo7VztwwsSwrXeNPgXrhn0Qse2VaPDTFdVQ=="; }; }; "@aws-sdk/client-s3-3.296.0" = { @@ -454,13 +427,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.441.0" = { + "@aws-sdk/client-s3-3.445.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.441.0.tgz"; - sha512 = "tJUhHk4Nvakw/q3IVI2oDFCu48DzuPCMu2G3n42JPyvmY0RvmtRjduduoG1lYIGgRKJu81/MFr9i8CGYNK+/5A=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.445.0.tgz"; + sha512 = "2G+3MnO78irZRjlfkdvtlKRQ3yuOfrRMg8mztKpMw0q/9WHtwCcmaUUpl1bXwJ+BcNTVHopLQXdbzCeaxxI92w=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -472,13 +445,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.441.0" = { + "@aws-sdk/client-sso-3.445.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.441.0.tgz"; - sha512 = "gndGymu4cEIN7WWhQ67RO0JMda09EGBlay2L8IKCHBK/65Y34FHUX1tCNbO2qezEzsi6BPW5o2n53Rd9QqpHUw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.445.0.tgz"; + sha512 = "me4LvqNnu6kxi+sW7t0AgMv1Yi64ikas0x2+5jv23o6Csg32w0S0xOjCTKQYahOA5CMFunWvlkFIfxbqs+Uo7w=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -499,13 +472,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.441.0" = { + "@aws-sdk/client-sts-3.445.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.441.0.tgz"; - sha512 = "GL0Cw2v7XL1cn0T+Sk5VHLlgBJoUdMsysXsHa1mFdk0l6XHMAAnwXVXiNnjmoDSPrG0psz7dL2AKzPVRXbIUjA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.445.0.tgz"; + sha512 = "ogbdqrS8x9O5BTot826iLnTQ6i4/F5BSi/74gycneCxYmAnYnyUBNOWVnynv6XZiEWyDJQCU2UtMd52aNGW1GA=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -517,13 +490,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.441.0" = { + "@aws-sdk/core-3.445.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.441.0.tgz"; - sha512 = "gV0eQwR0VnSPUYAbgDkbBtfXbSpZgl/K6UB13DP1IFFjQYbF/BxYwvcQe4jHoPOBifSgjEbl8MfOOeIyI7k9vg=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.445.0.tgz"; + sha512 = "6GYLElUG1QTOdmXG8zXa+Ull9IUeSeItKDYHKzHYfIkbsagMfYlf7wm9XIYlatjtgodNfZ3gPHAJfRyPmwKrsg=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -562,13 +535,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.441.0" = { + "@aws-sdk/credential-provider-ini-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.441.0.tgz"; - sha512 = "SQipQYxYqDUuSOfIhDmaTdwPTcndGQotGZXWJl56mMWqAhU8MkwjK+oMf3VgRt/umJC0QwUCF5HUHIj7gSB1JA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.445.0.tgz"; + sha512 = "R7IYSGjNZ5KKJwQJ2HNPemjpAMWvdce91i8w+/aHfqeGfTXrmYJu99PeGRyyBTKEumBaojyjTRvmO8HzS+/l7g=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -580,13 +553,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.441.0" = { + "@aws-sdk/credential-provider-node-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.441.0.tgz"; - sha512 = "WB9p37yHq6fGJt6Vll29ijHbkh9VDbPM/n5ns73bTAgFD7R0ht5kPmdmHGQA6m3RKjcHLPbymQ3lXykkMwWf/Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.445.0.tgz"; + sha512 = "zI4k4foSjQRKNEsouculRcz7IbLfuqdFxypDLYwn+qPNMqJwWJ7VxOOeBSPUpHFcd7CLSfbHN2JAhQ7M02gPTA=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -616,13 +589,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.441.0" = { + "@aws-sdk/credential-provider-sso-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.441.0.tgz"; - sha512 = "pTg16G+62mWCE8yGKuQnEBqPdpG5g71remf2jUqXaI1c7GCzbnkQDV9eD4DaAGOvzIs0wo9zAQnS2kVDPFlCYA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.445.0.tgz"; + sha512 = "gJz7kAiDecdhtApgXnxfZsXKsww8BnifDF9MAx9Dr4X6no47qYsCCS3XPuEyRiF9VebXvHOH0H260Zp3bVyniQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -742,13 +715,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.441.0" = { + "@aws-sdk/lib-storage-3.445.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.441.0.tgz"; - sha512 = "Olj/kVIhJo9Cvw06dzn0uQ8M29L7Vu8tSj4MHCewH0goJ0GGIclOf83uVofMZO94zG7X/bv6+4CtNBJIhlokQw=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.445.0.tgz"; + sha512 = "sCP3lh71oMkx/B3+tSOGr81cff1Z1Yy5ejh5xa/YuH6OefQUFBM7/EC0CJiNfVXemh3D6O+biKETL+t2rAiZoQ=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -1084,13 +1057,13 @@ let sha512 = "xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg=="; }; }; - "@aws-sdk/s3-presigned-post-3.441.0" = { + "@aws-sdk/s3-presigned-post-3.445.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.441.0.tgz"; - sha512 = "IW8Q7wo7ACEcUjdzNeS6Ql7mMLjZVoxXssgrFCSlpdeykTXuD7Tx8frp7qCxzFKPm4sqtcGjmbTDRapZYJWlbQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.445.0.tgz"; + sha512 = "TBhusn9hrC9xkRkV9wP9TxP5f1t7QclWMBBuvsW60ybbbdPfRA5dRYnuXKQlfjQ7DcQO7K/YLElWAPfBcbJiwg=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1102,13 +1075,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.441.0" = { + "@aws-sdk/s3-request-presigner-3.445.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.441.0.tgz"; - sha512 = "EUVsmy92imURMLoA/MX+PL1SIONQ8YSi424BHJA6xGEoaqvQiaVKlv8jJfCqJ6qQ8oLiCLe2hOBSBTY1XZiy/g=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.445.0.tgz"; + sha512 = "UZrtfYdwkNfPkdCYdLYSshTBHkK1W1f3qf011f5P99sxC5nahBnBiLRMeTeKAxveIkAHKqYKlMVa/+gD65d5yA=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1561,6 +1534,15 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; + "@azure/core-rest-pipeline-1.10.1" = { + name = "_at_azure_slash_core-rest-pipeline"; + packageName = "@azure/core-rest-pipeline"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; "@azure/core-rest-pipeline-1.12.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; @@ -1588,6 +1570,15 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; + "@azure/core-util-1.2.0" = { + name = "_at_azure_slash_core-util"; + packageName = "@azure/core-util"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; + }; + }; "@azure/core-util-1.6.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; @@ -1651,6 +1642,15 @@ let sha512 = "Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg=="; }; }; + "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { + name = "_at_azure_slash_opentelemetry-instrumentation-azure-sdk"; + packageName = "@azure/opentelemetry-instrumentation-azure-sdk"; + version = "1.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5.tgz"; + sha512 = "fsUarKQDvjhmBO4nIfaZkfNSApm1hZBzcvpNbSrXdcUBxu7lRvKsV5DnwszX7cnhLyVOW9yl1uigtRQ1yDANjA=="; + }; + }; "@azure/storage-blob-12.11.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; @@ -1705,22 +1705,22 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.23.2" = { + "@babel/compat-data-7.23.3" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz"; - sha512 = "0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz"; + sha512 = "BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="; }; }; - "@babel/core-7.23.2" = { + "@babel/core-7.23.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz"; - sha512 = "n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz"; + sha512 = "Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew=="; }; }; "@babel/generator-7.17.7" = { @@ -1741,13 +1741,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.23.0" = { + "@babel/generator-7.23.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"; - sha512 = "lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz"; + sha512 = "keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg=="; }; }; "@babel/helper-annotate-as-pure-7.22.5" = { @@ -1849,13 +1849,13 @@ let sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; }; }; - "@babel/helper-module-transforms-7.23.0" = { + "@babel/helper-module-transforms-7.23.3" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"; - sha512 = "WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; + sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; }; }; "@babel/helper-optimise-call-expression-7.22.5" = { @@ -1993,31 +1993,40 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.23.0" = { + "@babel/parser-7.23.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"; - sha512 = "vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz"; + sha512 = "uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz"; - sha512 = "FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg=="; + url = "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"; + sha512 = "iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.22.15"; + version = "7.23.3"; + src = fetchurl { + url = "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"; + sha512 = "WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ=="; + }; + }; + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" = { + name = "_at_babel_slash_plugin-bugfix-v8-static-class-fields-redefine-readonly"; + packageName = "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz"; - sha512 = "Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz"; + sha512 = "XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -2038,22 +2047,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-decorators-7.23.2" = { + "@babel/plugin-proposal-decorators-7.23.3" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz"; - sha512 = "eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.3.tgz"; + sha512 = "u8SwzOcP0DYSsa++nHd/9exlHb0NAlHCb890qtZZbSwPX2bFv8LBEztxwN7Xg/dS8oAFFidhrI9PBcLBJSkGRQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.22.17" = { + "@babel/plugin-proposal-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.22.17"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.22.17.tgz"; - sha512 = "cop/3quQBVvdz6X5SJC6AhUv3C9DrVTM06LUEXimEdWAhCSyOJIr9NiZDU9leHZ0/aiG0Sh7Zmvaku5TWYNgbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.23.3.tgz"; + sha512 = "Q23MpLZfSGZL1kU7fWqV262q65svLSCIP5kZ/JCW/rKTCm/FrLjpvEd2kfUYMVeHh4QhV/xzyoRAHWrAZJrE3Q=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -2128,13 +2137,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.22.10" = { + "@babel/plugin-syntax-decorators-7.23.3" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz"; - sha512 = "z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz"; + sha512 = "cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -2146,13 +2155,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.22.5" = { + "@babel/plugin-syntax-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.22.5.tgz"; - sha512 = "ODAqWWXB/yReh/jVQDag/3/tl6lgBueQkk/TcfW/59Oykm4c8a55XloX0CTk2k2VJiFWMgHby9xNX29IbCv9dQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.23.3.tgz"; + sha512 = "KeENO5ck1IeZ/l2lFZNy+mpobV3D2Zy5C1YFnWm+YuY5mQiAWc4yAp13dqgguwsBsFVLh4LPCEqCa5qW13N+hw=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -2164,31 +2173,31 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.22.5" = { + "@babel/plugin-syntax-flow-7.23.3" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz"; - sha512 = "9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz"; + sha512 = "YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA=="; }; }; - "@babel/plugin-syntax-import-assertions-7.22.5" = { + "@babel/plugin-syntax-import-assertions-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz"; - sha512 = "rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz"; + sha512 = "lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw=="; }; }; - "@babel/plugin-syntax-import-attributes-7.22.5" = { + "@babel/plugin-syntax-import-attributes-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-attributes"; packageName = "@babel/plugin-syntax-import-attributes"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz"; - sha512 = "KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz"; + sha512 = "pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -2209,13 +2218,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.22.5" = { + "@babel/plugin-syntax-jsx-7.23.3" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz"; - sha512 = "gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz"; + sha512 = "EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -2290,13 +2299,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.22.5" = { + "@babel/plugin-syntax-typescript-7.23.3" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz"; - sha512 = "1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz"; + sha512 = "9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ=="; }; }; "@babel/plugin-syntax-unicode-sets-regex-7.18.6" = { @@ -2308,238 +2317,238 @@ let sha512 = "727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg=="; }; }; - "@babel/plugin-transform-arrow-functions-7.22.5" = { + "@babel/plugin-transform-arrow-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"; - sha512 = "26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; + sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; }; }; - "@babel/plugin-transform-async-generator-functions-7.23.2" = { + "@babel/plugin-transform-async-generator-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-generator-functions"; packageName = "@babel/plugin-transform-async-generator-functions"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz"; - sha512 = "BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz"; + sha512 = "59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.22.5" = { + "@babel/plugin-transform-async-to-generator-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"; - sha512 = "b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; + sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.22.5" = { + "@babel/plugin-transform-block-scoped-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"; - sha512 = "tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; + sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.0" = { + "@babel/plugin-transform-block-scoping-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"; - sha512 = "cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz"; + sha512 = "QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw=="; }; }; - "@babel/plugin-transform-class-properties-7.22.5" = { + "@babel/plugin-transform-class-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-properties"; packageName = "@babel/plugin-transform-class-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz"; - sha512 = "nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz"; + sha512 = "uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg=="; }; }; - "@babel/plugin-transform-class-static-block-7.22.11" = { + "@babel/plugin-transform-class-static-block-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-static-block"; packageName = "@babel/plugin-transform-class-static-block"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz"; - sha512 = "GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz"; + sha512 = "PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ=="; }; }; - "@babel/plugin-transform-classes-7.22.15" = { + "@babel/plugin-transform-classes-7.23.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"; - sha512 = "VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz"; + sha512 = "FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w=="; }; }; - "@babel/plugin-transform-computed-properties-7.22.5" = { + "@babel/plugin-transform-computed-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"; - sha512 = "4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; + sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; }; }; - "@babel/plugin-transform-destructuring-7.23.0" = { + "@babel/plugin-transform-destructuring-7.23.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"; - sha512 = "vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; + sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.22.5" = { + "@babel/plugin-transform-dotall-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"; - sha512 = "5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; + sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.22.5" = { + "@babel/plugin-transform-duplicate-keys-7.23.3" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"; - sha512 = "dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; + sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; }; }; - "@babel/plugin-transform-dynamic-import-7.22.11" = { + "@babel/plugin-transform-dynamic-import-7.23.3" = { name = "_at_babel_slash_plugin-transform-dynamic-import"; packageName = "@babel/plugin-transform-dynamic-import"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz"; - sha512 = "g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz"; + sha512 = "vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.22.5" = { + "@babel/plugin-transform-exponentiation-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"; - sha512 = "vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; + sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; }; }; - "@babel/plugin-transform-export-namespace-from-7.22.11" = { + "@babel/plugin-transform-export-namespace-from-7.23.3" = { name = "_at_babel_slash_plugin-transform-export-namespace-from"; packageName = "@babel/plugin-transform-export-namespace-from"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz"; - sha512 = "xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz"; + sha512 = "yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.22.5" = { + "@babel/plugin-transform-flow-strip-types-7.23.3" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz"; - sha512 = "tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz"; + sha512 = "26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q=="; }; }; - "@babel/plugin-transform-for-of-7.22.15" = { + "@babel/plugin-transform-for-of-7.23.3" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"; - sha512 = "me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz"; + sha512 = "X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw=="; }; }; - "@babel/plugin-transform-function-name-7.22.5" = { + "@babel/plugin-transform-function-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"; - sha512 = "UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; + sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; }; }; - "@babel/plugin-transform-json-strings-7.22.11" = { + "@babel/plugin-transform-json-strings-7.23.3" = { name = "_at_babel_slash_plugin-transform-json-strings"; packageName = "@babel/plugin-transform-json-strings"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz"; - sha512 = "CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz"; + sha512 = "H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A=="; }; }; - "@babel/plugin-transform-literals-7.22.5" = { + "@babel/plugin-transform-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"; - sha512 = "fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; + sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; }; }; - "@babel/plugin-transform-logical-assignment-operators-7.22.11" = { + "@babel/plugin-transform-logical-assignment-operators-7.23.3" = { name = "_at_babel_slash_plugin-transform-logical-assignment-operators"; packageName = "@babel/plugin-transform-logical-assignment-operators"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz"; - sha512 = "qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz"; + sha512 = "+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.22.5" = { + "@babel/plugin-transform-member-expression-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"; - sha512 = "RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; + sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.0" = { + "@babel/plugin-transform-modules-amd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"; - sha512 = "xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; + sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.0" = { + "@babel/plugin-transform-modules-commonjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"; - sha512 = "32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; + sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.23.0" = { + "@babel/plugin-transform-modules-systemjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"; - sha512 = "qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; + sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.22.5" = { + "@babel/plugin-transform-modules-umd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"; - sha512 = "+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; + sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { @@ -2551,112 +2560,112 @@ let sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; }; }; - "@babel/plugin-transform-new-target-7.22.5" = { + "@babel/plugin-transform-new-target-7.23.3" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"; - sha512 = "AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; + sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; }; }; - "@babel/plugin-transform-nullish-coalescing-operator-7.22.11" = { + "@babel/plugin-transform-nullish-coalescing-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-nullish-coalescing-operator"; packageName = "@babel/plugin-transform-nullish-coalescing-operator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz"; - sha512 = "YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz"; + sha512 = "xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA=="; }; }; - "@babel/plugin-transform-numeric-separator-7.22.11" = { + "@babel/plugin-transform-numeric-separator-7.23.3" = { name = "_at_babel_slash_plugin-transform-numeric-separator"; packageName = "@babel/plugin-transform-numeric-separator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz"; - sha512 = "3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz"; + sha512 = "s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw=="; }; }; - "@babel/plugin-transform-object-rest-spread-7.22.15" = { + "@babel/plugin-transform-object-rest-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-rest-spread"; packageName = "@babel/plugin-transform-object-rest-spread"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz"; - sha512 = "fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz"; + sha512 = "VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog=="; }; }; - "@babel/plugin-transform-object-super-7.22.5" = { + "@babel/plugin-transform-object-super-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"; - sha512 = "klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; + sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; }; }; - "@babel/plugin-transform-optional-catch-binding-7.22.11" = { + "@babel/plugin-transform-optional-catch-binding-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-catch-binding"; packageName = "@babel/plugin-transform-optional-catch-binding"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz"; - sha512 = "rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz"; + sha512 = "LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A=="; }; }; - "@babel/plugin-transform-optional-chaining-7.23.0" = { + "@babel/plugin-transform-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"; - sha512 = "sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz"; + sha512 = "zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg=="; }; }; - "@babel/plugin-transform-parameters-7.22.15" = { + "@babel/plugin-transform-parameters-7.23.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"; - sha512 = "hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; + sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; }; }; - "@babel/plugin-transform-private-methods-7.22.5" = { + "@babel/plugin-transform-private-methods-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-methods"; packageName = "@babel/plugin-transform-private-methods"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz"; - sha512 = "PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz"; + sha512 = "UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g=="; }; }; - "@babel/plugin-transform-private-property-in-object-7.22.11" = { + "@babel/plugin-transform-private-property-in-object-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-property-in-object"; packageName = "@babel/plugin-transform-private-property-in-object"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz"; - sha512 = "sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz"; + sha512 = "a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA=="; }; }; - "@babel/plugin-transform-property-literals-7.22.5" = { + "@babel/plugin-transform-property-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"; - sha512 = "TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; + sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; }; }; - "@babel/plugin-transform-react-display-name-7.22.5" = { + "@babel/plugin-transform-react-display-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz"; - sha512 = "PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz"; + sha512 = "GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw=="; }; }; "@babel/plugin-transform-react-jsx-7.22.15" = { @@ -2668,139 +2677,139 @@ let sha512 = "oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.22.5" = { + "@babel/plugin-transform-react-jsx-self-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz"; - sha512 = "nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz"; + sha512 = "qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.22.5" = { + "@babel/plugin-transform-react-jsx-source-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz"; - sha512 = "yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz"; + sha512 = "91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g=="; }; }; - "@babel/plugin-transform-regenerator-7.22.10" = { + "@babel/plugin-transform-regenerator-7.23.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"; - sha512 = "F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; + sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.22.5" = { + "@babel/plugin-transform-reserved-words-7.23.3" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"; - sha512 = "DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; + sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; }; }; - "@babel/plugin-transform-runtime-7.23.2" = { + "@babel/plugin-transform-runtime-7.23.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz"; - sha512 = "XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.3.tgz"; + sha512 = "XcQ3X58CKBdBnnZpPaQjgVMePsXtSZzHoku70q9tUAQp02ggPQNM04BF3RvlW1GSM/McbSOQAzEK4MXbS7/JFg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.22.5" = { + "@babel/plugin-transform-shorthand-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"; - sha512 = "vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; + sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; }; }; - "@babel/plugin-transform-spread-7.22.5" = { + "@babel/plugin-transform-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"; - sha512 = "5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; + sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.22.5" = { + "@babel/plugin-transform-sticky-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"; - sha512 = "zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; + sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; }; }; - "@babel/plugin-transform-template-literals-7.22.5" = { + "@babel/plugin-transform-template-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"; - sha512 = "5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; + sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.22.5" = { + "@babel/plugin-transform-typeof-symbol-7.23.3" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"; - sha512 = "bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; + sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; }; }; - "@babel/plugin-transform-typescript-7.22.15" = { + "@babel/plugin-transform-typescript-7.23.3" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz"; - sha512 = "1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.3.tgz"; + sha512 = "ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.22.10" = { + "@babel/plugin-transform-unicode-escapes-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"; - sha512 = "lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; + sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; }; }; - "@babel/plugin-transform-unicode-property-regex-7.22.5" = { + "@babel/plugin-transform-unicode-property-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-property-regex"; packageName = "@babel/plugin-transform-unicode-property-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz"; - sha512 = "HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz"; + sha512 = "KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.22.5" = { + "@babel/plugin-transform-unicode-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"; - sha512 = "028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; + sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; }; }; - "@babel/plugin-transform-unicode-sets-regex-7.22.5" = { + "@babel/plugin-transform-unicode-sets-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-sets-regex"; packageName = "@babel/plugin-transform-unicode-sets-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz"; - sha512 = "lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz"; + sha512 = "W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2812,22 +2821,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.23.2" = { + "@babel/preset-env-7.23.3" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz"; - sha512 = "BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz"; + sha512 = "ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q=="; }; }; - "@babel/preset-flow-7.22.15" = { + "@babel/preset-flow-7.23.3" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.22.15.tgz"; - sha512 = "dB5aIMqpkgbTfN5vDdTRPzjqtWiZcRESNR88QYnoPR+bmdYoluOzMX9tQerTv0XzSgZYctPfO1oc0N5zdog1ew=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.23.3.tgz"; + sha512 = "7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2839,13 +2848,13 @@ let sha512 = "HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="; }; }; - "@babel/preset-typescript-7.23.2" = { + "@babel/preset-typescript-7.23.3" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.2.tgz"; - sha512 = "u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz"; + sha512 = "17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ=="; }; }; "@babel/register-7.22.15" = { @@ -2902,6 +2911,15 @@ let sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; }; }; + "@babel/traverse-7.23.3" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.23.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz"; + sha512 = "+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ=="; + }; + }; "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2920,13 +2938,13 @@ let sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; - "@babel/types-7.23.0" = { + "@babel/types-7.23.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"; - sha512 = "0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz"; + sha512 = "OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw=="; }; }; "@bconnorwhite/module-2.0.2" = { @@ -2938,22 +2956,22 @@ let sha512 = "ck1me5WMgZKp06gnJrVKEkytpehTTQbvsAMbF1nGPeHri/AZNhj87++PSE2LOxmZqM0EtGMaqeLdx7Lw7SUnTA=="; }; }; - "@bmewburn/js-beautify-1.14.7" = { + "@bmewburn/js-beautify-1.14.9" = { name = "_at_bmewburn_slash_js-beautify"; packageName = "@bmewburn/js-beautify"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.7.tgz"; - sha512 = "+s+Lw9+SesDdh4TsZyTRn6dCohzv3ioiR4YEXR8bQ+nl8J0Cz9oy+i/7vfrlLTD47/v1O8WsitR8wqL6epeevw=="; + url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.9.tgz"; + sha512 = "PNz0Y8TElejGkQ3N6aiqoBLLa+kaIAQAgu6KFn/PN625W/t2LZVyoL68df5gRSvbpelrsczvQlVLsNp0mcJFgA=="; }; }; - "@bmewburn/vscode-html-languageserver-1.9.0" = { + "@bmewburn/vscode-html-languageserver-1.10.0" = { name = "_at_bmewburn_slash_vscode-html-languageserver"; packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.9.0.tgz"; - sha512 = "yzZ6OK0W7frfoCqvl0s3KeVUUB22wYs74Qu3Y+VGgvW7yvq5m0M82RZQWghKdtLyQejc4469QlmhQsJmCF7ULg=="; + url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.10.0.tgz"; + sha512 = "0lHL4Y1EJKHdRIEpXPZHnlIoxCKNglADDPloOYFcIoRj/O7zfRDrdPWPJgr2LeJDgXHklX6ltH6wp0Ywxa98AQ=="; }; }; "@braintree/sanitize-url-6.0.4" = { @@ -3019,40 +3037,40 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/cli-core-0.19.0" = { + "@cdktf/cli-core-0.19.1" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.19.0.tgz"; - sha512 = "iSkhxuSHEPkPCPwvcM81ytniS3v/3YT+zY/MzeKWVkaMj1hZDF3e2C5gnjOdrb0ZCFIH1+znF+aJK9LiqBoV+Q=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.19.1.tgz"; + sha512 = "wWSz1qLviUs5ErpNg1kxc3Qx5o96wofnGTL4HQn9+SAZj7ta3dwNEojp1uSs4WnpY1tDq6H7vyXKh+FA8prW7g=="; }; }; - "@cdktf/commons-0.19.0" = { + "@cdktf/commons-0.19.1" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.19.0.tgz"; - sha512 = "zhqGhx7PWa1lCa1B7RUH1qoln2emrGbGJ3kjRKMOxJxbTKdQBwFUbsaEOiOAVBm0ukTt2DX+VWQc8YPpMgSbgA=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.19.1.tgz"; + sha512 = "9X0rL5iOt3Q+CdtKeQeff09kEmZETAVbmFIZTFgdipFFR1eMQ0rGiTNFBr8ro23ZrVUbd74g/oBpc4eGirQe4A=="; }; }; - "@cdktf/hcl2cdk-0.19.0" = { + "@cdktf/hcl2cdk-0.19.1" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.19.0.tgz"; - sha512 = "43XWR/ZLZVc8amOC6GmyGFkK9doiP9DKMjEDpYEnXCl1UhdFGHHipcSK6fnc30RCIq3KFF9FTuztvUyruToRyA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.19.1.tgz"; + sha512 = "oFMUadPnDrOaMSTX1dQPuk/GFtSrk9/6B4G4CAYp9iXumqK204U0wEZYDFFEz5ieYhR86n/8YxA1GOOr0DmRZA=="; }; }; - "@cdktf/hcl2json-0.19.0" = { + "@cdktf/hcl2json-0.19.1" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.19.0.tgz"; - sha512 = "wo68qo74dTxcZWJkwlhTV+YoVopUUUTpRC8W73HWkaL/lw6GDozh4GHwphagIHYJy07Ecxdx/WTp0sGDBaFBuQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.19.1.tgz"; + sha512 = "yQ5fTOK9aLuh3WsYV+ykqv0b1X+5KjqAgxaAU+f9pXNq3ght1Z6o7+jrBsPHpylcj318Bhl0Hc/PX3U/z6M2kg=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" = { @@ -3064,22 +3082,22 @@ let sha512 = "qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw=="; }; }; - "@cdktf/provider-generator-0.19.0" = { + "@cdktf/provider-generator-0.19.1" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.19.0.tgz"; - sha512 = "+1qKfvSA4YH+i6PBbuDwj8xP5NNCsyeF5KR6S/2NqBxz/4w4xptB+h/IehiVGSHtwI2/XmL4bF3gLpNB9Q2dGg=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.19.1.tgz"; + sha512 = "Gg1DbDxhZ+CVT1uzDtvn3Q8C7MVVH1qBCAw33dLT22Faajut0ZO+/Bdai3/e81/jt4W50fN5b49MeTYG1hHRkw=="; }; }; - "@cdktf/provider-schema-0.19.0" = { + "@cdktf/provider-schema-0.19.1" = { name = "_at_cdktf_slash_provider-schema"; packageName = "@cdktf/provider-schema"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.19.0.tgz"; - sha512 = "tfl6EqzBGL+qRBc+lgtb4qZvj8J4R+htF+N6BmrFnz9NiplRJmy1xzRMZ1fsrboeH0QExlyFYdIaZ97Q3CtD7A=="; + url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.19.1.tgz"; + sha512 = "31vX00P/fw+kgTVZ0hxKIfd6rTRsj6jc1BJaOOQd5yRM3NzbZdypNVkWsEyIAWp6kmPAHzHujpv5/F7IEPZCRA=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3316,58 +3334,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-7.3.8" = { + "@cspell/cspell-bundled-dicts-8.0.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-7.3.8.tgz"; - sha512 = "Dj8iSGQyfgIsCjmXk9D/SjV7EpbpQSogeaGcBM66H33pd0GyGmLhn3biRN+vqi/vqWmsp75rT3kd5MKa8X5W9Q=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.0.0.tgz"; + sha512 = "Phbb1ij1TQQuqxuuvxf5P6fvV9U+EVoATNLmDqFHvRZfUyuhgbJuCMzIPeBx4GfTTDWlPs51FYRvZ/Q8xBHsyA=="; }; }; - "@cspell/cspell-json-reporter-7.3.8" = { + "@cspell/cspell-json-reporter-8.0.0" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-7.3.8.tgz"; - sha512 = "FxYJWtDgxIQYxdP0RWwRV8nzLfxVx8D8D5L2sbbP/0NFczDbq/zWYep4nSAHJT10aUJrogsVUYwNwdkr562wKA=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.0.0.tgz"; + sha512 = "1ltK5N4xMGWjDSIkU+GJd3rXV8buXgO/lAgnpM1RhKWqAmG+u0k6pnhk2vIo/4qZQpgfK0l3J3h/Ky2FcE95vA=="; }; }; - "@cspell/cspell-pipe-7.3.8" = { + "@cspell/cspell-pipe-8.0.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-7.3.8.tgz"; - sha512 = "/vKPfiHM5bJUkNX12w9j533Lm2JvvSMKUCChM2AxYjy6vL8prc/7ei++4g2xAWwRxLZPg2OfpDJS5EirZNBJdA=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.0.0.tgz"; + sha512 = "1MH+9q3AmbzwK1BYhSGla8e4MAAYzzPApGvv8eyv0rWDmgmDTkGqJPTTvYj1wFvll5ximQ5OolpPQGv3JoWvtQ=="; }; }; - "@cspell/cspell-resolver-7.3.8" = { + "@cspell/cspell-resolver-8.0.0" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-7.3.8.tgz"; - sha512 = "CeyQmhqZI5a+T7a6oiVN90TFlzU3qVVYqCaZ9grFrVOsmzY9ipH5gmqfgMavaBOqb0di/+VZS8d02suMOXcKLQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.0.0.tgz"; + sha512 = "gtALHFLT2vSZ7BZlIg26AY3W9gkiqxPGE75iypWz06JHJs05ngnAR+h6VOu0+rmgx98hNfzPPEh4g+Tjm8Ma0A=="; }; }; - "@cspell/cspell-service-bus-7.3.8" = { + "@cspell/cspell-service-bus-8.0.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-7.3.8.tgz"; - sha512 = "3E7gwY6QILrZH83p69i9CERbRBEqeBiKCIKnAd7U2PbxfFqG/P47fqpnarzSWFwFpU92oyGsYry+wC8TEGISRQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.0.0.tgz"; + sha512 = "1EYhIHoZnhxpfEp6Bno6yVWYBuYfaQrwIfeDMntnezUcSmi7RyroQEcp5U7sLv69vhRD2c81o7r8iUaAbPSmIg=="; }; }; - "@cspell/cspell-types-7.3.8" = { + "@cspell/cspell-types-8.0.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-7.3.8.tgz"; - sha512 = "hsOtaULDnawEL4pU0fga941GhvE8mbTbywrJBx+eGX3fnJsaUr8XQzCtnLsW2ko7WCLWFItNEhSSTPQHBFRLsw=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.0.0.tgz"; + sha512 = "dPdxQI8dLJoJEjylaPYfCJNnm2XNMYPuowHE2FMcsnFR9hEchQAhnKVc/aD63IUYnUtUrPxPlUJdoAoj569e+g=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3856,6 +3874,15 @@ let sha512 = "eeC20Q+UnHcTVBK6pgwhSjGIVugO2XqU7hv4ZfXp2F9DxGx1RME0+1sKX4qAGhdFGwOBsEzb2fwUsAEP6Mibpg=="; }; }; + "@cspell/dict-makefile-1.0.0" = { + name = "_at_cspell_slash_dict-makefile"; + packageName = "@cspell/dict-makefile"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.0.tgz"; + sha512 = "3W9tHPcSbJa6s0bcqWo6VisEDTSN5zOtDbnPabF7rbyjRpNo0uHXHRJQF8gAbFzoTzBBhgkTmrfSiuyQm7vBUQ=="; + }; + }; "@cspell/dict-node-1.0.12" = { name = "_at_cspell_slash_dict-node"; packageName = "@cspell/dict-node"; @@ -4090,22 +4117,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-7.3.8" = { + "@cspell/dynamic-import-8.0.0" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-7.3.8.tgz"; - sha512 = "s8x7dH/ScfW0pFEIvNFo4JOR7YmvM2wZSHOykmWTJCQ8k2EQ/+uECPp6ZxkoJoukTz8sj+3KzF0fRl5mKxPd6g=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.0.0.tgz"; + sha512 = "HNkCepopgiEGuI1QGA6ob4+ayvoSMxvAqetLxP0u1sZzc50LH2DEWwotcNrpVdzZOtERHvIBcGaQKIBEx8pPRQ=="; }; }; - "@cspell/strong-weak-map-7.3.8" = { + "@cspell/strong-weak-map-8.0.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-7.3.8.tgz"; - sha512 = "qNnt2wG45wb8JP54mENarnQgxfSYKPp3zlYID/2przbMNmVJRqUlcIBOdLI6plCgGeNkzJTl3T9T1ATbnN+LLw=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.0.0.tgz"; + sha512 = "fRlqPSdpdub52vFtulDgLPzGPGe75I04ScId1zOO9ABP7/ro8VmaG//m1k7hsPkm6h7FG4jWympoA3aXDAcXaA=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4225,22 +4252,31 @@ let sha512 = "RUl/439BHKshkhSGFRlZ1kzy68wL4mn8VNKDSZr3p0tciyZ33Mjfpl+vofqnHqXRmDI6nLnZpfJvhY3D88o0pA=="; }; }; - "@edge-runtime/primitives-3.1.1" = { + "@edge-runtime/ponyfill-2.4.1" = { + name = "_at_edge-runtime_slash_ponyfill"; + packageName = "@edge-runtime/ponyfill"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/ponyfill/-/ponyfill-2.4.1.tgz"; + sha512 = "ZbR/EViY3gg2rmEAQTKPa6mXl4aR1/+cFcQe4r1segCjEbTAxT6PWu40odbu/KlZKSysEb2O/BWIC2lJgSJOMQ=="; + }; + }; + "@edge-runtime/primitives-4.0.5" = { name = "_at_edge-runtime_slash_primitives"; packageName = "@edge-runtime/primitives"; - version = "3.1.1"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-3.1.1.tgz"; - sha512 = "ROO22py+KdAfzqWZu6CtVMC4qV6mS0W1jPI51jGXE+uenyBUN7cQTWB9ReQc8Bm4cnjqmhajvpqEx3j7Y9iSOg=="; + url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-4.0.5.tgz"; + sha512 = "t7QiN5d/KpXgCvIfSt6Nm9Hj3WVdNgc5CpOD73jasY+9EvTI7Ngdj5cXvjcHrPcmYWJZMySPgeEeoL/1N/Llag=="; }; }; - "@edge-runtime/vm-3.1.1" = { + "@edge-runtime/vm-3.1.7" = { name = "_at_edge-runtime_slash_vm"; packageName = "@edge-runtime/vm"; - version = "3.1.1"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.1.tgz"; - sha512 = "6NJRRG04/91qnWLZj+wZm27q6fJkTbkZdIJdo/Ig++GTxkAv8Wh/45nIcz9Xg7AzIAMpAkflFdiCrCoZ3hp1Iw=="; + url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.7.tgz"; + sha512 = "hUMFbDQ/nZN+1TLMi6iMO1QFz9RSV8yGG8S42WFPFma1d7VSNE0eMdJUmwjmtav22/iQkzHMmu6oTSfAvRGS8g=="; }; }; "@electron-forge/core-6.4.2" = { @@ -4342,13 +4378,13 @@ let sha512 = "MPAZQ4v6piCED7NT1LTVQf61o6Eg/laNoKbhbrFBSH1i20OUwbtV2MLj6Op292ynI9+1qdHKmFgctr6qPTCAQw=="; }; }; - "@electron/asar-3.2.7" = { + "@electron/asar-3.2.8" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz"; - sha512 = "8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz"; + sha512 = "cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg=="; }; }; "@electron/get-2.0.3" = { @@ -4387,13 +4423,13 @@ let sha512 = "S1vgpzIOS1wCJmsYjdLz97MTUV6UTLcMk/HE3w90HYtVxvW+PQdwxLbgsrECX2bysqcnmM5a0K6mXj/gwVgYtQ=="; }; }; - "@electron/universal-1.4.2" = { + "@electron/universal-1.4.5" = { name = "_at_electron_slash_universal"; packageName = "@electron/universal"; - version = "1.4.2"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.2.tgz"; - sha512 = "ymGwXYBUGFS1DuTqYJwZ0p1gIlELKOf21zPJefij/amzV66vTXRNJ2mAtW0uRsaHfV+pzYTJVrt5oco44DFOMg=="; + url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.5.tgz"; + sha512 = "3vE9WBQnvlulKylrPbyc+9M4xnD7t1JxuCOF0nrFz00XrrkgbqeqxDf90PNcjLiuB4hAZKr1JooVA6KwsXj94w=="; }; }; "@emmetio/abbreviation-2.3.3" = { @@ -4450,15 +4486,6 @@ let sha512 = "LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA=="; }; }; - "@esbuild/android-arm-0.15.18" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz"; - sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; - }; - }; "@esbuild/android-arm-0.17.19" = { name = "_at_esbuild_slash_android-arm"; packageName = "@esbuild/android-arm"; @@ -4477,6 +4504,15 @@ let sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; }; }; + "@esbuild/android-arm-0.19.5" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz"; + sha512 = "bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA=="; + }; + }; "@esbuild/android-arm64-0.17.19" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4495,6 +4531,15 @@ let sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; }; }; + "@esbuild/android-arm64-0.19.5" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz"; + sha512 = "5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ=="; + }; + }; "@esbuild/android-x64-0.17.19" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4513,6 +4558,15 @@ let sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; }; }; + "@esbuild/android-x64-0.19.5" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz"; + sha512 = "9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA=="; + }; + }; "@esbuild/darwin-arm64-0.17.19" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4531,6 +4585,15 @@ let sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; }; }; + "@esbuild/darwin-arm64-0.19.5" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz"; + sha512 = "mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw=="; + }; + }; "@esbuild/darwin-x64-0.17.19" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4549,6 +4612,15 @@ let sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; }; }; + "@esbuild/darwin-x64-0.19.5" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz"; + sha512 = "Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA=="; + }; + }; "@esbuild/freebsd-arm64-0.17.19" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4567,6 +4639,15 @@ let sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; }; }; + "@esbuild/freebsd-arm64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz"; + sha512 = "GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ=="; + }; + }; "@esbuild/freebsd-x64-0.17.19" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4585,6 +4666,15 @@ let sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; }; }; + "@esbuild/freebsd-x64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz"; + sha512 = "1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ=="; + }; + }; "@esbuild/linux-arm-0.17.19" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4603,6 +4693,15 @@ let sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; }; }; + "@esbuild/linux-arm-0.19.5" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz"; + sha512 = "lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ=="; + }; + }; "@esbuild/linux-arm64-0.17.19" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4621,6 +4720,15 @@ let sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; }; }; + "@esbuild/linux-arm64-0.19.5" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz"; + sha512 = "o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA=="; + }; + }; "@esbuild/linux-ia32-0.17.19" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4639,13 +4747,13 @@ let sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; }; }; - "@esbuild/linux-loong64-0.15.18" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.15.18"; + "@esbuild/linux-ia32-0.19.5" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz"; - sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz"; + sha512 = "MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ=="; }; }; "@esbuild/linux-loong64-0.17.19" = { @@ -4666,6 +4774,15 @@ let sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; }; }; + "@esbuild/linux-loong64-0.19.5" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz"; + sha512 = "42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw=="; + }; + }; "@esbuild/linux-mips64el-0.17.19" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4684,6 +4801,15 @@ let sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; }; }; + "@esbuild/linux-mips64el-0.19.5" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz"; + sha512 = "kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg=="; + }; + }; "@esbuild/linux-ppc64-0.17.19" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4702,6 +4828,15 @@ let sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; }; }; + "@esbuild/linux-ppc64-0.19.5" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz"; + sha512 = "yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q=="; + }; + }; "@esbuild/linux-riscv64-0.17.19" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4720,6 +4855,15 @@ let sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; }; }; + "@esbuild/linux-riscv64-0.19.5" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz"; + sha512 = "5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag=="; + }; + }; "@esbuild/linux-s390x-0.17.19" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4738,6 +4882,15 @@ let sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; }; }; + "@esbuild/linux-s390x-0.19.5" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz"; + sha512 = "Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw=="; + }; + }; "@esbuild/linux-x64-0.17.19" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4756,6 +4909,15 @@ let sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; }; }; + "@esbuild/linux-x64-0.19.5" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz"; + sha512 = "psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A=="; + }; + }; "@esbuild/netbsd-x64-0.17.19" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4774,6 +4936,15 @@ let sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; }; }; + "@esbuild/netbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz"; + sha512 = "kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g=="; + }; + }; "@esbuild/openbsd-x64-0.17.19" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4792,6 +4963,15 @@ let sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; }; }; + "@esbuild/openbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz"; + sha512 = "sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA=="; + }; + }; "@esbuild/sunos-x64-0.17.19" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4810,6 +4990,15 @@ let sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; }; }; + "@esbuild/sunos-x64-0.19.5" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz"; + sha512 = "dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg=="; + }; + }; "@esbuild/win32-arm64-0.17.19" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4828,6 +5017,15 @@ let sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; }; }; + "@esbuild/win32-arm64-0.19.5" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz"; + sha512 = "dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg=="; + }; + }; "@esbuild/win32-ia32-0.17.19" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4846,6 +5044,15 @@ let sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; }; }; + "@esbuild/win32-ia32-0.19.5" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz"; + sha512 = "4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw=="; + }; + }; "@esbuild/win32-x64-0.17.19" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4864,6 +5071,15 @@ let sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; }; }; + "@esbuild/win32-x64-0.19.5" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz"; + sha512 = "czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw=="; + }; + }; "@eslint-community/eslint-utils-4.4.0" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -4891,13 +5107,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-2.1.2" = { + "@eslint/eslintrc-2.1.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz"; - sha512 = "+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz"; + sha512 = "yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA=="; }; }; "@eslint/js-8.44.0" = { @@ -4909,13 +5125,13 @@ let sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; }; }; - "@eslint/js-8.52.0" = { + "@eslint/js-8.53.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz"; - sha512 = "mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz"; + sha512 = "Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -5134,31 +5350,22 @@ let sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-1.0.39" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "1.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.39.tgz"; - sha512 = "OqCCxLx9HRMFQDiZvfpOfNmGhsTrV15IUOhmbp9iIa+uO/VyPpBvXqiA4ENCN9Jmf6yXtirIranCeJcm+jAuSA=="; - }; - }; - "@expo/eas-build-job-1.0.46" = { + "@expo/eas-build-job-1.0.48" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.46"; + version = "1.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.46.tgz"; - sha512 = "f1KE3t8uvMKPSVVphXlJ70/zn5wMFB47yYM3orVZiirq2pd/0UfWYF5YiNktgEyGglxqmq3gNV06H9pEDTUJew=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.48.tgz"; + sha512 = "44N9fKrur7xOtY8DnHcFEzJTPenOBUkfpNous4xziG8u58oXvlraiNaTSi++4EpFfsBS3U+jQAW9UMlJqfu8WA=="; }; }; - "@expo/eas-json-5.5.0" = { + "@expo/eas-json-5.7.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.5.0.tgz"; - sha512 = "sQ/huismlHpWEJ1X1sqFu9NOH2SxqUFfXAhy87UqyTPvNfi+8FSPu20Vmq/4vfi9B+Avil14OhtZn/qiHarIBw=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.7.0.tgz"; + sha512 = "JNg1vXZzQPxGmvq3BoP40b6k49KWaysNSLpJhGFGy5oHhIC7BOI5P0yTCSdluxhd0Rq5oLc03tnYbqoFGWUT8g=="; }; }; "@expo/fingerprint-0.4.0" = { @@ -5953,24 +6160,6 @@ let sha512 = "97bYxNaDe/+GCUAKu0V2qudQmR3NFRnv3SrQd2FTtOAa9OWKwkvoBs2WzT7MkNwP4DIpYL6W/e3CSfShfhzEMw=="; }; }; - "@homebridge/ciao-1.1.7" = { - name = "_at_homebridge_slash_ciao"; - packageName = "@homebridge/ciao"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.1.7.tgz"; - sha512 = "q8XRDFn2peboPHGV+wbLCpp52anKiZsoNHZGA+t3I2iJ0/Qn+/8YNO0ILiJnPlVYos6fHceYiL75fhNIISTBRg=="; - }; - }; - "@hpcc-js/wasm-2.13.1" = { - name = "_at_hpcc-js_slash_wasm"; - packageName = "@hpcc-js/wasm"; - version = "2.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz"; - sha512 = "dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA=="; - }; - }; "@hpcc-js/wasm-2.14.1" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; @@ -6061,40 +6250,40 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-0.45.5" = { + "@ibm-cloud/openapi-ruleset-1.14.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "0.45.5"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-0.45.5.tgz"; - sha512 = "8FqJQj8osll6iLOD5JsFWR+kOU1HbCp1Z2PjHeE67Wb/srz7V9B+YyjZOO9QAgLLHwvgt07XS13FQ+ArNNetGg=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.14.2.tgz"; + sha512 = "ovB/kc5Rg1/69AUrEVb0R1spvvqvQpLm5rQUEQ92VyKokBDk8YnTP4H7sb/Xta1yoUR2Rcq+GMkwv15O9OE+qg=="; }; }; - "@ibm-cloud/openapi-ruleset-utilities-0.0.1" = { + "@ibm-cloud/openapi-ruleset-utilities-1.3.0" = { name = "_at_ibm-cloud_slash_openapi-ruleset-utilities"; packageName = "@ibm-cloud/openapi-ruleset-utilities"; - version = "0.0.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-0.0.1.tgz"; - sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-1.3.0.tgz"; + sha512 = "CuG5u6+gSEbU8IKGZqKH+WsH4rFU9KMYriDzG6F+DJ8XbtEd3RTHWMQdAeO/ec2XiyPF2j4VxWEXMzVZJ05bAA=="; }; }; - "@inquirer/checkbox-1.4.0" = { + "@inquirer/checkbox-1.5.0" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.4.0.tgz"; - sha512 = "7YcekwCvMTjrgjUursrH6AGZUSPw7gKPMvp0VhM3iq9mL46a7AeCfOTQTW0UPeiIfWmZK8wHyAD6wIhfDyLHpw=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.5.0.tgz"; + sha512 = "3cKJkW1vIZAs4NaS0reFsnpAjP0azffYII4I2R7PTI7ZTMg5Y1at4vzXccOH3762b2c2L4drBhpJpf9uiaGNxA=="; }; }; - "@inquirer/confirm-2.0.14" = { + "@inquirer/confirm-2.0.15" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.14.tgz"; - sha512 = "Elzo5VX5lO1q9xy8CChDtDQNVLaucufdZBAM12qdfX1L3NQ+TypnZytGmWDXHBTpBTwuhEuwxNvUw7B0HCURkw=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.15.tgz"; + sha512 = "hj8Q/z7sQXsF0DSpLQZVDhWYGN6KLM/gNjjqGkpKwBzljbQofGjn0ueHADy4HUY+OqDHmXuwk/bY+tZyIuuB0w=="; }; }; "@inquirer/core-2.3.1" = { @@ -6106,49 +6295,49 @@ let sha512 = "faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw=="; }; }; - "@inquirer/core-5.1.0" = { + "@inquirer/core-5.1.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-5.1.0.tgz"; - sha512 = "EVnific72BhMOMo8mElvrYhGFWJZ73X6j0I+fITIPTsdAz6Z9A3w3csKy+XaH87/5QAEIQHR7RSCVXvQpIqNdQ=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-5.1.1.tgz"; + sha512 = "IuJyZQUg75+L5AmopgnzxYrgcU6PJKL0hoIs332G1Gv55CnmZrhG6BzNOeZ5sOsTi1YCGOopw4rYICv74ejMFg=="; }; }; - "@inquirer/editor-1.2.12" = { + "@inquirer/editor-1.2.13" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.12.tgz"; - sha512 = "Y7zXQqcglPbbPkx0DPwx6HQFstJR5uex4hoQprjpdxSj8+Bf04+Og6mK/FNxoQbPvoNecegtmMGxDC+hVcMJZA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.13.tgz"; + sha512 = "gBxjqt0B9GLN0j6M/tkEcmcIvB2fo9Cw0f5NRqDTkYyB9AaCzj7qvgG0onQ3GVPbMyMbbP4tWYxrBOaOdKpzNA=="; }; }; - "@inquirer/expand-1.1.13" = { + "@inquirer/expand-1.1.14" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.13.tgz"; - sha512 = "/+7CGCa7iyJIpli0NtukEAjSI7+wGgjYzsByLVSSAk3U696ZlCCP6iPtsWx6d1qfmaMmCzejcjylOj6OAeu4bA=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.14.tgz"; + sha512 = "yS6fJ8jZYAsxdxuw2c8XTFMTvMR1NxZAw3LxDaFnqh7BZ++wTQ6rSp/2gGJhMacdZ85osb+tHxjVgx7F+ilv5g=="; }; }; - "@inquirer/input-1.2.13" = { + "@inquirer/input-1.2.14" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.13.tgz"; - sha512 = "gALuvSpZRYfqygPjlYWodMZ4TXwALvw7Pk4tRFhE1oMN79rLVlg88Z/X6JCUh+uV2qLaxxgbeP+cgPWTvuWsCg=="; + url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.14.tgz"; + sha512 = "tISLGpUKXixIQue7jypNEShrdzJoLvEvZOJ4QRsw5XTfrIYfoWFqAjMQLerGs9CzR86yAI89JR6snHmKwnNddw=="; }; }; - "@inquirer/password-1.1.13" = { + "@inquirer/password-1.1.14" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.13.tgz"; - sha512 = "6STGbL4Vm6ohE2yDBOSENCpCeywnvPux5psZVpvblGDop1oPiZkdsVI+NhsA0c4BE6YT0fNVK8Oqxf5Dgt5k7g=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.14.tgz"; + sha512 = "vL2BFxfMo8EvuGuZYlryiyAB3XsgtbxOcFs4H9WI9szAS/VZCAwdVqs8rqEeaAf/GV/eZOghIOYxvD91IsRWSg=="; }; }; "@inquirer/prompts-2.3.1" = { @@ -6160,22 +6349,22 @@ let sha512 = "YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ=="; }; }; - "@inquirer/rawlist-1.2.13" = { + "@inquirer/rawlist-1.2.14" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.13.tgz"; - sha512 = "f+bASrCY2x2F90MrBYX7nUSetL6FsVLfskhGWEyVwj6VIXzc9T878z3v7KU3V10D1trWrCVHOdeqEcbnO68yhg=="; + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.14.tgz"; + sha512 = "xIYmDpYgfz2XGCKubSDLKEvadkIZAKbehHdWF082AyC2I4eHK44RUfXaoOAqnbqItZq4KHXS6jDJ78F2BmQvxg=="; }; }; - "@inquirer/select-1.3.0" = { + "@inquirer/select-1.3.1" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-1.3.0.tgz"; - sha512 = "3sL5odCDYI+i+piAFqFa5ULDUKEpc0U1zEY4Wm6gjP6nMAHWM8r1UzMlpQXCyHny91Tz+oeSLeKinAde0z6R7w=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-1.3.1.tgz"; + sha512 = "EgOPHv7XOHEqiBwBJTyiMg9r57ySyW4oyYCumGp+pGyOaXQaLb2kTnccWI6NFd9HSi5kDJhF7YjA+3RfMQJ2JQ=="; }; }; "@inquirer/type-1.1.5" = { @@ -6718,15 +6907,6 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.90.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.90.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.90.0.tgz"; - sha512 = "bHrSs/X0mX6rVgBySk6JB/VYiqIV0HkznthZ4lpLabrgTEistwBYXxTf1kgNzfmUbIt0EeETwxdLAY0sqHE/+A=="; - }; - }; "@jsii/check-node-1.91.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; @@ -6799,13 +6979,13 @@ let sha512 = "XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="; }; }; - "@lezer/lr-1.3.13" = { + "@lezer/lr-1.3.14" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.13.tgz"; - sha512 = "RLAbau/4uSzKgIKj96mI5WUtG1qtiR0Frn0Ei9zhPj8YOkHM+1Bb8SgdVvmR/aWJCFIzjo2KFnDiRZ75Xf5NdQ=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz"; + sha512 = "z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug=="; }; }; "@ljharb/through-2.3.11" = { @@ -7123,6 +7303,15 @@ let sha512 = "/fQjIbuNVIT/PbXvw178Tm97bxV0E0nVUFKHivMKtSI2pcs8xKdaWkHJxf9dTI0G/y5hp/KuCvgcUu5HwAtI1w=="; }; }; + "@npmcli/config-8.0.1" = { + name = "_at_npmcli_slash_config"; + packageName = "@npmcli/config"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/config/-/config-8.0.1.tgz"; + sha512 = "NKGmMYv/YTLwJr+qK9CvADSe82NTM9AFwFFpsZpVcPCT3XTdxvJBdXi8xvXWjHSCMb0Cb+7FtU/a5qqguCOhxA=="; + }; + }; "@npmcli/fs-1.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -7159,6 +7348,15 @@ let sha512 = "9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ=="; }; }; + "@npmcli/git-5.0.3" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.3.tgz"; + sha512 = "UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw=="; + }; + }; "@npmcli/installed-package-contents-2.0.2" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -7222,6 +7420,15 @@ let sha512 = "gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg=="; }; }; + "@npmcli/promise-spawn-7.0.0" = { + name = "_at_npmcli_slash_promise-spawn"; + packageName = "@npmcli/promise-spawn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz"; + sha512 = "wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ=="; + }; + }; "@npmcli/run-script-6.0.2" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -7231,6 +7438,15 @@ let sha512 = "NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA=="; }; }; + "@npmcli/run-script-7.0.2" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz"; + sha512 = "Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w=="; + }; + }; "@nrwl/devkit-16.10.0" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; @@ -7789,6 +8005,15 @@ let sha512 = "OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="; }; }; + "@opentelemetry/api-1.7.0" = { + name = "_at_opentelemetry_slash_api"; + packageName = "@opentelemetry/api"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz"; + sha512 = "AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw=="; + }; + }; "@opentelemetry/api-logs-0.43.0" = { name = "_at_opentelemetry_slash_api-logs"; packageName = "@opentelemetry/api-logs"; @@ -7816,6 +8041,15 @@ let sha512 = "I6LrZvl1FF97FQXPR0iieWQmKnGxYtMbWA1GrAXnLUR+B1Hn2m8KqQNEIlZAucyv00GBgpWkpllmULmZfG8P3g=="; }; }; + "@opentelemetry/core-1.18.1" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz"; + sha512 = "kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg=="; + }; + }; "@opentelemetry/exporter-metrics-otlp-http-0.43.0" = { name = "_at_opentelemetry_slash_exporter-metrics-otlp-http"; packageName = "@opentelemetry/exporter-metrics-otlp-http"; @@ -7825,6 +8059,15 @@ let sha512 = "k0KHKLS/xEWI4e5xrsnHpRk7Adj7JSFbFeKF4ti1d9soek3y85ZC2fTzDQC+ysUYo/lccoAXGR/gjcYgQOe7pg=="; }; }; + "@opentelemetry/instrumentation-0.41.2" = { + name = "_at_opentelemetry_slash_instrumentation"; + packageName = "@opentelemetry/instrumentation"; + version = "0.41.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz"; + sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; + }; + }; "@opentelemetry/otlp-exporter-base-0.43.0" = { name = "_at_opentelemetry_slash_otlp-exporter-base"; packageName = "@opentelemetry/otlp-exporter-base"; @@ -7861,6 +8104,15 @@ let sha512 = "M2e5emqg5I7qRKqlzKx0ROkcPyF8PbcSaWEdsm72od9txP7Z/Pl8PDYOyu80xWvbHAWk5mDxOF6v3vNdifzclA=="; }; }; + "@opentelemetry/resources-1.18.1" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz"; + sha512 = "JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA=="; + }; + }; "@opentelemetry/sdk-logs-0.43.0" = { name = "_at_opentelemetry_slash_sdk-logs"; packageName = "@opentelemetry/sdk-logs"; @@ -7897,13 +8149,13 @@ let sha512 = "2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.17.1" = { + "@opentelemetry/sdk-trace-base-1.18.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.17.1"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.1.tgz"; - sha512 = "pfSJJSjZj5jkCJUQZicSpzN8Iz9UKMryPWikZRGObPnJo6cUSoKkjZh6BM3j+D47G4olMBN+YZKYqkFM1L6zNA=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz"; + sha512 = "tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg=="; }; }; "@opentelemetry/semantic-conventions-1.17.0" = { @@ -7924,67 +8176,76 @@ let sha512 = "xbR2U+2YjauIuo42qmE8XyJK6dYeRMLJuOlUP5SO4auET4VtOHOzgkRVOq+Ik18N+Xf3YPcqJs9dZMiDddz1eQ=="; }; }; - "@orval/angular-6.19.1" = { + "@opentelemetry/semantic-conventions-1.18.1" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz"; + sha512 = "+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA=="; + }; + }; + "@orval/angular-6.20.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.19.1.tgz"; - sha512 = "8yd1Z75r8VBFFfednXz3eEIrVeEZX+HF6urH0t9EfifJBmO62kSwtJop3UoR3WXq6J4m+ck3nZ4lR9oJ7LeL9g=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.20.0.tgz"; + sha512 = "BXrK9NCFRw4+IbJUz30npAZQRPG3vpwHcf+tYiwAhFDJQVQOQy4429hLNBc2xPxsCilSQdQ1/by6AaVcTLe3VA=="; }; }; - "@orval/axios-6.19.1" = { + "@orval/axios-6.20.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.19.1.tgz"; - sha512 = "yV8da4UYoR3OnyqIkj8+b4SSO29e+zLSksKtcHST5DNxwx+wV23DLY9/kdQ286WjSkkQp16hK2XGXMg0cJMtBg=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.20.0.tgz"; + sha512 = "Dfno2JM2FBKEVlcsI45FfoN6Cygv+Mz6VcXs6ptb+Biy9aUZ5XlWByFwIF/U7XFjV4bWBb6PJHDeBq4dlpplvQ=="; }; }; - "@orval/core-6.19.1" = { + "@orval/core-6.20.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.19.1.tgz"; - sha512 = "EoHT+MkFL4+sKxi9bKxL0rEWplE3Nls+fp+dhySnCHyRqkV4OXxdBxQd6SawHJqRue1+RvFyEaKGCc2zwe6CPA=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.20.0.tgz"; + sha512 = "piX1w6wJSK6FYT1YCG8LCM7rraN3EQ0CUtKIi20UJ7EGBH7ss4OvHRSZMw81SER8zZ4uXlSdGFn5EQ9+8AkD1A=="; }; }; - "@orval/msw-6.19.1" = { + "@orval/msw-6.20.0" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.19.1.tgz"; - sha512 = "cE9Ix6W7a4brzytGuKH0IpcWljmznMbnEQf5+M7zfi6T7dQnc0cSmiNJW2kKgfO2hQqDJMoeXo3BA2eaKODpyQ=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.20.0.tgz"; + sha512 = "0BGgM97HDv6gfZ9dtcdWx7MBTy/+Mjc5GbG5NE3gmRIl+A7QMRx0vB+0SDMhxg/eKmYNwruxpJeQWAkYHnClNA=="; }; }; - "@orval/query-6.19.1" = { + "@orval/query-6.20.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.19.1.tgz"; - sha512 = "v2CSqLkPZePwytkQOazIvSPm8VZcZfSCt8zt2J1EiieJGSRZP2G9wA6nZdr3IVpiXUhq3R8xDg9Y8xO/VhoNlQ=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.20.0.tgz"; + sha512 = "dZ10Mb9qIcIh83OjrjjWtzpQulHQMyYZgX7yG2YIp1MZ2GHEQdJTHgLe8CdnXB9LJqo2En0DzXSZZdWdxYqfHA=="; }; }; - "@orval/swr-6.19.1" = { + "@orval/swr-6.20.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.19.1.tgz"; - sha512 = "CSkg/H6rpbX0JZ9QDOJLAyqf5//BA+ycdqAFGnL4TOAgN8z2AGeu1EqWyQc4Ls1YJIcLlzdrYE2poCT9KH1Weg=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.20.0.tgz"; + sha512 = "6TnG72/evQTMoQ+LoVyF/BF4/issxuvpVWJQPKzsrYnyAP5mdyMyTSTmp85R+72VodB00DD6jHdlTu8Rd0NaQw=="; }; }; - "@orval/zod-6.19.1" = { + "@orval/zod-6.20.0" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.19.1.tgz"; - sha512 = "A2LqEEM1eHusITeFXsQFNhVjXR5mg2oIwjQRmjJdCZ98HlZpMoO6opEURUTF2qNtREI8HrjEyN7mUNIcLxrDyA=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.20.0.tgz"; + sha512 = "6fDfyHEBG/23h3ZTcQ26JFSgj6zJgnhYwZEr1B+zBpLewOYuOo8UAVWvVBLZGg1Mba1KDOmSj8Vfbaug7sGVXg=="; }; }; "@parcel/bundler-default-2.10.2" = { @@ -8977,13 +9238,13 @@ let sha512 = "mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg=="; }; }; - "@repeaterjs/repeater-3.0.4" = { + "@repeaterjs/repeater-3.0.5" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz"; - sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; + url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.5.tgz"; + sha512 = "l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA=="; }; }; "@resvg/resvg-js-2.6.0" = { @@ -9103,24 +9364,6 @@ let sha512 = "8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw=="; }; }; - "@rollup/plugin-commonjs-22.0.2" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "22.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz"; - sha512 = "//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; - }; - }; "@rollup/pluginutils-4.2.1" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -9247,13 +9490,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.2.9" = { + "@schematics/angular-17.0.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz"; - sha512 = "uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-17.0.0.tgz"; + sha512 = "9jKU5x/WzaBsfSkUowK1X74FqtMXa6+A60XgW4ACO8i6fwKfPeS+tIrAieeYOX80/njBh7I5CvcpHmWA2SbcXQ=="; }; }; "@scure/base-1.1.3" = { @@ -9310,193 +9553,49 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.77.0" = { + "@sentry-internal/tracing-7.80.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.77.0.tgz"; - sha512 = "8HRF1rdqWwtINqGEdx8Iqs9UOP/n8E0vXUu3Nmbqj4p5sQPA7vvCfq+4Y4rTqZFc7sNdFpDsRION5iQEh8zfZw=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.80.0.tgz"; + sha512 = "P1Ab9gamHLsbH9D82i1HY8xfq9dP8runvc4g50AAd6OXRKaJ45f2KGRZUmnMEVqBQ7YoPYp2LFMkrhNYbcZEoQ=="; }; }; - "@sentry/core-7.77.0" = { + "@sentry/core-7.80.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.77.0.tgz"; - sha512 = "Tj8oTYFZ/ZD+xW8IGIsU6gcFXD/gfE+FUxUaeSosd9KHwBQNOLhZSsYo/tTVf/rnQI/dQnsd4onPZLiL+27aTg=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.80.0.tgz"; + sha512 = "nJiiymdTSEyI035/rdD3VOq6FlOZ2wWLR5bit9LK8a3rzHU3UXkwScvEo6zYgs0Xp1sC0yu1S9+0BEiYkmi29A=="; }; }; - "@sentry/node-7.77.0" = { + "@sentry/node-7.80.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.77.0.tgz"; - sha512 = "Ob5tgaJOj0OYMwnocc6G/CDLWC7hXfVvKX/ofkF98+BbN/tQa5poL+OwgFn9BA8ud8xKzyGPxGU6LdZ8Oh3z/g=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.80.0.tgz"; + sha512 = "J35fqe8J5ac/17ZXT0ML3opYGTOclqYNE9Sybs1y9n6BqacHyzH8By72YrdI03F7JJDHwrcGw+/H8hGpkCwi0Q=="; }; }; - "@sentry/types-7.77.0" = { + "@sentry/types-7.80.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.77.0.tgz"; - sha512 = "nfb00XRJVi0QpDHg+JkqrmEBHsqBnxJu191Ded+Cs1OJ5oPXEW6F59LVcBScGvMqe+WEk1a73eH8XezwfgrTsA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.80.0.tgz"; + sha512 = "4bpMO+2jWiWLDa8zbTASWWNLWe6yhjfPsa7/6VH5y9x1NGtL8oRbqUsTgsvjF3nmeHEMkHQsC8NHPaQ/ibFmZQ=="; }; }; - "@sentry/utils-7.77.0" = { + "@sentry/utils-7.80.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.77.0.tgz"; - sha512 = "NmM2kDOqVchrey3N5WSzdQoCsyDkQkiRxExPaNI2oKQ/jMWHs9yt0tSy7otPBcXs0AP59ihl75Bvm1tDRcsp5g=="; - }; - }; - "@serialport/binding-mock-10.2.2" = { - name = "_at_serialport_slash_binding-mock"; - packageName = "@serialport/binding-mock"; - version = "10.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-10.2.2.tgz"; - sha512 = "HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw=="; - }; - }; - "@serialport/bindings-cpp-12.0.1" = { - name = "_at_serialport_slash_bindings-cpp"; - packageName = "@serialport/bindings-cpp"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz"; - sha512 = "r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg=="; - }; - }; - "@serialport/bindings-interface-1.2.2" = { - name = "_at_serialport_slash_bindings-interface"; - packageName = "@serialport/bindings-interface"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz"; - sha512 = "CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA=="; - }; - }; - "@serialport/parser-byte-length-12.0.0" = { - name = "_at_serialport_slash_parser-byte-length"; - packageName = "@serialport/parser-byte-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-12.0.0.tgz"; - sha512 = "0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg=="; - }; - }; - "@serialport/parser-cctalk-12.0.0" = { - name = "_at_serialport_slash_parser-cctalk"; - packageName = "@serialport/parser-cctalk"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-12.0.0.tgz"; - sha512 = "0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw=="; - }; - }; - "@serialport/parser-delimiter-11.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz"; - sha512 = "aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g=="; - }; - }; - "@serialport/parser-delimiter-12.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz"; - sha512 = "gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw=="; - }; - }; - "@serialport/parser-inter-byte-timeout-12.0.0" = { - name = "_at_serialport_slash_parser-inter-byte-timeout"; - packageName = "@serialport/parser-inter-byte-timeout"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz"; - sha512 = "GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w=="; - }; - }; - "@serialport/parser-packet-length-12.0.0" = { - name = "_at_serialport_slash_parser-packet-length"; - packageName = "@serialport/parser-packet-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-12.0.0.tgz"; - sha512 = "p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ=="; - }; - }; - "@serialport/parser-readline-11.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-11.0.0.tgz"; - sha512 = "rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA=="; - }; - }; - "@serialport/parser-readline-12.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-12.0.0.tgz"; - sha512 = "O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w=="; - }; - }; - "@serialport/parser-ready-12.0.0" = { - name = "_at_serialport_slash_parser-ready"; - packageName = "@serialport/parser-ready"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-12.0.0.tgz"; - sha512 = "ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg=="; - }; - }; - "@serialport/parser-regex-12.0.0" = { - name = "_at_serialport_slash_parser-regex"; - packageName = "@serialport/parser-regex"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-12.0.0.tgz"; - sha512 = "dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA=="; - }; - }; - "@serialport/parser-slip-encoder-12.0.0" = { - name = "_at_serialport_slash_parser-slip-encoder"; - packageName = "@serialport/parser-slip-encoder"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-12.0.0.tgz"; - sha512 = "0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA=="; - }; - }; - "@serialport/parser-spacepacket-12.0.0" = { - name = "_at_serialport_slash_parser-spacepacket"; - packageName = "@serialport/parser-spacepacket"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz"; - sha512 = "dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q=="; - }; - }; - "@serialport/stream-12.0.0" = { - name = "_at_serialport_slash_stream"; - packageName = "@serialport/stream"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-12.0.0.tgz"; - sha512 = "9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.80.0.tgz"; + sha512 = "XbBCEl6uLvE50ftKwrEo6XWdDaZXHXu+kkHXTPWQEcnbvfZKLuG9V0Hxtxxq3xQgyWmuF05OH1GcqYqiO+v5Yg=="; }; }; "@serverless/dashboard-plugin-7.1.0" = { @@ -9535,22 +9634,22 @@ let sha512 = "7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ=="; }; }; - "@shopify/cli-kit-3.50.1" = { + "@shopify/cli-kit-3.50.2" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.1.tgz"; - sha512 = "pi8khn358ntuBEUq+XEVp90fMI12ehNx6U+NVyqwOzEAwktmNxJmiG4aXf1oIyjOnitZ0JGIaS6swjDO1IWQjw=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.2.tgz"; + sha512 = "EqScyHo9EudDz6nGpvwBbkjUmDx5g8Uhy0Ls05ZTWBqGMP9tm9RdLqRYjyq6q6iEjrBMgois4Bw9De6Zcf9JOw=="; }; }; - "@shopify/plugin-did-you-mean-3.50.1" = { + "@shopify/plugin-did-you-mean-3.50.2" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.1.tgz"; - sha512 = "F8Bs4xtYJp2z1BJgu0KDAp//Uw+ZtTOfDltwedtTWqrZlZl5bHk82fYmWicCxVxTmI53A4+qmuredngXgC/iqA=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.2.tgz"; + sha512 = "7i8HlEq06YIq8c3qfkoqa9uO5PhNmf6Cj5V/LZWzmhJgIPeXndJvrAxomyYwAHBugDm6Zx/kKEcIOlk4O4ZQFw=="; }; }; "@sideway/address-4.1.4" = { @@ -9589,6 +9688,15 @@ let sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog=="; }; }; + "@sigstore/bundle-2.1.0" = { + name = "_at_sigstore_slash_bundle"; + packageName = "@sigstore/bundle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz"; + sha512 = "89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng=="; + }; + }; "@sigstore/protobuf-specs-0.2.1" = { name = "_at_sigstore_slash_protobuf-specs"; packageName = "@sigstore/protobuf-specs"; @@ -9607,6 +9715,15 @@ let sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA=="; }; }; + "@sigstore/sign-2.2.0" = { + name = "_at_sigstore_slash_sign"; + packageName = "@sigstore/sign"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz"; + sha512 = "AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA=="; + }; + }; "@sigstore/tuf-1.0.3" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; @@ -9616,6 +9733,15 @@ let sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; }; }; + "@sigstore/tuf-2.2.0" = { + name = "_at_sigstore_slash_tuf"; + packageName = "@sigstore/tuf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz"; + sha512 = "KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA=="; + }; + }; "@sinclair/typebox-0.25.24" = { name = "_at_sinclair_slash_typebox"; packageName = "@sinclair/typebox"; @@ -10210,15 +10336,6 @@ let sha512 = "lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="; }; }; - "@stoplight/spectral-cli-6.11.0" = { - name = "_at_stoplight_slash_spectral-cli"; - packageName = "@stoplight/spectral-cli"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.11.0.tgz"; - sha512 = "IURDN47BPIf3q4ZyUPujGpBzuHWFE5yT34w9rTJ1GKA4SgdscEdQO9KoTjOPT4G4cvDlEV3bNxwQ3uRm7+wRlA=="; - }; - }; "@stoplight/spectral-core-1.18.3" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; @@ -10228,22 +10345,13 @@ let sha512 = "YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ=="; }; }; - "@stoplight/spectral-formats-1.5.0" = { + "@stoplight/spectral-formats-1.6.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.5.0.tgz"; - sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; - }; - }; - "@stoplight/spectral-formatters-1.3.0" = { - name = "_at_stoplight_slash_spectral-formatters"; - packageName = "@stoplight/spectral-formatters"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.3.0.tgz"; - sha512 = "ryuMwlzbPUuyn7ybSEbFYsljYmvTaTyD51wyCQs4ROzgfm3Yo5QDD0IsiJUzUpKK/Ml61ZX8ebgiPiRFEJtBpg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.6.0.tgz"; + sha512 = "X27qhUfNluiduH0u/QwJqhOd8Wk5YKdxVmKM03Aijlx0AH1H5mYt3l9r7t2L4iyJrsBaFPnMGt7UYJDGxszbNA=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -10273,24 +10381,6 @@ let sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; - "@stoplight/spectral-ruleset-bundler-1.5.2" = { - name = "_at_stoplight_slash_spectral-ruleset-bundler"; - packageName = "@stoplight/spectral-ruleset-bundler"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.2.tgz"; - sha512 = "4QUVUFAU+S7IQ9XeCu+0TQMYxKFpKnkOAfa9unRQ1iPL2cviaipEN6witpbAptdHJD3UUjx4OnwlX8WwmXSq9w=="; - }; - }; - "@stoplight/spectral-ruleset-migrator-1.9.5" = { - name = "_at_stoplight_slash_spectral-ruleset-migrator"; - packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.5.tgz"; - sha512 = "76n/HETr3UinVl/xLNldrH9p0JNoD8Gz4K75J6E4OHp4xD0P+BA2e8+W30HjIvqm1LJdLU2BNma0ioy+q3B9RA=="; - }; - }; "@stoplight/spectral-rulesets-1.18.0" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; @@ -10408,13 +10498,13 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.95" = { + "@swc/core-1.3.96" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.95"; + version = "1.3.96"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.95.tgz"; - sha512 = "PMrNeuqIusq9DPDooV3FfNEbZuTu5jKAc04N3Hm6Uk2Fl49cqElLFQ4xvl4qDmVDz97n3n/C1RE0/f6WyGPEiA=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.96.tgz"; + sha512 = "zwE3TLgoZwJfQygdv2SdCK9mRLYluwDOM53I+dT6Z5ZvrgVENmY3txvWDvduzkV+/8IuvrRbVezMpxcojadRdQ=="; }; }; "@swc/counter-0.1.2" = { @@ -10444,13 +10534,13 @@ let sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.95" = { + "@swc/wasm-1.3.97" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.95"; + version = "1.3.97"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.95.tgz"; - sha512 = "cOE6Cu8bKR/69qyJKhLOQnUTZu3lUKHqI6XDhfLuG/zg/7LCwfECXhetkYBnzhB4pHre/8ZrRKaXCjcY9XJ+rQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.97.tgz"; + sha512 = "O9p6R6zN1NV1U64eBmU/2NvJGA79W/vUl9BaQwIgoSf2qrPrKMtexDV/aFk2N/mQriWxaK3HHxJAQSPRWsRs+w=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10498,13 +10588,13 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@textlint/ast-node-types-13.3.3" = { + "@textlint/ast-node-types-13.4.0" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.3.3.tgz"; - sha512 = "KCpJppfX3Km69twa6SmVEJ8mkyAZSrxw3XaaLQSlpc7PWnLUJSCHGPVECI1nSUDhiTd1r6zlRvWuyIAZJiov+A=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.4.0.tgz"; + sha512 = "roVeLjnf8UPntFICb1uEwE2dccC8V/T5N1x7eBxkT3VDmSQkyfIAuGtlpwyH0wNKEwJmjO/2gSm2fCjW5K/rbA=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -10516,139 +10606,139 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-13.3.3" = { + "@textlint/ast-tester-13.4.0" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.3.3.tgz"; - sha512 = "vIIEJ0vDJb3Pr4kseOH9yzUCxx1EbX6PQDg/DgQj9sMAnwVG2sZvy2Uiga4+hj8SphdzaKia9Z+156UZzs+mzA=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.4.0.tgz"; + sha512 = "dmqlPNxgQNaG63gTcMfF2b2VmQn7gnDN2ytF3c6sFB6YyTsiTh9wA/xsUBKqYWOMlYV5pLuO6TvItcUPCtVtZw=="; }; }; - "@textlint/ast-traverse-13.3.3" = { + "@textlint/ast-traverse-13.4.0" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.3.3.tgz"; - sha512 = "tZ25emmWf3mJ4+vM8CO6D7F8l00WXD6MJgnnlY9BHI/HbOlngBfmKhTVizQEwrWfYF80sQO5R9a+N4UEk67Wcg=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.4.0.tgz"; + sha512 = "d64z9uJcyGRwZFNadkOTnSIMZEQfWiOEM4+RbakLF71kpmdMoF8pPK5mOgT0fsHoidGzlNxxUMThkIfSRMtG5w=="; }; }; - "@textlint/config-loader-13.3.3" = { + "@textlint/config-loader-13.4.0" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.3.3.tgz"; - sha512 = "DQA/7dYu3VDHP9Idd0Sn7HzwiFuNdKUXfA79pUGmJzNQUYaW0qADzyQCwfh7LlvhCcBmnLgX+8wb13o6OaHX5g=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.4.0.tgz"; + sha512 = "uebTYdCZAw43BMWIB85EU6eoFe6aVArejeW6P+QR09aZvVIPoT6UJl1JYjGNiq0cVR5kR7bQS1w3Af55CvgOEQ=="; }; }; - "@textlint/feature-flag-13.3.3" = { + "@textlint/feature-flag-13.4.0" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.3.3.tgz"; - sha512 = "ltdwKQTvs9f/TgQ3asBx2EXmsSSsvxa7ySnTXSTZBkbVxqmrGY4zehDRiDCmuFZGVGCvCddY1QzCXy16ybk9Fg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.4.0.tgz"; + sha512 = "L/p2rkuOg6rOS395TXUFIDfmoCyHpHKnA6YFCqNXkDcpxo0W+YXnEdXDMd9P+KlsU9MNTC9nFduO4nHOfFYlPg=="; }; }; - "@textlint/fixer-formatter-13.3.3" = { + "@textlint/fixer-formatter-13.4.0" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.3.3.tgz"; - sha512 = "iCMFS8GrmUetXMIT4/jFxoL5v1QN5ODj1190Lb6D+EdTxsrAWssHOb6m7MOEhfOGYEArAkb3PjSxu7DPLrb50g=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.4.0.tgz"; + sha512 = "iosRUAhQ4bQkwpg6HOCfaLufR5X0ImCOnoy+jqHNQD37ziRQF43B/IMHOqwQdX7MLHp6jPYALFDnl64+gjmKbA=="; }; }; - "@textlint/kernel-13.3.3" = { + "@textlint/kernel-13.4.0" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.3.3.tgz"; - sha512 = "HewzuuX2c2nlR+e8dREWrAYrOiyWb78eeObuW95miMjX/F6TjWmha4qrnrMCWbYbKDwC4en8dNGS4mm0vSdi4A=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.4.0.tgz"; + sha512 = "QRHbaKSeqXzfi+XNISOyNM7h68v6/4QaLfo7CZnBBKxatvVoXUF5B/8MmxYrVB1TX/X9sY50zcwfTaYwZTYCNQ=="; }; }; - "@textlint/linter-formatter-13.3.3" = { + "@textlint/linter-formatter-13.4.0" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.3.3.tgz"; - sha512 = "z8xsk1bo9r8v6Ph76WLTBrfj+0+eyEfRlbTGBs+ie6YAGItBqkLYmDrD26DDfVjIZcXWdCXVX1Et6MOWomb//g=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.4.0.tgz"; + sha512 = "vJGm0mM7TcsespHUxh4GnSWBOqdYyluHlLPLQwg4tCVYLjTgu2Vaz8BDCpwQ9BnRmEr484Qjug0RE1otQUFBrw=="; }; }; - "@textlint/markdown-to-ast-13.3.3" = { + "@textlint/markdown-to-ast-13.4.0" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.3.3.tgz"; - sha512 = "jeqWyChTtJHWxEnH46V6qjr+OCTh6evm45aDqMzdg+b8ocXY+NhudiCMeHcVGoz042UEwc6w4reLn8+Is+SZ+A=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.4.0.tgz"; + sha512 = "rF70kFestQHaqB+cRl4QrvjIn0bjR3birnAXjux9iEXWfrS7cxWyrEWmKkBPO5o8yoGF9q9JKBkDaypPzNsIhg=="; }; }; - "@textlint/module-interop-13.3.3" = { + "@textlint/module-interop-13.4.0" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.3.3.tgz"; - sha512 = "CwfVpRGAxbkhGY9vLLU06Q/dy/RMNnyzbmt6IS2WIyxqxvGaF7QZtFYpKEEm63aemVyUvzQ7WM3yVOoUg6P92w=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.4.0.tgz"; + sha512 = "o3h/ths4OrqeT5XLfTED6R0tjp/DLvbL8eG8b7uUgIEhUlHcSHwEUC6bEX7AzQS6/2DedrCBKLknQcdhl/iQ2A=="; }; }; - "@textlint/source-code-fixer-13.3.3" = { + "@textlint/source-code-fixer-13.4.0" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.3.3.tgz"; - sha512 = "h4jxWSetmcVuGwl71ai72784aneBQ0MkE5Mc3avl8PKIOIOyz0A1D7i9VQENWWIiqU8zyzmHwKGNSGyqWaqE2Q=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.4.0.tgz"; + sha512 = "3jR5XPrSzJmSH8sg3XrkCu9sGSR7OOl78zrbX+1d84nDLdRdjLSa90COc4aJWwOMpKycwZhU6XltTqPJWI50rg=="; }; }; - "@textlint/text-to-ast-13.3.3" = { + "@textlint/text-to-ast-13.4.0" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.3.3.tgz"; - sha512 = "iQdiHAiUfB9XruuYWCb4fY/gD/Q5/MkH1xwUTpS8UJowNgwpTldagUJX1JbZQ2UHux+yRe9JFA+JKm3rrxgQFw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.4.0.tgz"; + sha512 = "oZQ20rA5VqqjUT689q/RDgHSI1ML6ySoEjfXMRBSXaN+7LXKFZdvLg4RQ5ECddNh3MIXcQHdjT7+qxuGyQzy6g=="; }; }; - "@textlint/textlint-plugin-markdown-13.3.3" = { + "@textlint/textlint-plugin-markdown-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.3.3.tgz"; - sha512 = "EhBZ/Q6ZXMVRPDeQbFdFbtc0wE7SC0DWy9lkjKXfcbLKW0ZPTvtjH3JqJtCPBZAYcexB8wKOiHImfwVfQJhJhg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.4.0.tgz"; + sha512 = "+bIOsbfQpdRzjkNDXY1ze4YyPGf1XKlkVVkkVpUlI7rehoVaUWKy2v41Y8gsQZjpBft31EXP1okA9qs7wTYr/w=="; }; }; - "@textlint/textlint-plugin-text-13.3.3" = { + "@textlint/textlint-plugin-text-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.3.3.tgz"; - sha512 = "MN/JMGLanqj8CJGuit8DDiyrO0yf1vxFMLWTDeMIXwSoe8VToHCt2j20zg8XNHGNrUbKj+wuhzhrkrKEI7uWxg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.4.0.tgz"; + sha512 = "k9GAId9bjdZB3oLBfzAjRD+LCOFQILS5o9s8ESPPJhR5apvURr7WkR2bR5/dHuxa0ivvPjksVzS/jyE2kk618g=="; }; }; - "@textlint/types-13.3.3" = { + "@textlint/types-13.4.0" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-13.3.3.tgz"; - sha512 = "i2B7uRh+Iv8ZBKPJ3n4I6uSrTUQq5LdEkhFYNUwnDYxmhudz1o79xm906kri2eM8lxThX/UYYgVuJWpEwS0b+g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-13.4.0.tgz"; + sha512 = "K7JjP0gUOuRgc7xyfZv2NML7dmzcb9UjoBu0QCgCmJP861ikAd1bONH+qE/3brTi4n8MJq9gO9smGjB2upExMA=="; }; }; - "@textlint/utils-13.3.3" = { + "@textlint/utils-13.4.0" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.3.3.tgz"; - sha512 = "roN+K3a36RxGc0tV+8HXVXpoPomEr3LCjNI8+hFmVjOu3RsUdLTyraNBqqaghaE0KgwCPODF0seuG1hteNI8LQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.4.0.tgz"; + sha512 = "cXm9L3Ol/R5DR0YtHCMBa2PicvOoR5YU8Dx7RDJWHfp2rQvMghd3ogDmeol28s/Ei5oXRHY5HE2rWhYLhwrtVg=="; }; }; "@tokenizer/token-0.1.1" = { @@ -10804,6 +10894,15 @@ let sha512 = "QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ=="; }; }; + "@tufjs/canonical-json-2.0.0" = { + name = "_at_tufjs_slash_canonical-json"; + packageName = "@tufjs/canonical-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz"; + sha512 = "yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA=="; + }; + }; "@tufjs/models-1.0.4" = { name = "_at_tufjs_slash_models"; packageName = "@tufjs/models"; @@ -10813,6 +10912,15 @@ let sha512 = "qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A=="; }; }; + "@tufjs/models-2.0.0" = { + name = "_at_tufjs_slash_models"; + packageName = "@tufjs/models"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz"; + sha512 = "c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg=="; + }; + }; "@turist/fetch-7.2.0" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; @@ -10831,13 +10939,13 @@ let sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; - "@types/accepts-1.3.6" = { + "@types/accepts-1.3.7" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.6.tgz"; - sha512 = "6+qlUg57yfE9OO63wnsJXLeq9cG3gSHBBIxNMOjNrbDRlDnm/NaR7RctfYcVCPq+j7d+MwOxqVEludH5+FKrlg=="; + url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ=="; }; }; "@types/acorn-4.0.6" = { @@ -10867,22 +10975,22 @@ let sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA=="; }; }; - "@types/atob-2.1.3" = { + "@types/atob-2.1.4" = { name = "_at_types_slash_atob"; packageName = "@types/atob"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.3.tgz"; - sha512 = "z5fVgG6QAUY9ecy4zTsrhNEFaCGIU9qgfvFSGTbxVACaUMK1fJICZWE/JreBvZGc4BNgafnFkCWMDBeCebpeKg=="; + url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz"; + sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/bn.js-5.1.4" = { + "@types/bn.js-5.1.5" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.4.tgz"; - sha512 = "ZtBd9L8hVtoBpPMSWfbwjC4dhQtJdlPS+e1A0Rydb7vg7bDcUwiRklPx24sMYtXcmAMST/k0Wze7JLbNU/5SkA=="; + url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz"; + sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; }; }; "@types/body-parser-1.19.2" = { @@ -10894,31 +11002,31 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/body-parser-1.19.4" = { + "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz"; - sha512 = "N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz"; + sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="; }; }; - "@types/bonjour-3.5.12" = { + "@types/bonjour-3.5.13" = { name = "_at_types_slash_bonjour"; packageName = "@types/bonjour"; - version = "3.5.12"; + version = "3.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz"; - sha512 = "ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg=="; + url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz"; + sha512 = "z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ=="; }; }; - "@types/bunyan-1.8.10" = { + "@types/bunyan-1.8.11" = { name = "_at_types_slash_bunyan"; packageName = "@types/bunyan"; - version = "1.8.10"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.10.tgz"; - sha512 = "A82U/3EAdWX89f+dfysGiRvbeoLuRLV3i6SLg3HuNK4Yf+dHOqdbxT70vQUwvD3DOr2Dvpcv9dRX4ipTf0LpEg=="; + url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.11.tgz"; + sha512 = "758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ=="; }; }; "@types/cacheable-request-6.0.3" = { @@ -10930,13 +11038,13 @@ let sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; - "@types/cli-progress-3.11.4" = { + "@types/cli-progress-3.11.5" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; - version = "3.11.4"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.4.tgz"; - sha512 = "yufTxeeNCZuEIxx2uebK8lpSAsJM4lvzakm/VxzYhDtqhXCzwH9jpn7nPCxzrROuEbLATqhFq4MIPoG0tlrsvw=="; + url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz"; + sha512 = "D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g=="; }; }; "@types/commander-2.12.2" = { @@ -10948,40 +11056,40 @@ let sha512 = "0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q=="; }; }; - "@types/common-tags-1.8.3" = { + "@types/common-tags-1.8.4" = { name = "_at_types_slash_common-tags"; packageName = "@types/common-tags"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.3.tgz"; - sha512 = "v3smfzf7umSwpkJrmlUe+apSv6bVnrIFCeBeprnP4f8lIh6pECZxyD50e8yFwfouIt85TdxN5yXiFwS5fnsS3w=="; + url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz"; + sha512 = "S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg=="; }; }; - "@types/concat-stream-2.0.1" = { + "@types/concat-stream-2.0.2" = { name = "_at_types_slash_concat-stream"; packageName = "@types/concat-stream"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.1.tgz"; - sha512 = "v5HP9ZsRbzFq5XRo2liUZPKzwbGK5SuGVMWZjE6iJOm/JNdESk3/rkfcPe0lcal0C32PTLVlYUYqGpMGNdDsDg=="; + url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.2.tgz"; + sha512 = "hgEx+hdJnfCHa62l6SNHNoe/cRge2HoUZe9KEDwOs2TvyocLTlTuw0rUMiii99kG2avc+BubhNpZ+cu05Gl8oQ=="; }; }; - "@types/connect-3.4.37" = { + "@types/connect-3.4.38" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.37"; + version = "3.4.38"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz"; - sha512 = "zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz"; + sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="; }; }; - "@types/connect-history-api-fallback-1.5.2" = { + "@types/connect-history-api-fallback-1.5.3" = { name = "_at_types_slash_connect-history-api-fallback"; packageName = "@types/connect-history-api-fallback"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz"; - sha512 = "gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q=="; + url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.3.tgz"; + sha512 = "6mfQ6iNvhSKCZJoY6sIG3m0pKkdUcweVNOLuBBKvoWGzl2yRxOJcYOTRyLKt3nxXvBLJWa6QkW//tgbIwJehmA=="; }; }; "@types/cookie-0.4.1" = { @@ -10993,13 +11101,13 @@ let sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; }; }; - "@types/cookiejar-2.1.3" = { + "@types/cookiejar-2.1.4" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.3.tgz"; - sha512 = "LZ8SD3LpNmLMDLkG2oCBjZg+ETnx6XdCjydUE0HwojDmnDfDUnhMKKbtth1TZh+hzcqb03azrYWoXLS8sMXdqg=="; + url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.4.tgz"; + sha512 = "b698BLJ6kPVd6uhHsY7wlebZdrWPXYied883PDSzpJZYOP97EOn/oGdLCH3jJf157srkFReIZY5v0H1s8Dozrg=="; }; }; "@types/cors-2.8.12" = { @@ -11011,94 +11119,85 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/cors-2.8.15" = { + "@types/cors-2.8.16" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.15"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz"; - sha512 = "n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.16.tgz"; + sha512 = "Trx5or1Nyg1Fq138PCuWqoApzvoSLWzZ25ORBiHMbbUT42g578lH1GT4TwYDbiUOLFuDsCkfLneT2105fsFWGg=="; }; }; - "@types/debug-4.1.10" = { + "@types/debug-4.1.12" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.10"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.10.tgz"; - sha512 = "tOSCru6s732pofZ+sMv9o4o3Zc+Sa8l3bxd/tweTQudFn06vAzb13ZX46Zi6m6EJ+RUbRTHvgQJ1gBtSgkaUYA=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"; + sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="; }; }; - "@types/diff-3.5.7" = { + "@types/diff-3.5.8" = { name = "_at_types_slash_diff"; packageName = "@types/diff"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.7.tgz"; - sha512 = "dEg0Y/cggst2Dr6wM+6+vVvHgOkmR6VMB+Zt5dc7Wy8zYily1yKP8mzRWKhX3vaefxZYnbL4pNtZ2UWosl+VqA=="; + url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz"; + sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; }; }; - "@types/ejs-3.1.4" = { + "@types/ejs-3.1.5" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.4.tgz"; - sha512 = "fnM/NjByiWdSRJRrmGxgqOSAnmOnsvX1QcNYk5TVyIIj+7ZqOKMb9gQa4OIl/lil2w/8TiTWV+nz3q8yqxez/w=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz"; + sha512 = "nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="; }; }; - "@types/es-aggregate-error-1.0.4" = { + "@types/es-aggregate-error-1.0.5" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.4.tgz"; - sha512 = "95tL6tLR8P3Utx4SxXUEc0e+k2B9VhtBozhgxKGpv30ylIuxGxf080d7mYZ08sH5UjpDv/Nd6F80tH1p+KuPIg=="; + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.5.tgz"; + sha512 = "N2YcF5clfLoFqpSXr50khdH9cItGytbDXti6UMc4948VivZp0g1tiJxes5yqtWO3LWQf/mArYrQFWarUWj8lcQ=="; }; }; - "@types/eslint-8.44.6" = { + "@types/eslint-8.44.7" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.44.6"; + version = "8.44.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz"; - sha512 = "P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz"; + sha512 = "f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ=="; }; }; - "@types/eslint-scope-3.7.6" = { + "@types/eslint-scope-3.7.7" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz"; - sha512 = "zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ=="; - }; - }; - "@types/estree-0.0.39" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.39"; + version = "3.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz"; + sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="; }; }; - "@types/estree-1.0.4" = { + "@types/estree-1.0.5" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz"; - sha512 = "2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz"; + sha512 = "/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="; }; }; - "@types/estree-jsx-1.0.2" = { + "@types/estree-jsx-1.0.3" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.2.tgz"; - sha512 = "GNBWlGBMjiiiL5TSkvPtOteuXsiVitw5MYGY1UYlrAq0SKyczsls6sCD7TZ8fsjRsvCVxml7EbyjJezPb3DrSA=="; + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.3.tgz"; + sha512 = "pvQ+TKeRHeiUGRhvYwRrQ/ISnohKkSJR14fT2yqyZ4e9K5vqc7hrtY2Y1Dw0ZwAzQ6DQsxsaCUuSIIi8v0Cq6w=="; }; }; "@types/express-4.17.14" = { @@ -11110,13 +11209,13 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; - "@types/express-4.17.20" = { + "@types/express-4.17.21" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz"; - sha512 = "rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz"; + sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="; }; }; "@types/express-serve-static-core-4.17.31" = { @@ -11128,13 +11227,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.39" = { + "@types/express-serve-static-core-4.17.41" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.39"; + version = "4.17.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz"; - sha512 = "BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz"; + sha512 = "OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA=="; }; }; "@types/geojson-7946.0.4" = { @@ -11164,13 +11263,13 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/hast-2.3.7" = { + "@types/hast-2.3.8" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.7.tgz"; - sha512 = "EVLigw5zInURhzfXUM65eixfadfsHKomGKUakToXo84t8gGIJuTcD2xooM2See7GyQ7DRtYjhCHnSUQez8JaLw=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.8.tgz"; + sha512 = "aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -11182,31 +11281,31 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-cache-semantics-4.0.3" = { + "@types/http-cache-semantics-4.0.4" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha512 = "V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz"; + sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-errors-2.0.3" = { + "@types/http-errors-2.0.4" = { name = "_at_types_slash_http-errors"; packageName = "@types/http-errors"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz"; - sha512 = "pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="; + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz"; + sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="; }; }; - "@types/http-proxy-1.17.13" = { + "@types/http-proxy-1.17.14" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.13"; + version = "1.17.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz"; - sha512 = "GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; + sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; }; }; "@types/inquirer-6.5.0" = { @@ -11218,58 +11317,58 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.9" = { + "@types/inquirer-8.2.10" = { name = "_at_types_slash_inquirer"; packageName = "@types/inquirer"; - version = "8.2.9"; + version = "8.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.9.tgz"; - sha512 = "5IEO2PwCy4NZDgj977dho4Qbdiw6dJZJzD4ZaB/9j7dfppf7z0xxFPKZz/FtTAUQbDjmWHJ6Jlz/gn0YzWHPsw=="; + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz"; + sha512 = "IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA=="; }; }; - "@types/is-empty-1.2.2" = { + "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.2.tgz"; - sha512 = "BmFyKRHSsE+LFmOUQIYMg/8UJ+fNX3fxev0/OXGKWxUldHD8/bQYhXsTF7wR8woS0h8CWdLK39REjQ/Fxm6bFg=="; + url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.3.tgz"; + sha512 = "4J1l5d79hoIvsrKh5VUKVRA1aIdsOb10Hu5j3J2VfP/msDnfTdGPmNp2E1Wg+vs97Bktzo+MZePFFXSGoykYJw=="; }; }; - "@types/istanbul-lib-coverage-2.0.5" = { + "@types/istanbul-lib-coverage-2.0.6" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; - sha512 = "zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz"; + sha512 = "2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="; }; }; - "@types/istanbul-lib-report-3.0.2" = { + "@types/istanbul-lib-report-3.0.3" = { name = "_at_types_slash_istanbul-lib-report"; packageName = "@types/istanbul-lib-report"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz"; - sha512 = "8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz"; + sha512 = "NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA=="; }; }; - "@types/istanbul-reports-3.0.3" = { + "@types/istanbul-reports-3.0.4" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz"; - sha512 = "1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg=="; + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz"; + sha512 = "pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ=="; }; }; - "@types/jquery-3.5.25" = { + "@types/jquery-3.5.27" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.25"; + version = "3.5.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.25.tgz"; - sha512 = "gykx2c+OZf5nx2tv/5fDQqmvGgTiXshELy5jf9IgXPtVfSBl57IUYByN4osbwMXwJijWGOEYQABzGaFZE79A0Q=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz"; + sha512 = "TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ=="; }; }; "@types/js-levenshtein-1.1.2" = { @@ -11290,13 +11389,13 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.14" = { + "@types/json-schema-7.0.15" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.14"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz"; - sha512 = "U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"; + sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; "@types/json5-0.0.29" = { @@ -11317,22 +11416,22 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/linkify-it-3.0.4" = { + "@types/linkify-it-3.0.5" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.4.tgz"; - sha512 = "hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ=="; + url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz"; + sha512 = "yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw=="; }; }; - "@types/lodash-4.14.200" = { + "@types/lodash-4.14.201" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.200"; + version = "4.14.201"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz"; - sha512 = "YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz"; + sha512 = "y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ=="; }; }; "@types/long-4.0.2" = { @@ -11362,49 +11461,49 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/mdast-3.0.14" = { + "@types/mdast-3.0.15" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.14"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.14.tgz"; - sha512 = "gVZ04PGgw1qLZKsnWnyFv4ORnaJ+DXLdHTVSFbU8yX6xZ34Bjg4Q32yPkmveUP1yItXReKfB0Aknlh/3zxTKAw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz"; + sha512 = "LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ=="; }; }; - "@types/mdast-4.0.2" = { + "@types/mdast-4.0.3" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.2.tgz"; - sha512 = "tYR83EignvhYO9iU3kDg8V28M0jqyh9zzp5GV+EO+AYnyUl3P5ltkTeJuTiFZQFz670FSb3EwT/6LQdX+UdKfw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz"; + sha512 = "LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg=="; }; }; - "@types/mdurl-1.0.4" = { + "@types/mdurl-1.0.5" = { name = "_at_types_slash_mdurl"; packageName = "@types/mdurl"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.4.tgz"; - sha512 = "ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A=="; + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz"; + sha512 = "6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA=="; }; }; - "@types/mime-1.3.4" = { + "@types/mime-1.3.5" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz"; - sha512 = "1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz"; + sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="; }; }; - "@types/mime-3.0.3" = { + "@types/mime-3.0.4" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.3.tgz"; - sha512 = "i8MBln35l856k5iOhKk2XJ4SeAWg75mLIpZB4v6imOagKL6twsukBZGDMNhdOVk7yRFTMPpfILocMos59Q1otQ=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.4.tgz"; + sha512 = "iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw=="; }; }; "@types/minimatch-3.0.5" = { @@ -11425,22 +11524,22 @@ let sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; }; - "@types/minimist-1.2.4" = { + "@types/minimist-1.2.5" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz"; - sha512 = "Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ=="; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz"; + sha512 = "hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag=="; }; }; - "@types/ms-0.7.33" = { + "@types/ms-0.7.34" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; - version = "0.7.33"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.33.tgz"; - sha512 = "AuHIyzR5Hea7ij0P9q7vx7xu4z0C28ucwjAZC0ja7JhINyCnOw8/DnvAPQQ9TfOlCtZAmCERKQX9+o1mgQhuOQ=="; + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz"; + sha512 = "nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="; }; }; "@types/mute-stream-0.0.1" = { @@ -11452,13 +11551,13 @@ let sha512 = "0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw=="; }; }; - "@types/mute-stream-0.0.2" = { + "@types/mute-stream-0.0.4" = { name = "_at_types_slash_mute-stream"; packageName = "@types/mute-stream"; - version = "0.0.2"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.2.tgz"; - sha512 = "FpiGjk6+IOrN0lZEfUUjdra1csU1VxwYFj4S0Zj+TJpu5x5mZW30RkEZojTadrNZHNmpCHgoE62IQZAH0OeuIA=="; + url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz"; + sha512 = "CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow=="; }; }; "@types/nanoid-3.0.0" = { @@ -11470,13 +11569,13 @@ let sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ=="; }; }; - "@types/nlcst-1.0.3" = { + "@types/nlcst-1.0.4" = { name = "_at_types_slash_nlcst"; packageName = "@types/nlcst"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.3.tgz"; - sha512 = "cpO6PPMz4E++zxP2Vhp/3KVl2Nbtj+Iksb25rlRinG7mphu2zmCIKWWlqdsx1NwJEISogR2eeZTD7JqLOCzaiw=="; + url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.4.tgz"; + sha512 = "ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg=="; }; }; "@types/node-10.17.60" = { @@ -11515,13 +11614,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.60" = { + "@types/node-16.18.61" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.60"; + version = "16.18.61"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz"; - sha512 = "ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.61.tgz"; + sha512 = "k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q=="; }; }; "@types/node-16.9.1" = { @@ -11533,22 +11632,22 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.11.19" = { + "@types/node-18.18.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.19"; + version = "18.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz"; - sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; + sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; }; }; - "@types/node-18.18.8" = { + "@types/node-18.18.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.18.8"; + version = "18.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; - sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.9.tgz"; + sha512 = "0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ=="; }; }; "@types/node-20.5.9" = { @@ -11560,13 +11659,13 @@ let sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; }; }; - "@types/node-20.8.10" = { + "@types/node-20.9.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.10"; + version = "20.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; - sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz"; + sha512 = "nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw=="; }; }; "@types/node-6.14.13" = { @@ -11587,121 +11686,112 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; - "@types/node-fetch-2.6.8" = { + "@types/node-fetch-2.6.9" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "nnH5lV9QCMPsbEVdTb5Y+F3GQxLSw1xQgIydrb2gSfEavRPs50FnMr+KUaa+LoPSqibm2N+ZZxH7lavZlAT4GA=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA=="; }; }; - "@types/node-forge-1.3.8" = { + "@types/node-forge-1.3.9" = { name = "_at_types_slash_node-forge"; packageName = "@types/node-forge"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz"; - sha512 = "vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg=="; + url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.9.tgz"; + sha512 = "meK88cx/sTalPSLSoCzkiUB4VPIFHmxtXm5FaaqRDqBX2i/Sy8bJ4odsan0b20RBjPh06dAQ+OTTdnyQyhJZyQ=="; }; }; - "@types/normalize-package-data-2.4.3" = { + "@types/normalize-package-data-2.4.4" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz"; - sha512 = "ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz"; + sha512 = "37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="; }; }; - "@types/parse-json-4.0.1" = { + "@types/parse-json-4.0.2" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz"; - sha512 = "3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="; - }; - }; - "@types/parse5-5.0.3" = { - name = "_at_types_slash_parse5"; - packageName = "@types/parse5"; - version = "5.0.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"; - sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz"; + sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="; }; }; - "@types/prop-types-15.7.9" = { + "@types/prop-types-15.7.10" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; - version = "15.7.9"; + version = "15.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz"; - sha512 = "n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g=="; + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz"; + sha512 = "mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A=="; }; }; - "@types/pug-2.0.8" = { + "@types/pug-2.0.9" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.8.tgz"; - sha512 = "QzhsZ1dMGyJbn/D9V80zp4GIA4J4rfAjCCxc3MP+new0E8dyVdSkR735Lx+n3LIaHNFcjHL5+TbziccuT+fdoQ=="; + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.9.tgz"; + sha512 = "Yg4LkgFYvn1faISbDNWmcAC1XoDT8IoMUFspp5mnagKk+UvD2N0IWt5A7GRdMubsNWqgCLmrkf8rXkzNqb4szA=="; }; }; - "@types/qs-6.9.9" = { + "@types/qs-6.9.10" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.9"; + version = "6.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz"; - sha512 = "wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz"; + sha512 = "3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw=="; }; }; - "@types/range-parser-1.2.6" = { + "@types/range-parser-1.2.7" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz"; - sha512 = "+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz"; + sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.2.34" = { + "@types/react-18.2.37" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.34"; + version = "18.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.34.tgz"; - sha512 = "U6eW/alrRk37FU/MS2RYMjx0Va2JGIVXELTODaTIYgvWGCV4Y4TfTUzG8DdmpDNIT0Xpj/R7GfyHOJJrDttcvg=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz"; + sha512 = "RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw=="; }; }; - "@types/react-dom-18.2.14" = { + "@types/react-dom-18.2.15" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "18.2.14"; + version = "18.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz"; - sha512 = "V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz"; + sha512 = "HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg=="; }; }; - "@types/readdir-glob-1.1.3" = { + "@types/readdir-glob-1.1.4" = { name = "_at_types_slash_readdir-glob"; packageName = "@types/readdir-glob"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.3.tgz"; - sha512 = "trCChHpWDGCJCUPJRwD62eapW4KOru6h4S7n9KUIESaxhyBM/2Jh20P3XrFRQQ6Df78E/rq2DbUCVZlI8CXPnA=="; + url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.4.tgz"; + sha512 = "uEJsErL2wFCTcbbmJpIuD8OWYNabgv1oaYP2bOkzZXKtk3c6LCYQEKngIqBj2VR2NMv9DOAXSkxSYOWtHxh2gQ=="; }; }; - "@types/responselike-1.0.2" = { + "@types/responselike-1.0.3" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz"; - sha512 = "/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz"; + sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw=="; }; }; "@types/retry-0.12.0" = { @@ -11713,31 +11803,22 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/retry-0.12.4" = { + "@types/retry-0.12.5" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.4.tgz"; - sha512 = "l1YzFLj8Y6OhLdt7HKXlz56DoEmksB7qR8KVk+MpFsS4duwnoszLgDlLxJB0vgSqtg/rAS5gmYg5Bjw2sMJ8Ew=="; - }; - }; - "@types/sarif-2.1.6" = { - name = "_at_types_slash_sarif"; - packageName = "@types/sarif"; - version = "2.1.6"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.6.tgz"; - sha512 = "x+68l19JJnfXX9oq85k6KZwsPuOa2BKESkYqbRbA09zLSZXIDNyDo1illgDB/P0ZdpIa4EII3pHJ6DQq3xo3Qw=="; + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.5.tgz"; + sha512 = "3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw=="; }; }; - "@types/scheduler-0.16.5" = { + "@types/scheduler-0.16.6" = { name = "_at_types_slash_scheduler"; packageName = "@types/scheduler"; - version = "0.16.5"; + version = "0.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz"; - sha512 = "s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw=="; + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz"; + sha512 = "Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA=="; }; }; "@types/seedrandom-3.0.1" = { @@ -11749,58 +11830,67 @@ let sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; }; }; - "@types/semver-7.5.4" = { + "@types/semver-7.5.5" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz"; - sha512 = "MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz"; + sha512 = "+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg=="; }; }; - "@types/send-0.17.3" = { + "@types/send-0.17.4" = { name = "_at_types_slash_send"; packageName = "@types/send"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz"; - sha512 = "/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug=="; + url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz"; + sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA=="; }; }; - "@types/serve-index-1.9.3" = { + "@types/serve-index-1.9.4" = { name = "_at_types_slash_serve-index"; packageName = "@types/serve-index"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz"; - sha512 = "4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg=="; + url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz"; + sha512 = "qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug=="; }; }; - "@types/serve-static-1.15.4" = { + "@types/serve-static-1.15.5" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz"; - sha512 = "aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz"; + sha512 = "PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ=="; }; }; - "@types/sizzle-2.3.5" = { + "@types/shimmer-1.0.5" = { + name = "_at_types_slash_shimmer"; + packageName = "@types/shimmer"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz"; + sha512 = "9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww=="; + }; + }; + "@types/sizzle-2.3.6" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.5.tgz"; - sha512 = "tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.6.tgz"; + sha512 = "m04Om5Gz6kbjUwAQ7XJJQ30OdEFsSmAVsvn4NYwcTRyMVpKKa1aPuESw1n2CxS5fYkOQv3nHgDKeNa8e76fUkw=="; }; }; - "@types/sockjs-0.3.35" = { + "@types/sockjs-0.3.36" = { name = "_at_types_slash_sockjs"; packageName = "@types/sockjs"; - version = "0.3.35"; + version = "0.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz"; - sha512 = "tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw=="; + url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz"; + sha512 = "MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q=="; }; }; "@types/superagent-3.8.2" = { @@ -11812,40 +11902,40 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; - "@types/supports-color-8.1.2" = { + "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.2.tgz"; - sha512 = "nhs1D8NjNueBqRBhBTsc81g90g7VBD4wnMTMy9oP+QIldHuJkE655QTL2D1jkj3LyCd+Q5Y69oOpfxN1l0eCMA=="; + url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz"; + sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg=="; }; }; - "@types/through-0.0.32" = { + "@types/through-0.0.33" = { name = "_at_types_slash_through"; packageName = "@types/through"; - version = "0.0.32"; + version = "0.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/through/-/through-0.0.32.tgz"; - sha512 = "7XsfXIsjdfJM2wFDRAtEWp3zb2aVPk5QeyZxGlVK57q4u26DczMHhJmlhr0Jqv0THwxam/L8REXkj8M2I/lcvw=="; + url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz"; + sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ=="; }; }; - "@types/tinycolor2-1.4.5" = { + "@types/tinycolor2-1.4.6" = { name = "_at_types_slash_tinycolor2"; packageName = "@types/tinycolor2"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.5.tgz"; - sha512 = "uLJijDHN5E6j5n1qefF9oaeplgszXglWXWTviMoFr/YxgvbyrkFil20yDT7ljhCiTQ/BfCYtxfJS81LdTro5DQ=="; + url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz"; + sha512 = "iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw=="; }; }; - "@types/triple-beam-1.3.4" = { + "@types/triple-beam-1.3.5" = { name = "_at_types_slash_triple-beam"; packageName = "@types/triple-beam"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.4.tgz"; - sha512 = "HlJjF3wxV4R2VQkFpKe0YqJLilYNgtRtsqqZtby7RkVsSs+i+vbyzjtUwpFEdUCKcrGzCiEJE7F/0mKjh0sunA=="; + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz"; + sha512 = "6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw=="; }; }; "@types/tunnel-0.0.3" = { @@ -11857,31 +11947,31 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/unist-2.0.9" = { + "@types/unist-2.0.10" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.9.tgz"; - sha512 = "zC0iXxAv1C1ERURduJueYzkzZ2zaGyc+P2c95hgkikHPr3z8EdUZOlgEQ5X0DRmwDZn+hekycQnoeiiRVrmilQ=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz"; + sha512 = "IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA=="; }; }; - "@types/unist-3.0.1" = { + "@types/unist-3.0.2" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.1.tgz"; - sha512 = "ue/hDUpPjC85m+PM9OQDMZr3LywT+CT6mPsQq8OJtCLiERkGRcQUFvu9XASF5XWqyZFXbf15lvb3JFJ4dRLWPg=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz"; + sha512 = "dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="; }; }; - "@types/urijs-1.19.22" = { + "@types/urijs-1.19.23" = { name = "_at_types_slash_urijs"; packageName = "@types/urijs"; - version = "1.19.22"; + version = "1.19.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.22.tgz"; - sha512 = "qnYBwfN7O/+i6E1Kr8JaCKsrCLpRCiQ1XxkSxNIYuJ/5Aagt0+HlMX78DJMUrNzDULMz0eu2gcprlxJaDtACOw=="; + url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.23.tgz"; + sha512 = "3Zbk6RzmIpvKTNEHO2RcPOGHM++BQEITMqBRR1Ju32WbruhV/pygYgxiP3xA0b1B88zjzs0Izzjxsbj768+IjA=="; }; }; "@types/vscode-1.75.1" = { @@ -11911,22 +12001,22 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.8" = { + "@types/ws-8.5.9" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.8"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz"; - sha512 = "flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.9.tgz"; + sha512 = "jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg=="; }; }; - "@types/yargs-15.0.17" = { + "@types/yargs-15.0.18" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.17"; + version = "15.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.17.tgz"; - sha512 = "cj53I8GUcWJIgWVTSVe2L7NJAB5XWGdsoMosVvUgv1jEnMbAcsbaCzt1coUcyi8Sda5PgTWAooG8jNyDTD+CWA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.18.tgz"; + sha512 = "DDi2KmvAnNsT/EvU8jp1UR7pOJojBtJ3GLZ/uw1MUq4VbbESppPWoHUY4h0OB4BbEbGJiyEsmUcuZDZtoR+ZwQ=="; }; }; "@types/yargs-16.0.5" = { @@ -11938,22 +12028,22 @@ let sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-parser-21.0.2" = { + "@types/yargs-parser-21.0.3" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "21.0.2"; + version = "21.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz"; - sha512 = "5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz"; + sha512 = "I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="; }; }; - "@types/yauzl-2.10.2" = { + "@types/yauzl-2.10.3" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz"; - sha512 = "Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA=="; + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz"; + sha512 = "oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="; }; }; "@types/yoga-layout-1.9.2" = { @@ -11974,13 +12064,13 @@ let sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; }; }; - "@typescript-eslint/eslint-plugin-6.9.1" = { + "@typescript-eslint/eslint-plugin-6.10.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz"; - sha512 = "w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz"; + sha512 = "uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg=="; }; }; "@typescript-eslint/parser-6.0.0" = { @@ -11992,13 +12082,13 @@ let sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; }; }; - "@typescript-eslint/parser-6.9.1" = { + "@typescript-eslint/parser-6.10.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz"; - sha512 = "C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz"; + sha512 = "+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog=="; }; }; "@typescript-eslint/scope-manager-6.0.0" = { @@ -12010,13 +12100,13 @@ let sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; }; }; - "@typescript-eslint/scope-manager-6.9.1" = { + "@typescript-eslint/scope-manager-6.10.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz"; - sha512 = "38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz"; + sha512 = "TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg=="; }; }; "@typescript-eslint/type-utils-6.0.0" = { @@ -12028,13 +12118,13 @@ let sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; }; }; - "@typescript-eslint/type-utils-6.9.1" = { + "@typescript-eslint/type-utils-6.10.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz"; - sha512 = "eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz"; + sha512 = "wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg=="; }; }; "@typescript-eslint/types-6.0.0" = { @@ -12046,13 +12136,13 @@ let sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; }; }; - "@typescript-eslint/types-6.9.1" = { + "@typescript-eslint/types-6.10.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz"; - sha512 = "BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz"; + sha512 = "36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg=="; }; }; "@typescript-eslint/typescript-estree-6.0.0" = { @@ -12064,13 +12154,13 @@ let sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; }; }; - "@typescript-eslint/typescript-estree-6.9.1" = { + "@typescript-eslint/typescript-estree-6.10.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz"; - sha512 = "U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz"; + sha512 = "ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg=="; }; }; "@typescript-eslint/utils-6.0.0" = { @@ -12082,13 +12172,13 @@ let sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; }; }; - "@typescript-eslint/utils-6.9.1" = { + "@typescript-eslint/utils-6.10.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz"; - sha512 = "L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz"; + sha512 = "v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg=="; }; }; "@typescript-eslint/visitor-keys-6.0.0" = { @@ -12100,13 +12190,13 @@ let sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; }; }; - "@typescript-eslint/visitor-keys-6.9.1" = { + "@typescript-eslint/visitor-keys-6.10.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz"; - sha512 = "MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz"; + sha512 = "xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg=="; }; }; "@ungap/structured-clone-1.2.0" = { @@ -12154,22 +12244,22 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-7.2.2" = { + "@vercel/build-utils-7.2.3" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.2.tgz"; - sha512 = "CUMgVKTJCba5tGe+KZaVvwGUCsuSeuNEmPIzMggIMDtzdqllRu8+QjjIhEI+unHoYvUgGfen6Z5lMeMo9Ne0qQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.3.tgz"; + sha512 = "mo1w4SXUN+obQlg9wMTdc9xLJnrfubpreZmOTyK70icOcCEOXP5sKm044/PM2GZrzkWIXYYAfcMxNnOmWQMR0g=="; }; }; - "@vercel/error-utils-2.0.1" = { + "@vercel/error-utils-2.0.2" = { name = "_at_vercel_slash_error-utils"; packageName = "@vercel/error-utils"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.1.tgz"; - sha512 = "ZUVpRFArh5eyKpJmdfEuCaMpZKQvZgUq0pQ7PdK8m5FgRYEvF4I0TMJH3JnkbYaMMUH82aYWZr+/hFJtEBcmTQ=="; + url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.2.tgz"; + sha512 = "Sj0LFafGpYr6pfCqrQ82X6ukRl5qpmVrHM/191kNYFqkkB9YkjlMAj6QcEsvCG259x4QZ7Tya++0AB85NDPbKQ=="; }; }; "@vercel/fun-1.1.0" = { @@ -12190,13 +12280,13 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.8" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.9" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.8.tgz"; - sha512 = "cK6YR0jLP6gLFXYk74JGP5IDSXP8u6mtIhWQ63Ud0eQId0HZZJNy+LCOhSSRDupbC0+lAWsHiEMsBBtkDMKWLg=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.9.tgz"; + sha512 = "TwGki2MRL4o75ji/4MOjjpfKP6vq87oME/qpBpcWl+CYt/mx3NaWnNwjhEoEkakrZrrHp0Aw9HYBeAksWsjudw=="; }; }; "@vercel/go-3.0.3" = { @@ -12217,13 +12307,13 @@ let sha512 = "4PYk4LeIWPTjGtgnxvB0Hdw7aqCau843/96K2xX3z9pa0Hn//pUnZBMz2jrs5MRseCm1Li1LdQAK3u8/vaUnVQ=="; }; }; - "@vercel/next-4.0.11" = { + "@vercel/next-4.0.14" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.0.11"; + version = "4.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.11.tgz"; - sha512 = "eoSZW6vE9jaIksBwiV/EM7bYK8A3R2+u0a0wNv53kYi1R8QD2SUmLcwzpT13Z5/YF3Gk9AKsC8lLzqgNzeI4PQ=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.14.tgz"; + sha512 = "29x93X278ElpbftrSgHvdY9OGVZkHurm3ST/WbdyE/AASEuqwOvShkpAoQl8idlFJFHPjd4c2v5xv1ZVyEb6sg=="; }; }; "@vercel/nft-0.24.2" = { @@ -12235,13 +12325,13 @@ let sha512 = "KhY3Ky/lCqE+fHpOXiKOLnXYJ49PZh1dyDSfVtZhmYtmica0NQgyO6kPOAGDNWqD9IOBx8hb65upxxjfnfa1JA=="; }; }; - "@vercel/node-3.0.7" = { + "@vercel/node-3.0.9" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.0.7"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.7.tgz"; - sha512 = "0KrDGi6z+qPtCyC7wSHmHDU/ot352AJpAeAO1OIEYqYFsYwzvwuyu7TbGGwiUbtolij4/EBUCls3YmwADM/vKw=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.9.tgz"; + sha512 = "vDkxXdO6aZQWrvYOZpUtz7WTcpdUn2cgjmqdEztjK3tnXAp988FcCNTivGG/uDUmsQPIQ/XQvUjkBRLlIWTSeA=="; }; }; "@vercel/python-4.1.0" = { @@ -12262,13 +12352,13 @@ let sha512 = "9iWTxfMkC7yNnwN2xxOdptiIDAgXe1V1fh3aw92MWt5PBRcFY9RqgIPF7Q3Qa7yzQFgpbHwCnSTqWO+HCEuFtw=="; }; }; - "@vercel/remix-builder-2.0.10" = { + "@vercel/remix-builder-2.0.11" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.10.tgz"; - sha512 = "RRVIodMFWHkw/Y3Cko4A5vIVuom8Ox+XwS5kqsW4tpSKWL9eBD3mVmNPR7MDQdt5v/9sL+8o2KSCjbjzOdIaLg=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.11.tgz"; + sha512 = "blp+PPXFZ4KWLHrh0PZfR9Er/yOQAzPJLbmvJtfJIBnes8SVmIWB89xl+P89HVruknK+FNvCotEFCU41DUjoWw=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -12289,13 +12379,13 @@ let sha512 = "MqFynhtZ905L210DWAbgkiEQEK39LTtp9eL2Nm6PjzhjNzU6hV0UfK8Z24vU9CC6J4mrUTTZx396fH7XTYJWqg=="; }; }; - "@vercel/static-build-2.0.9" = { + "@vercel/static-build-2.0.10" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.9.tgz"; - sha512 = "OReIxBZkGo/xKAWMtGQRh7lu6SpVAmKg7Z/1ACXJVhTWCbOqhw8obI7Gf4ynYHrNrv9yjE4w6L8gdqaWLBOWGA=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.10.tgz"; + sha512 = "H3YM60+Jx/X9YbHrPaQYflJiSC5fQu9R39j+njIAQAQHiitiqFAnFEzQfOXSp52csb0uJ9XacL94vjzQ/T2S5w=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12586,22 +12676,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.3.7" = { + "@vue/compiler-core-3.3.8" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.7.tgz"; - sha512 = "pACdY6YnTNVLXsB86YD8OF9ihwpolzhhtdLVHhBL6do/ykr6kKXNYABRtNMGrsQXpEXXyAdwvWWkuTbs4MFtPQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz"; + sha512 = "hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g=="; }; }; - "@vue/compiler-dom-3.3.7" = { + "@vue/compiler-dom-3.3.8" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.7.tgz"; - sha512 = "0LwkyJjnUPssXv/d1vNJ0PKfBlDoQs7n81CbO6Q0zdL7H1EzqYRrTVXDqdBVqro0aJjo/FOa1qBAPVI4PGSHBw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz"; + sha512 = "+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ=="; }; }; "@vue/compiler-sfc-2.7.15" = { @@ -12613,49 +12703,49 @@ let sha512 = "FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg=="; }; }; - "@vue/compiler-sfc-3.3.7" = { + "@vue/compiler-sfc-3.3.8" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.7.tgz"; - sha512 = "7pfldWy/J75U/ZyYIXRVqvLRw3vmfxDo2YLMwVtWVNew8Sm8d6wodM+OYFq4ll/UxfqVr0XKiVwti32PCrruAw=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz"; + sha512 = "WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA=="; }; }; - "@vue/compiler-ssr-3.3.7" = { + "@vue/compiler-ssr-3.3.8" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.7.tgz"; - sha512 = "TxOfNVVeH3zgBc82kcUv+emNHo+vKnlRrkv8YvQU5+Y5LJGJwSNzcmLUoxD/dNzv0bhQ/F0s+InlgV0NrApJZg=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz"; + sha512 = "hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w=="; }; }; - "@vue/reactivity-3.3.7" = { + "@vue/reactivity-3.3.8" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.7.tgz"; - sha512 = "cZNVjWiw00708WqT0zRpyAgduG79dScKEPYJXq2xj/aMtk3SKvL3FBt2QKUlh6EHBJ1m8RhBY+ikBUzwc7/khg=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.8.tgz"; + sha512 = "ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw=="; }; }; - "@vue/reactivity-transform-3.3.7" = { + "@vue/reactivity-transform-3.3.8" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.7.tgz"; - sha512 = "APhRmLVbgE1VPGtoLQoWBJEaQk4V8JUsqrQihImVqKT+8U6Qi3t5ATcg4Y9wGAPb3kIhetpufyZ1RhwbZCIdDA=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz"; + sha512 = "49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw=="; }; }; - "@vue/shared-3.3.7" = { + "@vue/shared-3.3.8" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.7.tgz"; - sha512 = "N/tbkINRUDExgcPTBvxNkvHGu504k8lzlNQRITVnm6YjOjwa4r0nnbd4Jb01sNpur5hAllyRJzSK5PvB9PPwRg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz"; + sha512 = "8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -13495,78 +13585,6 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-12.3.0" = { - name = "_at_zwave-js_slash_cc"; - packageName = "@zwave-js/cc"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.3.0.tgz"; - sha512 = "oEajP6yigFlHtGmorlQQ6L5RacwZciDBFihjZJxvxbbzOcoKskaxdR62SR51nf6o7jeWMudSP1jra6dYz5Q18A=="; - }; - }; - "@zwave-js/config-12.3.0" = { - name = "_at_zwave-js_slash_config"; - packageName = "@zwave-js/config"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.3.0.tgz"; - sha512 = "idwjJrYFFaPZ70ZZV8kOQSee/dVQmz1qAKy53aS0bLrKihX/qr66hjApnyAR+fgqKBXsvaFk1QJm8dy+Q/g1WQ=="; - }; - }; - "@zwave-js/core-12.3.0" = { - name = "_at_zwave-js_slash_core"; - packageName = "@zwave-js/core"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.3.0.tgz"; - sha512 = "QHH5brGId+gr/bwrAkkjg4CGDRJb9PKCqy6jdLNxPhJdNSRaQ2DLzlWfKbfGnyYd39U6/b/JdGg9h+Gutb9s0w=="; - }; - }; - "@zwave-js/host-12.3.0" = { - name = "_at_zwave-js_slash_host"; - packageName = "@zwave-js/host"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.3.0.tgz"; - sha512 = "2ngot/kI363S2iLglKCTqwHjhVeuX6nCjynuak1RZXSRO1oH0W8JxNfVL9WexadBj9ygrdHtRTIUY4e1csbcIw=="; - }; - }; - "@zwave-js/nvmedit-12.3.0" = { - name = "_at_zwave-js_slash_nvmedit"; - packageName = "@zwave-js/nvmedit"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.3.0.tgz"; - sha512 = "eAPvpOSNS5wzS6Hs7+BOmDtAbIoozfOyB6/TOW9DtwEHdvKreR4x4D/tUVvxqnc7icCOcLo+iOM8jqR3VYXbMg=="; - }; - }; - "@zwave-js/serial-12.3.0" = { - name = "_at_zwave-js_slash_serial"; - packageName = "@zwave-js/serial"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.3.0.tgz"; - sha512 = "mNjGI2BzDua+dL7T9nqxAqBqwL8cZvP5SJw0aZ4vPUERnSJGd230dbTSjvOA0VrO7DwU21UHcI86uMUD2yOgDQ=="; - }; - }; - "@zwave-js/shared-12.2.3" = { - name = "_at_zwave-js_slash_shared"; - packageName = "@zwave-js/shared"; - version = "12.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-12.2.3.tgz"; - sha512 = "UwUas5IZxaPywaTY8lQNBE/e5aEWddgHQGJ3yn6Se0O717SeboIlw+Xu3befPBANadCk7EFGiN2SX/DaQCyggQ=="; - }; - }; - "@zwave-js/testing-12.3.0" = { - name = "_at_zwave-js_slash_testing"; - packageName = "@zwave-js/testing"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.3.0.tgz"; - sha512 = "mAyimQf+uuTj3CfciAGw+xBRz5WvbEAaUCATI0aHoSxd21pbYFcrspLpnotQK8rbAbUHTb+fGzHj4unFTVrkvw=="; - }; - }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -13981,6 +13999,15 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; + "aggregate-error-5.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-5.0.0.tgz"; + sha512 = "gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw=="; + }; + }; "airplay-js-0.3.0" = { name = "airplay-js"; packageName = "airplay-js"; @@ -14107,22 +14134,13 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "alcalzone-shared-4.0.8" = { - name = "alcalzone-shared"; - packageName = "alcalzone-shared"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-4.0.8.tgz"; - sha512 = "Rr0efCjNL9lw7miDvU8exL87Y42ehsLU2jUGNQUphhnlvxnTMrHeApWgoOSGZvsE2PhxC3KO7Z+VpQ/IbuV3aA=="; - }; - }; - "alex-9.1.1" = { + "alex-11.0.1" = { name = "alex"; packageName = "alex"; - version = "9.1.1"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-9.1.1.tgz"; - sha512 = "2mYyFfQnzWzDd6lSACRePBj8YP6fzzvclPkfGfYrY6vPNFDoQKrCAAdF0XCKROGJGnbSWX1K5PrxixVTaV5ODw=="; + url = "https://registry.npmjs.org/alex/-/alex-11.0.1.tgz"; + sha512 = "rKLBZxD/lvuykdC6XB8ma9YjDl46j9ayHROZUtC1yJ2jlGpoP7RZR1tBBSjtlr260ixIW6iCkqAnHzmti5Q6CQ=="; }; }; "align-text-0.1.4" = { @@ -14134,13 +14152,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.771" = { + "all-package-names-2.0.773" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.771"; + version = "2.0.773"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.771.tgz"; - sha512 = "rOeeaPYdzDezjpnh6K3ZxaReFsd+Ecflii66nAVcwD/72aU5lO6Bb4OIW8wVOOnUDvhloaqKf3Y1Tl0NqrnQAw=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.773.tgz"; + sha512 = "ub74H8f5oeGhTMCl5fueOGG0uIamGvFpYuu2ADZdV26tpXNV1xm6G/05ffpYa5UF2FvVFdo5VnTJqnD6e9G4MQ=="; }; }; "amdefine-1.0.1" = { @@ -14629,13 +14647,13 @@ let sha512 = "zy9cHePtMP0YhwG+CfHm0bgwdnga2X3gZexpdCwEj//dpb+TKajtiC8REEUJUSq6Ab4f9cgNy2l8ObXzCXFkEw=="; }; }; - "applicationinsights-2.3.6" = { + "applicationinsights-2.7.3" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "2.3.6"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.3.6.tgz"; - sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.7.3.tgz"; + sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw=="; }; }; "applicationinsights-native-metrics-0.0.10" = { @@ -15457,13 +15475,13 @@ let sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-3.2.4" = { + "async-3.2.5" = { name = "async"; packageName = "async"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + url = "https://registry.npmjs.org/async/-/async-3.2.5.tgz"; + sha512 = "baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="; }; }; "async-done-1.3.2" = { @@ -15700,13 +15718,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.18.3" = { + "aws-crt-1.19.0" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.3.tgz"; - sha512 = "SgY9bKtQQpuqWuXMdJS07lIr4JV80nFS4bpR9cW1TbfOhRLDBIHSHc/iat7T+6Co7+ukni1dhd5iZ0Uf24vqtQ=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.19.0.tgz"; + sha512 = "pBRSpy4TsL/fxW7Lp1xpN1FhnxvtBXFYx3Njo/j/m8GSV3Ytq/mBetYq7vhDb7CJQmFJCWod9I0yShqjiSUuyQ=="; }; }; "aws-sdk-2.1340.0" = { @@ -15727,13 +15745,13 @@ let sha512 = "U7kAHRbvTy753IXKV8Oom/AqlqnsbXG+Kw5gRbKi6VcsZ3hR/EpNMzdRXTWO5U415bnLWGo8WAqIz67PIaaKsw=="; }; }; - "aws-sdk-2.1486.0" = { + "aws-sdk-2.1492.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1486.0"; + version = "2.1492.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1486.0.tgz"; - sha512 = "YVGhKGWP5mHWIla6/a7MXwHyKrjcy2xIo65Z6rCvG2uxVa3NxGz4Wo7yNRqA8QGCS6buYz9MmRJLv2KOtkb7JQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1492.0.tgz"; + sha512 = "3q17ruBkwb3pL87CHSbRlYiwx1LCq7D7hIjHgZ/5SPeKknkXgkHnD20SD2lC8Nj3xGbpIUhoKXcpDAGgIM5DBA=="; }; }; "aws-sign2-0.7.0" = { @@ -15781,15 +15799,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { - name = "axios"; - packageName = "axios"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - }; "axios-0.25.0" = { name = "axios"; packageName = "axios"; @@ -15817,13 +15826,13 @@ let sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; }; - "axios-1.6.0" = { + "axios-1.6.1" = { name = "axios"; packageName = "axios"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz"; - sha512 = "EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg=="; + url = "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz"; + sha512 = "vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g=="; }; }; "axobject-query-3.2.1" = { @@ -16006,15 +16015,6 @@ let sha512 = "gX8v+l+BTue2lmmqD/yQiR6JUUY+5OWNZTI1qyusViqC9R2iv4YFPqT23IcJfpYqlYb3DOiwunfVjKLickdQ6g=="; }; }; - "backslash-0.2.0" = { - name = "backslash"; - packageName = "backslash"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/backslash/-/backslash-0.2.0.tgz"; - sha512 = "Avs+8FUZ1HF/VFP4YWwHQZSGzRPm37ukU1JQYQWijuHhtXdOuAzcZ8PcAzfIw898a8PyBzdn+RtnKA6MzW0X2A=="; - }; - }; "bail-1.0.5" = { name = "bail"; packageName = "bail"; @@ -16879,15 +16879,6 @@ let sha512 = "yL8sYzt0avlYGOY6LqtECkGrJOY3cCLAbFPaNfgE+4fD45ZrdYqLdY8yF4bqyTkpfW9e6W0YqBkN7dIn/PrZoA=="; }; }; - "boxen-4.2.0" = { - name = "boxen"; - packageName = "boxen"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; - sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; - }; - }; "boxen-5.1.2" = { name = "boxen"; packageName = "boxen"; @@ -18022,13 +18013,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001559" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001559"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz"; - sha512 = "cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "canvas-2.11.2" = { @@ -18157,31 +18148,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.67.6" = { + "cdk8s-2.68.2" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.67.6"; + version = "2.68.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.67.6.tgz"; - sha512 = "GlIeZmXxnPRWNtxgMXhHOV/qPy5kyaxgA4uUpQTn9bVgBwwMnv9AmVeQKiLjRQ0Mq0DjVWHTVXnmP1mu3zjQ6Q=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.2.tgz"; + sha512 = "95DmLwUW0dv+2RK7J/IdYqgRWDNVV9YN6dZaPIjbzoE0Y1D4HIGe51oCJpaa1bYAMba7v+sippd2pLxA7dxdIA=="; }; }; - "cdk8s-plus-25-2.22.49" = { + "cdk8s-plus-25-2.22.54" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.49"; + version = "2.22.54"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.49.tgz"; - sha512 = "qQTymImB/uu89WiipR1pMuGJP/CS1o8QHdye4abPYT085H6i9P1lzxvvWtXnjYUFScU63X79R5uh8xx2AzaO0A=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.54.tgz"; + sha512 = "ZYeuv3aw5E/SviEP1r49H0CauzacJAkSj3f9InMmI0PlMJNNDrXxly6OxnNxP+hnUXCRMo+YjZMr+tBz4SjaNA=="; }; }; - "cdktf-0.19.0" = { + "cdktf-0.19.1" = { name = "cdktf"; packageName = "cdktf"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.19.0.tgz"; - sha512 = "5tcNhvrvsE9WawC5cPwV7B9ATQ5lWNjyCJN7EnMofxTtkBEdnnGx0esC+vpNO4Fs0LhmV37qCUlm+K6anZaPYw=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.19.1.tgz"; + sha512 = "scZhp2+FEgNUd+l5vaDCHABdwFApB1Lcknn2+dUw8aYwNsMoYT0tWs4AzPg22Z4jQFOIQLIXmBxifhr+RahdRg=="; }; }; "center-align-0.1.3" = { @@ -18328,15 +18319,6 @@ let sha512 = "shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="; }; }; - "character-entities-html4-1.1.4" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz"; - sha512 = "HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g=="; - }; - }; "character-entities-html4-2.1.0" = { name = "character-entities-html4"; packageName = "character-entities-html4"; @@ -18706,6 +18688,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "cjs-module-lexer-1.2.3" = { + name = "cjs-module-lexer"; + packageName = "cjs-module-lexer"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz"; + sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="; + }; + }; "clap-1.2.3" = { name = "clap"; packageName = "clap"; @@ -18796,6 +18787,15 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; + "clean-stack-5.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-5.2.0.tgz"; + sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ=="; + }; + }; "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; @@ -19030,6 +19030,15 @@ let sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; }; }; + "cli-truncate-4.0.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz"; + sha512 = "nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -19489,15 +19498,6 @@ let sha512 = "hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A=="; }; }; - "collapse-white-space-1.0.6" = { - name = "collapse-white-space"; - packageName = "collapse-white-space"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; - sha512 = "jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="; - }; - }; "collection-map-1.0.0" = { name = "collection-map"; packageName = "collection-map"; @@ -21236,22 +21236,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-7.3.8" = { + "cspell-dictionary-8.0.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-7.3.8.tgz"; - sha512 = "gkq4t78eLR0xC3P0vDDHPeNY4iZRd5YE6Z8uDJ7RM4UaX/TSdVUN9KNFr34RnJ119NYVHujpL9+uW7wPSAe8Eg=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.0.0.tgz"; + sha512 = "R/AzUj7W7F4O4fAOL8jvIiUqPYGy6jIBlDkxO9SZe/A6D2kOICZZzGSXMZ0M7OKYqxc6cioQUMKOJsLkDXfDXw=="; }; }; - "cspell-gitignore-7.3.8" = { + "cspell-gitignore-8.0.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-7.3.8.tgz"; - sha512 = "vJzCOUEiw6/MwV/U4Ux3bgSdj9mXB+X5eHL+qzVoyFI7ArlvrkuGTL+iFJThQcS8McM3SGqtvaBNCiKBmAeCkA=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.0.0.tgz"; + sha512 = "Uv+ENdUm+EXwQuG9187lKmE1t8b2KW+6VaQHP7r01WiuhkwhfzmWA7C30iXVcwRcsMw07wKiWvMEtG6Zlzi6lQ=="; }; }; "cspell-glob-0.1.25" = { @@ -21263,22 +21263,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-7.3.8" = { + "cspell-glob-8.0.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-7.3.8.tgz"; - sha512 = "wUZC6znyxEs0wlhzGfZ4XHkATPJyazJIFi/VvAdj+KHe7U8SoSgitJVDQqdgectI2y3MxR7lQdVLX9dONFh+7A=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.0.0.tgz"; + sha512 = "wOkRA1OTIPhyN7a+k9Qq45yFXM+tBFi9DS5ObiLv6t6VTBIeMQpwRK0KLViHmjTgiA6eWx53Dnr+DZfxcAkcZA=="; }; }; - "cspell-grammar-7.3.8" = { + "cspell-grammar-8.0.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-7.3.8.tgz"; - sha512 = "nTjAlMAZAVSFhBd9U3MB9l5FfC5JCCr9DTOA2wWxusVOm+36MbSEH90ucLPkhPa9/+0HtbpDhqVMwXCZllRpsg=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.0.0.tgz"; + sha512 = "uxpRvbBxOih6SjFQvKTBPTA+YyqYM5UFTNTFuRnA6g6WZeg+NJaTkbQrTgXja4B2r8MJ6XU22YrKTtHNNcP7bQ=="; }; }; "cspell-io-4.1.7" = { @@ -21290,13 +21290,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-7.3.8" = { + "cspell-io-8.0.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-7.3.8.tgz"; - sha512 = "XrxPbaiek7EZh+26k9RYVz2wKclaMqM6mXBiu/kpFAHRHHfz91ado6xWvyxZ7UAxQ8ixEwZ+oz9TU+k21gHzyw=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.0.0.tgz"; + sha512 = "NVdVmQd7SU/nxYwWtO/6gzux/kp1Dt36zKds0+QHZhQ18JJjXduF5e+WUttqKi2oj/vvmjiG4HGFKQVDBcBz3w=="; }; }; "cspell-lib-4.3.12" = { @@ -21308,13 +21308,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-7.3.8" = { + "cspell-lib-8.0.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-7.3.8.tgz"; - sha512 = "2L770sI5DdsAKVzO3jxmfP2fz4LryW6dzL93BpN7WU+ebFC6rg4ioa5liOJV4WoDo2fNQMSeqfW4Aawu9zWR7A=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.0.0.tgz"; + sha512 = "X/BzUjrzHOx7YlhvSph/OlMu1RmCTnybeZvIE67d1Pd7wT1TmZhFTnmvruUhoHxWEudOEe4HjzuNL9ph6Aw+aA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -21326,13 +21326,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-7.3.8" = { + "cspell-trie-lib-8.0.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-7.3.8.tgz"; - sha512 = "UQx1Bazbyz2eQJ/EnMohINnUdZvAQL+OcQU3EPPbNWM1DWF4bJGgmFXKNCRYfJk6wtOZVXG5g5AZXx9KnHeN9A=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.0.0.tgz"; + sha512 = "0rC5e1C0uM78uuS+lC1T18EojWZyNvq4bPOPCisnwuhuWrAfCqrFrX/qDNslWk3VTOPbsEMlFj6OnIGQnfwSKg=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -21695,15 +21695,6 @@ let sha512 = "T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="; }; }; - "cuid-2.1.8" = { - name = "cuid"; - packageName = "cuid"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz"; - sha512 = "xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg=="; - }; - }; "culvert-0.1.2" = { name = "culvert"; packageName = "culvert"; @@ -21722,15 +21713,6 @@ let sha512 = "/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="; }; }; - "cuss-1.21.0" = { - name = "cuss"; - packageName = "cuss"; - version = "1.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.21.0.tgz"; - sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; - }; - }; "cuss-2.2.0" = { name = "cuss"; packageName = "cuss"; @@ -21821,15 +21803,6 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-3.2.2" = { - name = "d3-array"; - packageName = "d3-array"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; - sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; - }; - }; "d3-array-3.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -22100,13 +22073,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.1.0" = { + "d3-graphviz-5.2.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.1.0.tgz"; - sha512 = "PSUmKfbqhixVlTOsT9ziV/wxHAzf31rfq1POUrdfOseJQ3+GQmLTKMWNgyGc5QXtNZq3emsgQycs7W0Hr4wVvw=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.2.0.tgz"; + sha512 = "M/2gQkSe5beBQFmE2Qh8RPZivOV48GR4pVPV8kWQ6lBs1TqIjgGqi/AOvKTLILDLTwVx4KSGHCnH62K8xyDwvg=="; }; }; "d3-hierarchy-1.1.9" = { @@ -22946,22 +22919,22 @@ let sha512 = "OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ=="; }; }; - "deep-equal-1.1.1" = { + "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz"; + sha512 = "5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg=="; }; }; - "deep-equal-2.2.2" = { + "deep-equal-2.2.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz"; - sha512 = "xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz"; + sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA=="; }; }; "deep-extend-0.4.2" = { @@ -23495,22 +23468,22 @@ let sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="; }; }; - "diagnostic-channel-1.1.0" = { + "diagnostic-channel-1.1.1" = { name = "diagnostic-channel"; packageName = "diagnostic-channel"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz"; - sha512 = "fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ=="; + url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz"; + sha512 = "r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw=="; }; }; - "diagnostic-channel-publishers-1.0.5" = { + "diagnostic-channel-publishers-1.0.7" = { name = "diagnostic-channel-publishers"; packageName = "diagnostic-channel-publishers"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz"; - sha512 = "dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg=="; + url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.7.tgz"; + sha512 = "SEECbY5AiVt6DfLkhkaHNeshg1CogdLLANA8xlG/TKvS+XUgvIKl7VspJGYiEdL5OUyzMVnr7o0AwB7f+/Mjtg=="; }; }; "dicer-0.3.0" = { @@ -24386,22 +24359,13 @@ let sha512 = "8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw=="; }; }; - "edge-runtime-2.5.1" = { + "edge-runtime-2.5.7" = { name = "edge-runtime"; packageName = "edge-runtime"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.1.tgz"; - sha512 = "E0kY1Dqvwvk9yh7dvR56KnCjXf/dlbrrGjO5Sjnz9Ja3WqYT3csv2B8O4erxJiOWfWy9NTukBk4Kb3yrR66gBw=="; - }; - }; - "editorconfig-0.15.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.15.3"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; + url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.7.tgz"; + sha512 = "gA4qSVP0sNwJlkdQ2nahDPASlSl8twUd17o+JolPa1EtXpLTGzIpOETvodgJwXIxa+zaD8bnAXCdsWrx2PhlVQ=="; }; }; "editorconfig-1.0.4" = { @@ -24440,13 +24404,22 @@ let sha512 = "XofXdikjYI7MVBcnXeoOvRR+yFFFHOLs3J7PF5KYQweigtgLshcH4W660PsvHr4lYZ03JBpLyEcUB8DzHZ+BNw=="; }; }; - "electron-to-chromium-1.4.574" = { + "electron-to-chromium-1.4.579" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.574"; + version = "1.4.579"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.574.tgz"; - sha512 = "bg1m8L0n02xRzx4LsTTMbBPiUd9yIR+74iPtS/Ao65CuXvhVZHP0ym1kSdDG3yHFDXqHQQBKujlN1AQ8qZnyFg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz"; + sha512 = "bJKvA+awBIzYR0xRced7PrQuRIwGQPpo6ZLP62GAShahU9fWpsNN2IP6BSP1BLDDSbxvBVRGAMWlvVVq3npmLA=="; + }; + }; + "electron-to-chromium-1.4.580" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.580"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.580.tgz"; + sha512 = "T5q3pjQon853xxxHUq3ZP68ZpvJHuSMY2+BZaW3QzjS4HvNuvsMmZ/+lU+nCrftre1jFZ+OSlExynXWBihnXzw=="; }; }; "elegant-spinner-1.0.1" = { @@ -24693,6 +24666,15 @@ let sha512 = "IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw=="; }; }; + "engine.io-6.5.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz"; + sha512 = "KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -24720,13 +24702,13 @@ let sha512 = "qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw=="; }; }; - "engine.io-client-6.5.2" = { + "engine.io-client-6.5.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz"; - sha512 = "CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"; + sha512 = "9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q=="; }; }; "engine.io-parser-1.0.6" = { @@ -25197,15 +25179,6 @@ let sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; }; }; - "esbuild-0.15.18" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; - sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; - }; - }; "esbuild-0.17.19" = { name = "esbuild"; packageName = "esbuild"; @@ -25224,6 +25197,15 @@ let sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; }; }; + "esbuild-0.19.5" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz"; + sha512 = "bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -25233,15 +25215,6 @@ let sha512 = "R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g=="; }; }; - "esbuild-android-64-0.15.18" = { - name = "esbuild-android-64"; - packageName = "esbuild-android-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz"; - sha512 = "wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA=="; - }; - }; "esbuild-android-arm64-0.14.47" = { name = "esbuild-android-arm64"; packageName = "esbuild-android-arm64"; @@ -25251,15 +25224,6 @@ let sha512 = "OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ=="; }; }; - "esbuild-android-arm64-0.15.18" = { - name = "esbuild-android-arm64"; - packageName = "esbuild-android-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz"; - sha512 = "G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ=="; - }; - }; "esbuild-darwin-64-0.14.47" = { name = "esbuild-darwin-64"; packageName = "esbuild-darwin-64"; @@ -25269,15 +25233,6 @@ let sha512 = "R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA=="; }; }; - "esbuild-darwin-64-0.15.18" = { - name = "esbuild-darwin-64"; - packageName = "esbuild-darwin-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz"; - sha512 = "2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg=="; - }; - }; "esbuild-darwin-arm64-0.14.47" = { name = "esbuild-darwin-arm64"; packageName = "esbuild-darwin-arm64"; @@ -25287,15 +25242,6 @@ let sha512 = "seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw=="; }; }; - "esbuild-darwin-arm64-0.15.18" = { - name = "esbuild-darwin-arm64"; - packageName = "esbuild-darwin-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz"; - sha512 = "tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA=="; - }; - }; "esbuild-freebsd-64-0.14.47" = { name = "esbuild-freebsd-64"; packageName = "esbuild-freebsd-64"; @@ -25305,15 +25251,6 @@ let sha512 = "ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ=="; }; }; - "esbuild-freebsd-64-0.15.18" = { - name = "esbuild-freebsd-64"; - packageName = "esbuild-freebsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz"; - sha512 = "TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA=="; - }; - }; "esbuild-freebsd-arm64-0.14.47" = { name = "esbuild-freebsd-arm64"; packageName = "esbuild-freebsd-arm64"; @@ -25323,15 +25260,6 @@ let sha512 = "ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ=="; }; }; - "esbuild-freebsd-arm64-0.15.18" = { - name = "esbuild-freebsd-arm64"; - packageName = "esbuild-freebsd-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz"; - sha512 = "R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA=="; - }; - }; "esbuild-linux-32-0.14.47" = { name = "esbuild-linux-32"; packageName = "esbuild-linux-32"; @@ -25341,15 +25269,6 @@ let sha512 = "FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw=="; }; }; - "esbuild-linux-32-0.15.18" = { - name = "esbuild-linux-32"; - packageName = "esbuild-linux-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz"; - sha512 = "lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg=="; - }; - }; "esbuild-linux-64-0.14.47" = { name = "esbuild-linux-64"; packageName = "esbuild-linux-64"; @@ -25359,15 +25278,6 @@ let sha512 = "nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw=="; }; }; - "esbuild-linux-64-0.15.18" = { - name = "esbuild-linux-64"; - packageName = "esbuild-linux-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz"; - sha512 = "hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw=="; - }; - }; "esbuild-linux-arm-0.14.47" = { name = "esbuild-linux-arm"; packageName = "esbuild-linux-arm"; @@ -25377,15 +25287,6 @@ let sha512 = "ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA=="; }; }; - "esbuild-linux-arm-0.15.18" = { - name = "esbuild-linux-arm"; - packageName = "esbuild-linux-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz"; - sha512 = "UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA=="; - }; - }; "esbuild-linux-arm64-0.14.47" = { name = "esbuild-linux-arm64"; packageName = "esbuild-linux-arm64"; @@ -25395,15 +25296,6 @@ let sha512 = "ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw=="; }; }; - "esbuild-linux-arm64-0.15.18" = { - name = "esbuild-linux-arm64"; - packageName = "esbuild-linux-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz"; - sha512 = "54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug=="; - }; - }; "esbuild-linux-mips64le-0.14.47" = { name = "esbuild-linux-mips64le"; packageName = "esbuild-linux-mips64le"; @@ -25413,15 +25305,6 @@ let sha512 = "mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg=="; }; }; - "esbuild-linux-mips64le-0.15.18" = { - name = "esbuild-linux-mips64le"; - packageName = "esbuild-linux-mips64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz"; - sha512 = "Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ=="; - }; - }; "esbuild-linux-ppc64le-0.14.47" = { name = "esbuild-linux-ppc64le"; packageName = "esbuild-linux-ppc64le"; @@ -25431,15 +25314,6 @@ let sha512 = "WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w=="; }; }; - "esbuild-linux-ppc64le-0.15.18" = { - name = "esbuild-linux-ppc64le"; - packageName = "esbuild-linux-ppc64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz"; - sha512 = "b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w=="; - }; - }; "esbuild-linux-riscv64-0.14.47" = { name = "esbuild-linux-riscv64"; packageName = "esbuild-linux-riscv64"; @@ -25449,15 +25323,6 @@ let sha512 = "1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g=="; }; }; - "esbuild-linux-riscv64-0.15.18" = { - name = "esbuild-linux-riscv64"; - packageName = "esbuild-linux-riscv64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz"; - sha512 = "ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg=="; - }; - }; "esbuild-linux-s390x-0.14.47" = { name = "esbuild-linux-s390x"; packageName = "esbuild-linux-s390x"; @@ -25467,15 +25332,6 @@ let sha512 = "eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw=="; }; }; - "esbuild-linux-s390x-0.15.18" = { - name = "esbuild-linux-s390x"; - packageName = "esbuild-linux-s390x"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz"; - sha512 = "VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ=="; - }; - }; "esbuild-netbsd-64-0.14.47" = { name = "esbuild-netbsd-64"; packageName = "esbuild-netbsd-64"; @@ -25485,15 +25341,6 @@ let sha512 = "Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ=="; }; }; - "esbuild-netbsd-64-0.15.18" = { - name = "esbuild-netbsd-64"; - packageName = "esbuild-netbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz"; - sha512 = "98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg=="; - }; - }; "esbuild-openbsd-64-0.14.47" = { name = "esbuild-openbsd-64"; packageName = "esbuild-openbsd-64"; @@ -25503,15 +25350,6 @@ let sha512 = "QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw=="; }; }; - "esbuild-openbsd-64-0.15.18" = { - name = "esbuild-openbsd-64"; - packageName = "esbuild-openbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz"; - sha512 = "yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ=="; - }; - }; "esbuild-sunos-64-0.14.47" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; @@ -25521,15 +25359,6 @@ let sha512 = "uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ=="; }; }; - "esbuild-sunos-64-0.15.18" = { - name = "esbuild-sunos-64"; - packageName = "esbuild-sunos-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz"; - sha512 = "On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw=="; - }; - }; "esbuild-windows-32-0.14.47" = { name = "esbuild-windows-32"; packageName = "esbuild-windows-32"; @@ -25539,15 +25368,6 @@ let sha512 = "H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ=="; }; }; - "esbuild-windows-32-0.15.18" = { - name = "esbuild-windows-32"; - packageName = "esbuild-windows-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz"; - sha512 = "o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ=="; - }; - }; "esbuild-windows-64-0.14.47" = { name = "esbuild-windows-64"; packageName = "esbuild-windows-64"; @@ -25557,15 +25377,6 @@ let sha512 = "/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ=="; }; }; - "esbuild-windows-64-0.15.18" = { - name = "esbuild-windows-64"; - packageName = "esbuild-windows-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz"; - sha512 = "qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw=="; - }; - }; "esbuild-windows-arm64-0.14.47" = { name = "esbuild-windows-arm64"; packageName = "esbuild-windows-arm64"; @@ -25575,15 +25386,6 @@ let sha512 = "HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ=="; }; }; - "esbuild-windows-arm64-0.15.18" = { - name = "esbuild-windows-arm64"; - packageName = "esbuild-windows-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz"; - sha512 = "q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ=="; - }; - }; "esc-exit-3.0.0" = { name = "esc-exit"; packageName = "esc-exit"; @@ -25737,13 +25539,13 @@ let sha512 = "pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw=="; }; }; - "eslint-8.52.0" = { + "eslint-8.53.0" = { name = "eslint"; packageName = "eslint"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz"; - sha512 = "zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -26043,15 +25845,6 @@ let sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -26358,22 +26151,22 @@ let sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; }; }; - "execa-5.0.1" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; - sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; - "execa-5.1.1" = { + "execa-6.1.0" = { name = "execa"; packageName = "execa"; - version = "5.1.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; + url = "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz"; + sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; }; }; "execa-7.2.0" = { @@ -27078,6 +26871,15 @@ let sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; }; }; + "fast-glob-3.3.2" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"; + sha512 = "oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow=="; + }; + }; "fast-json-patch-3.1.1" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -27348,15 +27150,6 @@ let sha512 = "CpKgwraLo4YWY9cUEICNJ1WcOVR2WE1Jvot3Nvr7FGBiGOKgkn1CmF4zuCl9VxvEh1nQsdYXtQg+V0etPiED6g=="; }; }; - "figgy-pudding-3.5.2" = { - name = "figgy-pudding"; - packageName = "figgy-pudding"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; - }; - }; "figlet-1.5.0" = { name = "figlet"; packageName = "figlet"; @@ -27456,15 +27249,6 @@ let sha512 = "WhYlIPdaYeE6/Pow1Js4QwRQBVXRoRWCZxPLL/YrzUwsZHT8fZuBxP8zZHawLQ8HxwORumP+CoRVuUxkAJD0dw=="; }; }; - "file-stream-rotator-0.6.1" = { - name = "file-stream-rotator"; - packageName = "file-stream-rotator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz"; - sha512 = "u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ=="; - }; - }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -27906,13 +27690,13 @@ let sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; - "fkill-8.1.1" = { + "fkill-9.0.0" = { name = "fkill"; packageName = "fkill"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-8.1.1.tgz"; - sha512 = "138B7rFQMEKoJQOVl3NCPyRAaex0ruLvQgqkEWa/CyUY9MFFxZ8TtztiMJSs6/wD60M6kK0OKUOwHRsr3U2RBg=="; + url = "https://registry.npmjs.org/fkill/-/fkill-9.0.0.tgz"; + sha512 = "MdYSsbdCaIRjzo5edthZtWmEZVMfr1qrtYZUHIdO3swCE+CoZA8S5l0s4jDsYlTa9ZiXv0pTgpzE7s4N8NeUOA=="; }; }; "flagged-respawn-1.0.1" = { @@ -28005,13 +27789,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.220.0" = { + "flow-parser-0.220.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.220.0"; + version = "0.220.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.0.tgz"; - sha512 = "Fks+nOCqhorp4NpAtAxf09UaR/9xDf3AnU1UkWczmpneoHh06Y3AoEA4tIe2HbYrOHT9JArUgDZpCFhP4clo1A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.1.tgz"; + sha512 = "RoM3ARqVYvxnwtkM36RjQFzo5Z9p22jUqtuMrN8gzA/8fU6iMLFE3cXkdSFPyfHRXLU8ILH8TCtSFADk1ACPCg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28257,15 +28041,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "format-util-1.0.5" = { - name = "format-util"; - packageName = "format-util"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz"; - sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; - }; - }; "formdata-polyfill-4.0.10" = { name = "formdata-polyfill"; packageName = "formdata-polyfill"; @@ -28923,6 +28698,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-east-asian-width-1.2.0" = { + name = "get-east-asian-width"; + packageName = "get-east-asian-width"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz"; + sha512 = "2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA=="; + }; + }; "get-installed-path-2.1.1" = { name = "get-installed-path"; packageName = "get-installed-path"; @@ -29625,15 +29409,6 @@ let sha512 = "NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg=="; }; }; - "global-dirs-2.1.0" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; - sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; - }; - }; "global-dirs-3.0.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -29725,15 +29500,6 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; - "globalyzer-0.1.0" = { - name = "globalyzer"; - packageName = "globalyzer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz"; - sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; - }; - }; "globby-11.0.1" = { name = "globby"; packageName = "globby"; @@ -29797,15 +29563,6 @@ let sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; }; }; - "globrex-0.1.2" = { - name = "globrex"; - packageName = "globrex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"; - sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; - }; - }; "globule-1.3.4" = { name = "globule"; packageName = "globule"; @@ -30616,15 +30373,6 @@ let sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; }; }; - "hast-util-embedded-1.0.6" = { - name = "hast-util-embedded"; - packageName = "hast-util-embedded"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.6.tgz"; - sha512 = "JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw=="; - }; - }; "hast-util-embedded-2.0.1" = { name = "hast-util-embedded"; packageName = "hast-util-embedded"; @@ -30643,15 +30391,6 @@ let sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; }; }; - "hast-util-from-parse5-6.0.1" = { - name = "hast-util-from-parse5"; - packageName = "hast-util-from-parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz"; - sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; - }; - }; "hast-util-from-parse5-7.1.2" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; @@ -30661,15 +30400,6 @@ let sha512 = "Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw=="; }; }; - "hast-util-has-property-1.0.4" = { - name = "hast-util-has-property"; - packageName = "hast-util-has-property"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz"; - sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; - }; - }; "hast-util-has-property-2.0.1" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; @@ -30679,15 +30409,6 @@ let sha512 = "X2+RwZIMTMKpXUzlotatPzWj8bspCymtXH3cfG3iQKV+wPF53Vgaqxi/eLqGck0wKq1kS9nvoB1wchbCPEL8sg=="; }; }; - "hast-util-is-body-ok-link-1.0.4" = { - name = "hast-util-is-body-ok-link"; - packageName = "hast-util-is-body-ok-link"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz"; - sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; - }; - }; "hast-util-is-body-ok-link-2.0.0" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; @@ -30697,15 +30418,6 @@ let sha512 = "S58hCexyKdD31vMsErvgLfflW6vYWo/ixRLPJTtkOvLld24vyI8vmYmkgLA5LG3la2ME7nm7dLGdm48gfLRBfw=="; }; }; - "hast-util-is-element-1.1.0" = { - name = "hast-util-is-element"; - packageName = "hast-util-is-element"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz"; - sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; - }; - }; "hast-util-is-element-2.1.3" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; @@ -30733,15 +30445,6 @@ let sha512 = "jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA=="; }; }; - "hast-util-phrasing-1.0.5" = { - name = "hast-util-phrasing"; - packageName = "hast-util-phrasing"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-1.0.5.tgz"; - sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; - }; - }; "hast-util-phrasing-2.0.2" = { name = "hast-util-phrasing"; packageName = "hast-util-phrasing"; @@ -30751,15 +30454,6 @@ let sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; - "hast-util-to-nlcst-1.2.8" = { - name = "hast-util-to-nlcst"; - packageName = "hast-util-to-nlcst"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.8.tgz"; - sha512 = "cKMArohUvGw4fpN9PKDCIB+klMojkWzz5zNVNFRdKa0oC1MVX1TaDki1E/tb9xqS8WlUjKifIjmrNmRbEJzrJg=="; - }; - }; "hast-util-to-nlcst-2.2.0" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; @@ -30769,15 +30463,6 @@ let sha512 = "BFBvuoEo9yCHklUSCz6+JG/FAkr+qCVaW1bE0/Y8+SBhuaz7s+suHDpkyQxH7FF2kqctYRhquLRCcmn+PS0IUQ=="; }; }; - "hast-util-to-string-1.0.4" = { - name = "hast-util-to-string"; - packageName = "hast-util-to-string"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz"; - sha512 = "eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w=="; - }; - }; "hast-util-to-string-2.0.0" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; @@ -30787,15 +30472,6 @@ let sha512 = "02AQ3vLhuH3FisaMM+i/9sm4OXGSq1UhOOCpTLLQtHdL3tZt7qil69r8M8iDkZYyC0HCFylcYoP+8IO7ddta1A=="; }; }; - "hast-util-whitespace-1.0.4" = { - name = "hast-util-whitespace"; - packageName = "hast-util-whitespace"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz"; - sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; - }; - }; "hast-util-whitespace-2.0.1" = { name = "hast-util-whitespace"; packageName = "hast-util-whitespace"; @@ -30814,15 +30490,6 @@ let sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; }; }; - "hastscript-6.0.0" = { - name = "hastscript"; - packageName = "hastscript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz"; - sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w=="; - }; - }; "hastscript-7.2.0" = { name = "hastscript"; packageName = "hastscript"; @@ -31561,6 +31228,15 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; + "human-signals-3.0.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz"; + sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="; + }; + }; "human-signals-4.3.1" = { name = "human-signals"; packageName = "human-signals"; @@ -31615,15 +31291,6 @@ let sha512 = "YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg=="; }; }; - "ibm-openapi-validator-0.97.5" = { - name = "ibm-openapi-validator"; - packageName = "ibm-openapi-validator"; - version = "0.97.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ibm-openapi-validator/-/ibm-openapi-validator-0.97.5.tgz"; - sha512 = "MlXLjQCZRU0yqQ6EFzBhCehkFXp/rXuGsjsEglK+ldDJZV/YQy7dw1V6ROzoiibjm0f00J7L3ubLvlbIlHilGQ=="; - }; - }; "iconv-lite-0.4.23" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -31912,6 +31579,15 @@ let sha512 = "8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg=="; }; }; + "import-in-the-middle-1.4.2" = { + name = "import-in-the-middle"; + packageName = "import-in-the-middle"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz"; + sha512 = "9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw=="; + }; + }; "import-jsx-4.0.1" = { name = "import-jsx"; packageName = "import-jsx"; @@ -31957,13 +31633,22 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-3.0.0" = { + "import-meta-resolve-3.1.1" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz"; - sha512 = "4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg=="; + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.1.1.tgz"; + sha512 = "qeywsE/KC3w9Fd2ORrRDUw6nS/nLwZpXgfrOc2IILvZYnCaEMd+D56Vfg9k4G29gIeVi3XKql1RQatME8iYsiw=="; + }; + }; + "import-meta-resolve-4.0.0" = { + name = "import-meta-resolve"; + packageName = "import-meta-resolve"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz"; + sha512 = "okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA=="; }; }; "imurmurhash-0.1.4" = { @@ -32092,15 +31777,6 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.7" = { - name = "ini"; - packageName = "ini"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; - sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; - }; - }; "ini-1.3.8" = { name = "ini"; packageName = "ini"; @@ -32281,15 +31957,6 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-8.2.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"; - sha512 = "nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg=="; - }; - }; "inquirer-8.2.6" = { name = "inquirer"; packageName = "inquirer"; @@ -32308,13 +31975,22 @@ let sha512 = "B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g=="; }; }; - "inquirer-autocomplete-prompt-1.4.0" = { + "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-autocomplete-prompt-3.0.1" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.4.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz"; - sha512 = "qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-3.0.1.tgz"; + sha512 = "DQBXwX2fVQPVUzu4v4lGgtNgyjcX2+rTyphb2MeSOQh3xUayKAfHAF4y0KgsMi06m6ZiR3xIOdzMZMfQgX2m9w=="; }; }; "inquirer-autosubmit-prompt-0.2.0" = { @@ -32767,15 +32443,6 @@ let sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ=="; }; }; - "is-alphanumeric-1.0.0" = { - name = "is-alphanumeric"; - packageName = "is-alphanumeric"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; - sha512 = "ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA=="; - }; - }; "is-alphanumerical-1.0.4" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; @@ -33289,15 +32956,6 @@ let sha512 = "KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA=="; }; }; - "is-installed-globally-0.3.2" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; - sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; - }; - }; "is-installed-globally-0.4.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -33442,15 +33100,6 @@ let sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg=="; }; }; - "is-npm-4.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; - sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -33757,15 +33406,6 @@ let sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; }; }; - "is-reference-1.2.1" = { - name = "is-reference"; - packageName = "is-reference"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; - sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; - }; - }; "is-reference-3.0.2" = { name = "is-reference"; packageName = "is-reference"; @@ -34099,15 +33739,6 @@ let sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="; }; }; - "is-whitespace-character-1.0.4" = { - name = "is-whitespace-character"; - packageName = "is-whitespace-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; - sha512 = "SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="; - }; - }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -34117,15 +33748,6 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.4" = { - name = "is-word-character"; - packageName = "is-word-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz"; - sha512 = "5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="; - }; - }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -34342,13 +33964,13 @@ let sha512 = "X3HBmm7+Th+l4/kMtqwcHHgELD0Lfl0Ina6S3+grr+mKmTxsrM84NAO1UuRPIxIbGLIl3TCEu45S1kdu21HYbQ=="; }; }; - "istanbul-lib-coverage-3.2.0" = { + "istanbul-lib-coverage-3.2.2" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; - sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz"; + sha512 = "O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="; }; }; "istanbul-lib-hook-3.0.0" = { @@ -34927,13 +34549,13 @@ let sha512 = "dJ2FbnUfX5Eg9BdZx6Cz2JhDsvzGi2DoQeomzdjO9ltvVUouAFPWkpcUtJdLXaNmHQtPM4/I+AzelUX7w2mWVw=="; }; }; - "jsii-5.2.23" = { + "jsii-5.2.26" = { name = "jsii"; packageName = "jsii"; - version = "5.2.23"; + version = "5.2.26"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.2.23.tgz"; - sha512 = "OrQU4r4187z93ORCgjtMYKTomygNmIE8zMFqGohBjD4sCLqgzSB70O2KBTas8Hplz5iZULdxP3+6a8P3kr1MnQ=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.2.26.tgz"; + sha512 = "R5R2mKKMVVs6a8nWJEtMWZXFr845visS4b4q4TK/xBQD7fmI2pylJftCJlePskwlv8W3hFlqSoQ2yp+Hbm8fZg=="; }; }; "jsii-pacmak-1.91.0" = { @@ -34963,22 +34585,22 @@ let sha512 = "v8eW/XiJHklnkmTtCIbyAeDPUVfovU/ZNh1ixvGri/ps5H3iRRpLEmqGJGMm2IEIjNCSmnmIsDMQLw20/7Nu+Q=="; }; }; - "jsii-rosetta-5.2.1" = { + "jsii-rosetta-5.2.2" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.2.1.tgz"; - sha512 = "X98IBiNZSIkwmYfZ0de2b3dh7/BVBW//j8a/CVwm55J1YXYW9r6M/uIqRvqihD0GXgPVRCUjLpM/6BDluNSA8w=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.2.2.tgz"; + sha512 = "bMGJKdQLlvYXUawoY+6EMH/5RwOttNCiTxczaJlV27BpxWeqTYIYMAVcb+d+6FTNKvZ2AcbCjqlROW6RDONanQ=="; }; }; - "jsii-srcmak-0.1.953" = { + "jsii-srcmak-0.1.960" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.953"; + version = "0.1.960"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.953.tgz"; - sha512 = "HIJEsYUgwj+Xsg368PPJVAWVJB9m0YYRT1xbP4SexWc9OU8/pulMb8QPkPc7STe37qE/AreNzfj95JsmKdU0+A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.960.tgz"; + sha512 = "G/VsiDLcNzhIMfwPdVnhnNFz9bpRPISI2JJhHQ2+GgFL2Pk413jGEih3C2n7gQ1Z3mdolSEYGLvqaL3szFT2ng=="; }; }; "json-buffer-3.0.0" = { @@ -35017,24 +34639,6 @@ let sha512 = "GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w=="; }; }; - "json-dup-key-validator-1.0.3" = { - name = "json-dup-key-validator"; - packageName = "json-dup-key-validator"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-dup-key-validator/-/json-dup-key-validator-1.0.3.tgz"; - sha512 = "JvJcV01JSiO7LRz7DY1Fpzn4wX2rJ3dfNTiAfnlvLNdhhnm0Pgdvhi2SGpENrZn7eSg26Ps3TPhOcuD/a4STXQ=="; - }; - }; - "json-logic-js-2.0.2" = { - name = "json-logic-js"; - packageName = "json-logic-js"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.2.tgz"; - sha512 = "ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ=="; - }; - }; "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -35125,15 +34729,6 @@ let sha512 = "YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg=="; }; }; - "json-schema-ref-parser-5.1.3" = { - name = "json-schema-ref-parser"; - packageName = "json-schema-ref-parser"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-5.1.3.tgz"; - sha512 = "CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ=="; - }; - }; "json-schema-to-ts-1.6.4" = { name = "json-schema-to-ts"; packageName = "json-schema-to-ts"; @@ -35440,15 +35035,6 @@ let sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; }; }; - "jsonschema-1.4.1" = { - name = "jsonschema"; - packageName = "jsonschema"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; - sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; - }; - }; "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -36214,15 +35800,6 @@ let sha512 = "vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw=="; }; }; - "libnpmconfig-1.2.1" = { - name = "libnpmconfig"; - packageName = "libnpmconfig"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; - sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; - }; - }; "libnpmpublish-7.3.0" = { name = "libnpmpublish"; packageName = "libnpmpublish"; @@ -36268,94 +35845,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lightningcss-1.22.0" = { + "lightningcss-1.22.1" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"; - sha512 = "+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg=="; - }; - }; - "lightningcss-darwin-arm64-1.22.0" = { - name = "lightningcss-darwin-arm64"; - packageName = "lightningcss-darwin-arm64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"; - sha512 = "aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg=="; - }; - }; - "lightningcss-darwin-x64-1.22.0" = { - name = "lightningcss-darwin-x64"; - packageName = "lightningcss-darwin-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz"; - sha512 = "9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ=="; - }; - }; - "lightningcss-freebsd-x64-1.22.0" = { - name = "lightningcss-freebsd-x64"; - packageName = "lightningcss-freebsd-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz"; - sha512 = "xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww=="; - }; - }; - "lightningcss-linux-arm-gnueabihf-1.22.0" = { - name = "lightningcss-linux-arm-gnueabihf"; - packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz"; - sha512 = "epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ=="; - }; - }; - "lightningcss-linux-arm64-gnu-1.22.0" = { - name = "lightningcss-linux-arm64-gnu"; - packageName = "lightningcss-linux-arm64-gnu"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz"; - sha512 = "AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg=="; - }; - }; - "lightningcss-linux-arm64-musl-1.22.0" = { - name = "lightningcss-linux-arm64-musl"; - packageName = "lightningcss-linux-arm64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz"; - sha512 = "RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg=="; - }; - }; - "lightningcss-linux-x64-gnu-1.22.0" = { - name = "lightningcss-linux-x64-gnu"; - packageName = "lightningcss-linux-x64-gnu"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz"; - sha512 = "grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw=="; - }; - }; - "lightningcss-linux-x64-musl-1.22.0" = { - name = "lightningcss-linux-x64-musl"; - packageName = "lightningcss-linux-x64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz"; - sha512 = "t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ=="; - }; - }; - "lightningcss-win32-x64-msvc-1.22.0" = { - name = "lightningcss-win32-x64-msvc"; - packageName = "lightningcss-win32-x64-msvc"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz"; - sha512 = "64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; + sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; }; }; "lilconfig-2.1.0" = { @@ -36412,13 +35908,13 @@ let sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; - "lines-and-columns-2.0.3" = { + "lines-and-columns-2.0.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz"; - sha512 = "cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w=="; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz"; + sha512 = "wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A=="; }; }; "linewise-0.0.3" = { @@ -36628,22 +36124,22 @@ let sha512 = "gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ=="; }; }; - "load-plugin-3.0.0" = { + "load-plugin-5.1.0" = { name = "load-plugin"; packageName = "load-plugin"; - version = "3.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz"; - sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.1.0.tgz"; + sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; }; }; - "load-plugin-5.1.0" = { + "load-plugin-6.0.1" = { name = "load-plugin"; packageName = "load-plugin"; - version = "5.1.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.1.0.tgz"; - sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-6.0.1.tgz"; + sha512 = "YZyxJaWfN4F1xfPCyKFNIOL26vlFukmJY7wegxsriav4y2/0ZiICota6uFvyy52GjUj+tsPSjGLX+2m7kiU0+g=="; }; }; "load-yaml-file-0.2.0" = { @@ -37222,15 +36718,6 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; - "lodash.intersection-4.4.0" = { - name = "lodash.intersection"; - packageName = "lodash.intersection"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; - sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; - }; - }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -37834,6 +37321,15 @@ let sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; }; }; + "loglevel-plugin-prefix-0.8.4" = { + name = "loglevel-plugin-prefix"; + packageName = "loglevel-plugin-prefix"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz"; + sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; + }; + }; "long-4.0.0" = { name = "long"; packageName = "long"; @@ -38077,15 +37573,6 @@ let sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; }; }; - "lru-cache-7.14.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; - }; - }; "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -38168,15 +37655,6 @@ let sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; }; }; - "magic-string-0.30.1" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.30.1"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz"; - sha512 = "mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="; - }; - }; "magic-string-0.30.5" = { name = "magic-string"; packageName = "magic-string"; @@ -38402,15 +37880,6 @@ let sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; - "markdown-escapes-1.0.4" = { - name = "markdown-escapes"; - packageName = "markdown-escapes"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; - sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -38654,15 +38123,6 @@ let sha512 = "LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA=="; }; }; - "matcher-1.1.1" = { - name = "matcher"; - packageName = "matcher"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; - sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; - }; - }; "matcher-3.0.0" = { name = "matcher"; packageName = "matcher"; @@ -38771,15 +38231,6 @@ let sha512 = "c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ=="; }; }; - "mdast-comment-marker-1.1.2" = { - name = "mdast-comment-marker"; - packageName = "mdast-comment-marker"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz"; - sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; - }; - }; "mdast-comment-marker-2.1.2" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; @@ -38789,15 +38240,6 @@ let sha512 = "HED3ezseRVkBzZ0uK4q6RJMdufr/2p3VfVZstE3H1N9K8bwtspztWo6Xd7rEatuGNoCXaBna8oEqMwUn0Ve1bw=="; }; }; - "mdast-util-compact-2.0.1" = { - name = "mdast-util-compact"; - packageName = "mdast-util-compact"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; - sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; - }; - }; "mdast-util-find-and-replace-1.1.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -39059,15 +38501,6 @@ let sha512 = "SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ=="; }; }; - "mdast-util-to-nlcst-4.0.1" = { - name = "mdast-util-to-nlcst"; - packageName = "mdast-util-to-nlcst"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.1.tgz"; - sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; - }; - }; "mdast-util-to-nlcst-5.2.1" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; @@ -39158,15 +38591,6 @@ let sha512 = "+0FV+YXgmt4cxAHY1HtmZFVzVbhWAIuABtxhHuZ9uQGIg3opmK2kg5V62DGntWyfgqA9ZywaTPi4w8ummYDdHA=="; }; }; - "mdns-server-1.0.11" = { - name = "mdns-server"; - packageName = "mdns-server"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mdns-server/-/mdns-server-1.0.11.tgz"; - sha512 = "luzHnhQYmxaqrvYb8akwH2V/lSSyAumDoAK1zmogvpsj7sd4l04AF/LchBYH44NQVm7oo/KBVVFg3AbsJXr12w=="; - }; - }; "mdurl-1.0.1" = { name = "mdurl"; packageName = "mdurl"; @@ -39347,15 +38771,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-7.1.1" = { - name = "meow"; - packageName = "meow"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; - sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; - }; - }; "meow-8.1.2" = { name = "meow"; packageName = "meow"; @@ -40517,6 +39932,15 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-6.2.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz"; + sha512 = "sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg=="; + }; + }; "minimatch-7.4.6" = { name = "minimatch"; packageName = "minimatch"; @@ -41282,6 +40706,15 @@ let sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; + "nanoid-3.3.7" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"; + sha512 = "eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -41625,15 +41058,6 @@ let sha512 = "V52MLl7BU+tH2Np9tDrIXK8bql3MVUadnMIl/0/oZSGC9keuro0O9UUv9QKp0aMvtN8HRew4G7byY7H4eWsxaQ=="; }; }; - "nlcst-is-literal-1.2.2" = { - name = "nlcst-is-literal"; - packageName = "nlcst-is-literal"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.2.tgz"; - sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; - }; - }; "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; @@ -41643,15 +41067,6 @@ let sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; - "nlcst-normalize-2.1.5" = { - name = "nlcst-normalize"; - packageName = "nlcst-normalize"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.5.tgz"; - sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; - }; - }; "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; @@ -41661,15 +41076,6 @@ let sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; - "nlcst-search-2.0.0" = { - name = "nlcst-search"; - packageName = "nlcst-search"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-2.0.0.tgz"; - sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; - }; - }; "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; @@ -41994,6 +41400,15 @@ let sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; + "node-gyp-10.0.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; + }; + }; "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -42021,15 +41436,6 @@ let sha512 = "OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ=="; }; }; - "node-gyp-build-4.6.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; - }; - }; "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -42165,15 +41571,6 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; - "node-sarif-builder-2.0.3" = { - name = "node-sarif-builder"; - packageName = "node-sarif-builder"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-2.0.3.tgz"; - sha512 = "Pzr3rol8fvhG/oJjIq2NTVB0vmdNNlz22FENhhPojYRZ4/ee08CfK4YuKmuL54V9MLhI1kpzxfOJ/63LzmZzDg=="; - }; - }; "node-schedule-2.1.0" = { name = "node-schedule"; packageName = "node-schedule"; @@ -42471,13 +41868,13 @@ let sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; - "npm-9.9.0" = { + "npm-9.9.1" = { name = "npm"; packageName = "npm"; - version = "9.9.0"; + version = "9.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.9.0.tgz"; - sha512 = "wkd7sjz4KmdmddYQcd0aTP73P1cEuPlekeulz4jTDeMVx/Zo5XZ5KQ1z3eUzV3Q/WZpEO0NJXTrD5FNFe6fhCA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.9.1.tgz"; + sha512 = "D3YZ1ZTxPGDHLLiFU9q3sVrPfYnn6BaJ1hogm3vdWi8oOmHGtTlPUPXAM0iG22UT0JRkBnMDOh6oUhpbEYgg2A=="; }; }; "npm-bundled-1.1.2" = { @@ -42561,6 +41958,15 @@ let sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA=="; }; }; + "npm-package-arg-11.0.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz"; + sha512 = "M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -42642,13 +42048,13 @@ let sha512 = "d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q=="; }; }; - "npm-pick-manifest-8.0.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "8.0.1"; + "npm-packlist-8.0.0" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz"; - sha512 = "mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.0.tgz"; + sha512 = "ErAGFB5kJUciPy1mmx/C2YFbvxoJ0QJ9uwkCZOeR6CqLLISPZBOiFModAbSXnjjlwW5lOhuhXva+fURsSGJqyw=="; }; }; "npm-pick-manifest-8.0.2" = { @@ -42660,6 +42066,15 @@ let sha512 = "1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg=="; }; }; + "npm-pick-manifest-9.0.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz"; + sha512 = "VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg=="; + }; + }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -42678,6 +42093,15 @@ let sha512 = "kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA=="; }; }; + "npm-registry-fetch-16.1.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz"; + sha512 = "PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw=="; + }; + }; "npm-registry-utilities-1.0.0" = { name = "npm-registry-utilities"; packageName = "npm-registry-utilities"; @@ -42759,15 +42183,6 @@ let sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; }; }; - "nrf-intel-hex-1.3.0" = { - name = "nrf-intel-hex"; - packageName = "nrf-intel-hex"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.3.0.tgz"; - sha512 = "oXwBJxX/0Jc4fe2Jxjv3Mw9/qw9JdToDLvJuozfVx+twpkc2oSUm8W/OODX6W4kmWOaYA11ORpGLfQ8BP7mndw=="; - }; - }; "nssocket-0.6.0" = { name = "nssocket"; packageName = "nssocket"; @@ -43335,15 +42750,6 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "ono-4.0.11" = { - name = "ono"; - packageName = "ono"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz"; - sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; - }; - }; "oo-ascii-tree-1.91.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; @@ -44037,15 +43443,6 @@ let sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; - "p-queue-7.4.1" = { - name = "p-queue"; - packageName = "p-queue"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz"; - sha512 = "vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA=="; - }; - }; "p-reduce-2.1.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -44280,13 +43677,13 @@ let sha512 = "rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA=="; }; }; - "pad-2.3.0" = { - name = "pad"; - packageName = "pad"; - version = "2.3.0"; + "pacote-17.0.4" = { + name = "pacote"; + packageName = "pacote"; + version = "17.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pad/-/pad-2.3.0.tgz"; - sha512 = "lxrgnOG5AXmzMRT1O5urWtYFxHnFSE+QntgTHij1nvS4W+ubhQLmQRHmZXDeEvk9I00itAixLqU9Q6fE0gW3sw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz"; + sha512 = "eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg=="; }; }; "pako-0.2.9" = { @@ -44397,15 +43794,6 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; - "parse-english-4.2.0" = { - name = "parse-english"; - packageName = "parse-english"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-english/-/parse-english-4.2.0.tgz"; - sha512 = "jw5N6wZUZViIw3VLG/FUSeL3vDhfw5Q2g4E3nYC69Mm5ANbh9ZWd+eligQbeUoyObZM8neynTn3l14e09pjEWg=="; - }; - }; "parse-english-5.0.0" = { name = "parse-english"; packageName = "parse-english"; @@ -44550,15 +43938,6 @@ let sha512 = "/oF7PUUBjCqHmMEE6xIQeX5ZokQ9+miudACzPt4KBU2qi6CxZYPdisPXx4ad7wpZJYi2ZpcW2PacLTU3De3ebw=="; }; }; - "parse-latin-4.3.0" = { - name = "parse-latin"; - packageName = "parse-latin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.3.0.tgz"; - sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; - }; - }; "parse-latin-5.0.1" = { name = "parse-latin"; packageName = "parse-latin"; @@ -45108,13 +44487,13 @@ let sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; }; }; - "path-to-glob-pattern-1.0.2" = { + "path-to-glob-pattern-2.0.1" = { name = "path-to-glob-pattern"; packageName = "path-to-glob-pattern"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-1.0.2.tgz"; - sha512 = "ryF65N5MBB9XOjE5mMOi+0bMrh1F0ORQmqDSSERvv5zD62Cfc5QC6rK1AR1xuDIG1I091CkNENblbteWy1bXgw=="; + url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-2.0.1.tgz"; + sha512 = "tmciSlVyHnX0LC86+zSr+0LURw9rDPw8ilhXcmTpVUOnI6OsKdCzXQs5fTG10Bjz26IBdnKL3XIaP+QvGsk5YQ=="; }; }; "path-to-regexp-0.1.7" = { @@ -45342,6 +44721,15 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; + "picomatch-3.0.1" = { + name = "picomatch"; + packageName = "picomatch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz"; + sha512 = "I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="; + }; + }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -45360,13 +44748,13 @@ let sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; }; }; - "pid-port-0.2.0" = { + "pid-port-1.0.0" = { name = "pid-port"; packageName = "pid-port"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.2.0.tgz"; - sha512 = "xVU9H1FCRSeGrD9Oim5bLg2U7B2BgW0qzK2oahpV5BIf9hwzqQaWyOkOVC0Kgbsc90A9x6525beawx+QK+JduQ=="; + url = "https://registry.npmjs.org/pid-port/-/pid-port-1.0.0.tgz"; + sha512 = "LSNBeKChRPA4Xlrs6+zV588G1hSrFvANtPV5rt/5MPfSPK3V9XPWxx1d29svsrOjngT9ifLisXWCLS7DvO9ZhQ=="; }; }; "pidtree-0.6.0" = { @@ -46791,6 +46179,15 @@ let sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; }; }; + "process-exists-5.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-5.0.0.tgz"; + sha512 = "6QPRh5fyHD8MaXr4GYML8K/YY0Sq5dKHGIOrAKS3cYpHQdmygFCcijIu1dVoNKAZ0TWAMoeh8KDK9dF8auBkJA=="; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -47133,6 +46530,15 @@ let sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; }; }; + "ps-list-8.1.1" = { + name = "ps-list"; + packageName = "ps-list"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-8.1.1.tgz"; + sha512 = "OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ=="; + }; + }; "ps-tree-1.2.0" = { name = "ps-tree"; packageName = "ps-tree"; @@ -47412,13 +46818,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.334" = { + "pyright-1.1.335" = { name = "pyright"; packageName = "pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; - sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; }; "q-1.5.1" = { @@ -47682,15 +47088,6 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quotation-1.1.3" = { - name = "quotation"; - packageName = "quotation"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/quotation/-/quotation-1.1.3.tgz"; - sha512 = "45gUgmX/RtQOQV1kwM06boP49OYXcKCPrYwdmAvs5YqkpiobhNKKwo524JM6Ma0ko3oN9tXNcWs9+ABq3Ry7YA=="; - }; - }; "quotation-2.0.2" = { name = "quotation"; packageName = "quotation"; @@ -48213,6 +47610,15 @@ let sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw=="; }; }; + "read-package-json-7.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz"; + sha512 = "uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg=="; + }; + }; "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -48843,15 +48249,6 @@ let sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; }; }; - "rehype-parse-7.0.1" = { - name = "rehype-parse"; - packageName = "rehype-parse"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz"; - sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; - }; - }; "rehype-parse-8.0.5" = { name = "rehype-parse"; packageName = "rehype-parse"; @@ -48861,15 +48258,6 @@ let sha512 = "Ds3RglaY/+clEX2U2mHflt7NlMA72KspZ0JLUJgBBLpRddBcEw3H8uYZQliQriku22NZpYMfjDdSgHcjxue24A=="; }; }; - "rehype-retext-2.0.4" = { - name = "rehype-retext"; - packageName = "rehype-retext"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-retext/-/rehype-retext-2.0.4.tgz"; - sha512 = "OnGX5RE8WyEs/Snz+Bs8DM9uGdrNUXMhCC7CW3S1cIZVOC90VdewdE+71kpG6LOzS0xwgZyItwrhjGv+oQgwkQ=="; - }; - }; "rehype-retext-3.0.2" = { name = "rehype-retext"; packageName = "rehype-retext"; @@ -48942,15 +48330,6 @@ let sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg=="; }; }; - "remark-frontmatter-2.0.0" = { - name = "remark-frontmatter"; - packageName = "remark-frontmatter"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-2.0.0.tgz"; - sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; - }; - }; "remark-frontmatter-3.0.0" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; @@ -49428,24 +48807,6 @@ let sha512 = "TDnjSv77Oynf+K1deGWZPKSwh3/9hykVAxVm9enAw6BmicCGklREET8s19KYnjGsNPms0pNDJLmp+bnHDVItAQ=="; }; }; - "remark-mdx-2.0.0-next.7" = { - name = "remark-mdx"; - packageName = "remark-mdx"; - version = "2.0.0-next.7"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; - sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; - }; - }; - "remark-message-control-6.0.0" = { - name = "remark-message-control"; - packageName = "remark-message-control"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-6.0.0.tgz"; - sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA=="; - }; - }; "remark-message-control-7.1.1" = { name = "remark-message-control"; packageName = "remark-message-control"; @@ -49473,15 +48834,6 @@ let sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA=="; }; }; - "remark-parse-8.0.3" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"; - sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; - }; - }; "remark-parse-9.0.0" = { name = "remark-parse"; packageName = "remark-parse"; @@ -49491,15 +48843,6 @@ let sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; }; }; - "remark-retext-4.0.0" = { - name = "remark-retext"; - packageName = "remark-retext"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-retext/-/remark-retext-4.0.0.tgz"; - sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q=="; - }; - }; "remark-retext-5.0.1" = { name = "remark-retext"; packageName = "remark-retext"; @@ -49518,15 +48861,6 @@ let sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="; }; }; - "remark-stringify-8.1.1" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; - sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; - }; - }; "remark-stringify-9.0.1" = { name = "remark-stringify"; packageName = "remark-stringify"; @@ -49779,15 +49113,6 @@ let sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; }; }; - "require-all-3.0.0" = { - name = "require-all"; - packageName = "require-all"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz"; - sha512 = "jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw=="; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -49815,6 +49140,15 @@ let sha512 = "efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg=="; }; }; + "require-in-the-middle-7.2.0" = { + name = "require-in-the-middle"; + packageName = "require-in-the-middle"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz"; + sha512 = "3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw=="; + }; + }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -49896,15 +49230,6 @@ let sha512 = "ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="; }; }; - "reserved-0.1.2" = { - name = "reserved"; - packageName = "reserved"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/reserved/-/reserved-0.1.2.tgz"; - sha512 = "/qO54MWj5L8WCBP9/UNe2iefJc+L9yETbH32xO/ft/EYPOTCR5k+azvDUgdCOKwZH8hXwPd0b8XBL78Nn2U69g=="; - }; - }; "reserved-words-0.1.2" = { name = "reserved-words"; packageName = "reserved-words"; @@ -49914,15 +49239,6 @@ let sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw=="; }; }; - "resolve-1.22.2" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.2"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"; - sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; - }; - }; "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; @@ -50157,15 +49473,6 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retext-english-3.0.4" = { - name = "retext-english"; - packageName = "retext-english"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.4.tgz"; - sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; - }; - }; "retext-english-4.1.0" = { name = "retext-english"; packageName = "retext-english"; @@ -50175,15 +49482,6 @@ let sha512 = "Pky2idjvgkzfodO0GH9X4IU8LX/d4ULTnLf7S1WsBRlSCh/JdTFPafXZstJqZehtQWNHrgoCqVOiGugsNFYvIQ=="; }; }; - "retext-equality-5.5.0" = { - name = "retext-equality"; - packageName = "retext-equality"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.5.0.tgz"; - sha512 = "ha7zrQ+Bq4xWifm21IcAzc9xhMWCJYfePUjRRNE2mXi8cFhaq1F8+cD78YA2nd6W2mxd11VGTVKY9O0DmzEywQ=="; - }; - }; "retext-equality-6.6.0" = { name = "retext-equality"; packageName = "retext-equality"; @@ -50193,15 +49491,6 @@ let sha512 = "il0Q8Dlxluc67UQnk49XmwISl3mzf1Lvuat0yZKzR2NuuluzTXI4EK44HA5JOobt/vmYkDaJaDsxHf0MmE4OMA=="; }; }; - "retext-profanities-6.1.0" = { - name = "retext-profanities"; - packageName = "retext-profanities"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-6.1.0.tgz"; - sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; - }; - }; "retext-profanities-7.2.2" = { name = "retext-profanities"; packageName = "retext-profanities"; @@ -50391,15 +49680,6 @@ let sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="; }; }; - "rollup-2.79.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.79.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"; - sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; - }; - }; "rollup-3.29.4" = { name = "rollup"; packageName = "rollup"; @@ -51282,15 +50562,6 @@ let sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; }; - "serialport-12.0.0" = { - name = "serialport"; - packageName = "serialport"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-12.0.0.tgz"; - sha512 = "AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA=="; - }; - }; "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -51687,15 +50958,6 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; - }; - }; "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; @@ -51732,6 +50994,15 @@ let sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A=="; }; }; + "sigstore-2.1.0" = { + name = "sigstore"; + packageName = "sigstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz"; + sha512 = "kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw=="; + }; + }; "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; @@ -53091,15 +52362,6 @@ let sha512 = "QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng=="; }; }; - "state-toggle-1.0.3" = { - name = "state-toggle"; - packageName = "state-toggle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz"; - sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; - }; - }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -53577,6 +52839,15 @@ let sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ=="; }; }; + "string-width-7.0.0" = { + name = "string-width"; + packageName = "string-width"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz"; + sha512 = "GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw=="; + }; + }; "string-width-cjs-4.2.3" = { name = "string-width-cjs"; packageName = "string-width-cjs"; @@ -53667,15 +52938,6 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; - "stringify-entities-3.1.0" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz"; - sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; - }; - }; "stringify-entities-4.0.3" = { name = "stringify-entities"; packageName = "stringify-entities"; @@ -54027,13 +53289,13 @@ let sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "subarg-1.0.0" = { @@ -54324,13 +53586,13 @@ let sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; }; }; - "svgo-3.0.2" = { + "svgo-3.0.3" = { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; }; "swagger2openapi-7.0.8" = { @@ -54414,13 +53676,13 @@ let sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; }; }; - "systeminformation-5.21.15" = { + "systeminformation-5.21.16" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.21.15"; + version = "5.21.16"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.15.tgz"; - sha512 = "vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.16.tgz"; + sha512 = "WJZdc5RbmDF1VOJcS+G2oIBeNgmMTyJ8+enHe9stIyBg2XhboUTsSfN9HrFMDV+fgXwJ50kNKgD3TzodsFgB+g=="; }; }; "sywac-1.3.0" = { @@ -54622,13 +53884,13 @@ let sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; }; }; - "taskkill-4.0.0" = { + "taskkill-5.0.0" = { name = "taskkill"; packageName = "taskkill"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-4.0.0.tgz"; - sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; + url = "https://registry.npmjs.org/taskkill/-/taskkill-5.0.0.tgz"; + sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ=="; }; }; "tcp-port-used-1.0.2" = { @@ -55189,15 +54451,6 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; - "tiny-glob-0.2.9" = { - name = "tiny-glob"; - packageName = "tiny-glob"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz"; - sha512 = "g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg=="; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -55396,15 +54649,6 @@ let sha512 = "+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q=="; }; }; - "to-vfile-6.1.0" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz"; - sha512 = "BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw=="; - }; - }; "to-vfile-7.2.4" = { name = "to-vfile"; packageName = "to-vfile"; @@ -55657,15 +54901,6 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha512 = "YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ=="; - }; - }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -55711,15 +54946,6 @@ let sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; }; }; - "trim-trailing-lines-1.1.4" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; - sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -55972,6 +55198,15 @@ let sha512 = "i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg=="; }; }; + "tuf-js-2.1.0" = { + name = "tuf-js"; + packageName = "tuf-js"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz"; + sha512 = "eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA=="; + }; + }; "tumblr-0.4.1" = { name = "tumblr"; packageName = "tumblr"; @@ -56251,13 +55486,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.6.0" = { + "type-fest-4.7.1" = { name = "type-fest"; packageName = "type-fest"; - version = "4.6.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.6.0.tgz"; - sha512 = "rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.7.1.tgz"; + sha512 = "iWr8RUmzAJRfhZugX9O7nZE6pCxDU8CZ3QxsLuTnGcBLJpCaP2ll3s4eMTBoFnU/CeXY/5rfQSuAEsTGJO4y8A=="; }; }; "type-is-1.6.18" = { @@ -56422,13 +55657,13 @@ let sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; - "typescript-5.3.0-dev.20231101" = { + "typescript-5.4.0-dev.20231109" = { name = "typescript"; packageName = "typescript"; - version = "5.3.0-dev.20231101"; + version = "5.4.0-dev.20231109"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231101.tgz"; - sha512 = "yt5zz7L+TBfzeJhMA/tAEO1YU8J2DWsFN3LbeMslNPXL3S0lR3yvePdl6fXCk7QFjnfaRtXH0noNdWg2imHWXg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.4.0-dev.20231109.tgz"; + sha512 = "wX5CSyZbJ0xsgAe0Fyefs8eqEe7o7mp7Nv5EHydBYFpJI/FWZFc4rSF2mGNNZ/1D7JMQgwjCAkZd/2TTF3m/Uw=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -56737,22 +55972,22 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.23.0" = { + "undici-5.26.5" = { name = "undici"; packageName = "undici"; - version = "5.23.0"; + version = "5.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz"; - sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz"; + sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; }; }; - "undici-5.27.0" = { + "undici-5.27.2" = { name = "undici"; packageName = "undici"; - version = "5.27.0"; + version = "5.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.27.0.tgz"; - sha512 = "l3ydWhlhOJzMVOYkymLykcRRXqbUaQriERtR70B9LzNkZ4bX52Fc8wbTDneMiwo8T+AemZXvXaTx+9o5ROxrXg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz"; + sha512 = "iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ=="; }; }; "undici-types-5.26.5" = { @@ -56764,15 +55999,6 @@ let sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; - "unherit-1.1.3" = { - name = "unherit"; - packageName = "unherit"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz"; - sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; - }; - }; "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; @@ -56881,15 +56107,6 @@ let sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; - "unified-diff-3.1.0" = { - name = "unified-diff"; - packageName = "unified-diff"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.1.0.tgz"; - sha512 = "d29qhcADmrvjgSYDLDUmmE/zvVyKUW+O3gRz6Bjj7fcv8kGBlrYBmMjnuBI+wuTou/PXaVl3hPeSh9mXZ0iGSA=="; - }; - }; "unified-diff-4.0.1" = { name = "unified-diff"; packageName = "unified-diff"; @@ -56908,22 +56125,13 @@ let sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; - "unified-engine-11.1.0" = { + "unified-engine-11.1.1" = { name = "unified-engine"; packageName = "unified-engine"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.0.tgz"; - sha512 = "RS3K5PgNjDRQN9eNIefLUDxpfyWIItmKcjBhD1VnYYT/h7xpheZoZBtb5gtwFyKWZlhKCGRVQknIm1M8qHZfIg=="; - }; - }; - "unified-engine-8.2.0" = { - name = "unified-engine"; - packageName = "unified-engine"; - version = "8.2.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; - sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.1.tgz"; + sha512 = "uVx/R+Q8V5wv5EPdPzBPPscSKpbqWeqqIc0lMfDcn3aS+QDENTpDY+wdPQ5oswuQSpPn/miuP0FspIwo19++IA=="; }; }; "unified-lint-rule-1.0.6" = { @@ -56944,15 +56152,6 @@ let sha512 = "JWudPtRN7TLFHVLEVZ+Rm8FUb6kCAtHxEXFgBGDxRSdNMnGyTU5zyYvduHSF/liExlFB3vdFvsAHnNVE/UjAwA=="; }; }; - "unified-message-control-3.0.3" = { - name = "unified-message-control"; - packageName = "unified-message-control"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.3.tgz"; - sha512 = "oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA=="; - }; - }; "unified-message-control-4.0.0" = { name = "unified-message-control"; packageName = "unified-message-control"; @@ -57160,15 +56359,6 @@ let sha512 = "qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A=="; }; }; - "unist-util-inspect-5.0.1" = { - name = "unist-util-inspect"; - packageName = "unist-util-inspect"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; - sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; - }; - }; "unist-util-inspect-7.0.2" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; @@ -57259,15 +56449,6 @@ let sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; }; }; - "unist-util-position-3.1.0" = { - name = "unist-util-position"; - packageName = "unist-util-position"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"; - sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; - }; - }; "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; @@ -57286,15 +56467,6 @@ let sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; - "unist-util-remove-position-2.0.1" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; - sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; - }; - }; "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; @@ -57448,13 +56620,13 @@ let sha512 = "L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw=="; }; }; - "universal-user-agent-6.0.0" = { + "universal-user-agent-6.0.1" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; - sha512 = "isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz"; + sha512 = "yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="; }; }; "universalify-0.1.2" = { @@ -57682,15 +56854,6 @@ let sha512 = "iQSLFuxB2ZFAxXGN28DTxk/GNGlBmtqawvguYDtChAHI9Xjy0z7c7hpw6ywutK34SEDYTpLEsAM1ATMq5pcQsw=="; }; }; - "update-notifier-4.1.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; - sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; - }; - }; "update-notifier-5.1.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -58366,13 +57529,13 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.25.0" = { + "vega-5.26.0" = { name = "vega"; packageName = "vega"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.25.0.tgz"; - sha512 = "lr+uj0mhYlSN3JOKbMNp1RzZBenWp9DxJ7kR3lha58AFNCzzds7pmFa7yXPbtbaGhB7Buh/t6n+Bzk3Y0VnF5g=="; + url = "https://registry.npmjs.org/vega/-/vega-5.26.0.tgz"; + sha512 = "Gvg4SMv6dHdY7aEbbsr6rbUfsI3hVVrEhGKmb5vV8SEqtJqGoeIKT/QZ9Yjw5uQOaGJJqkPcox3WW0n+qGGP/Q=="; }; }; "vega-canvas-1.2.7" = { @@ -58447,13 +57610,13 @@ let sha512 = "Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ=="; }; }; - "vega-functions-5.13.2" = { + "vega-functions-5.14.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.13.2"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.2.tgz"; - sha512 = "YE1Xl3Qi28kw3vdXVYgKFMo20ttd3+SdKth1jUNtBDGGdrOpvPxxFhZkVqX+7FhJ5/1UkDoAYs/cZY0nRKiYgA=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz"; + sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg=="; }; }; "vega-geo-4.4.1" = { @@ -58492,13 +57655,13 @@ let sha512 = "qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA=="; }; }; - "vega-parser-6.2.0" = { + "vega-parser-6.2.1" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz"; - sha512 = "as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.1.tgz"; + sha512 = "F79bQXt6fMkACR+TfFl7ueehKO26yCR/3iRZxhU7/pgHerx/d8K8pf2onMguu3NAN4eitT+PPuTgkDZtcqo9Qg=="; }; }; "vega-projection-1.6.0" = { @@ -58528,31 +57691,31 @@ let sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; }; }; - "vega-scale-7.3.0" = { + "vega-scale-7.3.1" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz"; - sha512 = "pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.1.tgz"; + sha512 = "tyTlaaCpHN2Ik/PPKl/j9ThadBDjPtypqW1D7IsUSkzfoZ7RPlI2jwAaoj2C/YW5jFRbEOx3njmjogp48I5CvA=="; }; }; - "vega-scenegraph-4.10.2" = { + "vega-scenegraph-4.11.0" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz"; - sha512 = "R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.11.0.tgz"; + sha512 = "NQtxA53/w9whUwZScv+/vxSb68frgLwanpy207vaBew46hnFZI9GUWmLWemOww8pJwBnVmnF4jFhUBbKq13HVw=="; }; }; - "vega-selections-5.4.1" = { + "vega-selections-5.4.2" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz"; - sha512 = "EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.2.tgz"; + sha512 = "99FUhYmg0jOJr2/K4TcEURmJRkuibrCDc8KBUX7qcQEITzrZ5R6a4QE+sarCvbb3hi8aA9GV2oyST6MQeA9mgQ=="; }; }; "vega-statistics-1.9.0" = { @@ -58573,22 +57736,22 @@ let sha512 = "z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA=="; }; }; - "vega-transforms-4.10.2" = { + "vega-transforms-4.11.0" = { name = "vega-transforms"; packageName = "vega-transforms"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.2.tgz"; - sha512 = "sJELfEuYQ238PRG+GOqQch8D69RYnJevYSGLsRGQD2LxNz3j+GlUX6Pid+gUEH5HJy22Q5L0vsTl2ZNhIr4teQ=="; + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.0.tgz"; + sha512 = "BeDASz7s9pIFjcSBljJJb8Eg0to2VjU0DvS/UjCQQYtqlfmzz78/mZnHyC+mW06h58ZKN+1QrIfqTZ6uMB4ySw=="; }; }; - "vega-typings-0.24.2" = { + "vega-typings-1.0.0" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.24.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.2.tgz"; - sha512 = "fW02GElYoqweCCaPqH6iH44UZnzXiX9kbm1qyecjU3k5s0vtufLI7Yuz/a/uL37mEAqTMQplBBAlk0T9e2e1Dw=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.0.0.tgz"; + sha512 = "ML8MVdNQurPvOQ6mskp+Zxf7Yy4M5G73QI04aIi51hACqa032qOxgzApZUPEoqBDBczm4zPPF0X9SQgaxJXq4A=="; }; }; "vega-util-1.17.2" = { @@ -58618,13 +57781,13 @@ let sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; }; }; - "vega-voronoi-4.2.1" = { + "vega-voronoi-4.2.2" = { name = "vega-voronoi"; packageName = "vega-voronoi"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz"; - sha512 = "zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q=="; + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.2.tgz"; + sha512 = "Bq2YOp2MGphhQnUuLwl3dsyBs6MuEU86muTjDbBJg33+HkZtE1kIoQZr+EUHa46NBsY1NzSKddOTu8wcaFrWiQ=="; }; }; "vega-wordcloud-4.1.4" = { @@ -58708,15 +57871,6 @@ let sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw=="; }; }; - "vfile-find-up-5.0.1" = { - name = "vfile-find-up"; - packageName = "vfile-find-up"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-5.0.1.tgz"; - sha512 = "YWx8fhWQNYpHxFkR5fDO4lCdvPcY4jfCG7qUMHVvSp14vRfkEYxFG/vUEV0eJuXoKFfiAmMkAS8dekOYnpAJ+A=="; - }; - }; "vfile-find-up-6.1.0" = { name = "vfile-find-up"; packageName = "vfile-find-up"; @@ -58726,15 +57880,6 @@ let sha512 = "plN64Ff/wLPvKC8ucTzyB97cgV7SdIcFL74HLCSmI/79FqOI1WACbNM4noKrJa+dZRgN6Gwp4BQElm/yBDqC3w=="; }; }; - "vfile-location-3.2.0" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; - sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; - }; - }; "vfile-location-4.1.0" = { name = "vfile-location"; packageName = "vfile-location"; @@ -58771,15 +57916,6 @@ let sha512 = "jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="; }; }; - "vfile-reporter-6.0.2" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; - sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; - }; - }; "vfile-reporter-7.0.5" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -58807,15 +57943,6 @@ let sha512 = "kPQ8wnn7lSS89B5kvdGfNxq3rz32dsAY2lPSIq0LtK/Dq0zMXchsEo3+UmJeUThqF8POtwtdjp8H8LNShBcpbA=="; }; }; - "vfile-sort-2.2.2" = { - name = "vfile-sort"; - packageName = "vfile-sort"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz"; - sha512 = "tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA=="; - }; - }; "vfile-sort-3.0.1" = { name = "vfile-sort"; packageName = "vfile-sort"; @@ -58834,15 +57961,6 @@ let sha512 = "lffPI1JrbHDTToJwcq0rl6rBmkjQmMuXkAxsZPRS9DXbaJQvc642eCg6EGxcX2i1L+esbuhq+2l9tBll5v8AeQ=="; }; }; - "vfile-statistics-1.1.4" = { - name = "vfile-statistics"; - packageName = "vfile-statistics"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz"; - sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA=="; - }; - }; "vfile-statistics-2.0.1" = { name = "vfile-statistics"; packageName = "vfile-statistics"; @@ -58978,58 +58096,58 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.14" = { + "volar-service-css-0.0.16" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.14.tgz"; - sha512 = "xmyKoyWpbgM0u7mGA1ogyj5ol7CfQADm5eXNpeJeX3Rp79rFEtz1DuuaIjcgRvhSYsjJfPBOtOvHBwTRf4HaEQ=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.16.tgz"; + sha512 = "gK/XD35t/P3SQrUuS8LMlCnE2ItIk+kXI6gPvBYl1NZ7O+tLH8rUWXA32YgpwNoITxYrm/G1seaq08zs4aiPvg=="; }; }; - "volar-service-emmet-0.0.14" = { + "volar-service-emmet-0.0.16" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.14.tgz"; - sha512 = "0meSKjQ93j5iSYl6Y+qtARfAYr3J2wNSr6wlKr/V9KULAy+8/me8q9l8wkTQqdRMujZAv2j/LzgQ65Yc9mnA1w=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.16.tgz"; + sha512 = "8sWWywzVJOD+PWDArOXDWbiRlM7+peydFhXJT71i4X1WPW32RyPxn6FypvciO+amqpfZP2rXfB9eibIJ+EofSQ=="; }; }; - "volar-service-html-0.0.14" = { + "volar-service-html-0.0.16" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.14.tgz"; - sha512 = "PQb97QICxXhXD7AJFU/S/Vexd1L4IP2Sa5SzxYyKnApcx0GNdxaIbFHlev9wazrTgtCtSnaVXJBxY05pZzTKPw=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.16.tgz"; + sha512 = "/oEXXgry++1CnTXQBUNf9B8MZfTlYZuJfZA7Zx9MN7WS4ZPxk3BFOdal/cXH6RNR2ruNEYr5QTW9rsqtoUscag=="; }; }; - "volar-service-prettier-0.0.14" = { + "volar-service-prettier-0.0.16" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.14.tgz"; - sha512 = "woZLBikvv8u0jUAq10ZTtuo9hmnQ1RHZubMhzyJbWwkr6L7wT7bPZkscdyaCGrzBT3Pz4zbS0bnpAC5GLAILTA=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.16.tgz"; + sha512 = "Kj2ZdwJGEvfYbsHW8Sjrew/7EB4PgRoas4f8yAJzUUVxIC/kvhUwLDxQc8+N2IibomN76asJGWe+i6VZZvgIkw=="; }; }; - "volar-service-typescript-0.0.14" = { + "volar-service-typescript-0.0.16" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.14.tgz"; - sha512 = "PGHFUbGPLE6/8ldNPO7FxwZdvRLlWBZ26RnJPCM48DBaGTc7qHGkXMtPQq5YCD10d8VwpZirz0eno8K0z+8bpg=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.16.tgz"; + sha512 = "k/qFKM2oxs/3fhbr/vcBSHnCLZ1HN3Aeh+bGvV9Lc9qIhrNyCVsDFOUJN1Qp4dI72+Y+eFSIDCLHmFEZdsP2EA=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.14" = { + "volar-service-typescript-twoslash-queries-0.0.16" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.14.tgz"; - sha512 = "Lg/AcacxyBmVbZhHZwnwvt+MEn/5YlbLiJ7DJG6Dt3xiuQmpXwZmM+JE7/ZMvPt4gxW6AL9zHz21M6JSPCkJ+g=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.16.tgz"; + sha512 = "0gPrkDTD2bMj2AnSNykOKhfmPnBFE2LS1lF3LWA7qu1ChRnJF0sodwCCbbeNYJ9+yth956ApoU1BVQ8UrMg+yw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -59185,6 +58303,15 @@ let sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; }; }; + "vscode-jsonrpc-8.2.0-next.2" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.2.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.2.tgz"; + sha512 = "1FQrqLselaLLe5ApFSU/8qGUbJ8tByWbqczMkT2PEDpDYthCQTe5wONPuVphe7BB+FvZwvBFI2kFkY7FtyHc1A=="; + }; + }; "vscode-languageclient-8.1.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -59266,6 +58393,15 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; + "vscode-languageserver-8.2.0-next.3" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "8.2.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.2.0-next.3.tgz"; + sha512 = "fqHRwcIRoxfKke7iLDSeUmdo3uk7o/uWNn/44xdWa4urdhsvpTZ5c1GsL1EX4TAvdDg0qeXy89NBZ5Gld2DkgQ=="; + }; + }; "vscode-languageserver-9.0.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -59329,6 +58465,15 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; + "vscode-languageserver-protocol-3.17.4-next.3" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.4-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.3.tgz"; + sha512 = "GnW3ldfzlsDK9B1/L1edBW1ddSakC59r+DRipTYCcXIT/zCCbLID998Dxn+exgrL33e3/XLQ+7hQQiSz6TnhKQ=="; + }; + }; "vscode-languageserver-protocol-3.17.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59446,6 +58591,15 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; + "vscode-languageserver-types-3.17.4-next.2" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.4-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.2.tgz"; + sha512 = "r6tXyCXyXQH7b6VHkvRT0Nd9v+DWQiosgTR6HQajCb4iJ1myr3KgueWEGBF1Ph5/YAiDy8kXUhf8dHl7wE1H2A=="; + }; + }; "vscode-languageserver-types-3.17.5" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -60337,15 +59491,6 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.7.1" = { - name = "winston-daily-rotate-file"; - packageName = "winston-daily-rotate-file"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz"; - sha512 = "7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA=="; - }; - }; "winston-transport-4.6.0" = { name = "winston-transport"; packageName = "winston-transport"; @@ -61121,15 +60266,6 @@ let sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; }; }; - "xstate-4.38.2" = { - name = "xstate"; - packageName = "xstate"; - version = "4.38.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.38.2.tgz"; - sha512 = "Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg=="; - }; - }; "xstate-4.38.3" = { name = "xstate"; packageName = "xstate"; @@ -61238,13 +60374,13 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.3.3" = { + "yaml-2.3.4" = { name = "yaml"; packageName = "yaml"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz"; - sha512 = "zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz"; + sha512 = "8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="; }; }; "yaml-ast-parser-0.0.43" = { @@ -61265,15 +60401,6 @@ let sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; }; }; - "yaml-js-0.2.3" = { - name = "yaml-js"; - packageName = "yaml-js"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.2.3.tgz"; - sha512 = "6xUQtVKl1qcd0EXtTEzUDVJy9Ji1fYa47LtkDtYKlIjhibPE9knNPmoRyf6SGREFHlOAUyDe9OdYqRP4DuSi5Q=="; - }; - }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -61346,15 +60473,6 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz"; - sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -61634,13 +60752,13 @@ let sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA=="; }; }; - "youch-3.3.2" = { + "youch-3.3.3" = { name = "youch"; packageName = "youch"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/youch/-/youch-3.3.2.tgz"; - sha512 = "9cwz/z7abtcHOIuH45nzmUFCZbyJA1nLqlirKvyNRx4wDMhqsBaifAJzBej7L4fsVPjFxYq3NK3GAcfvZsydFw=="; + url = "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz"; + sha512 = "qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA=="; }; }; "yurnalist-2.1.0" = { @@ -61697,15 +60815,6 @@ let sha512 = "9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ=="; }; }; - "zod-1.11.17" = { - name = "zod"; - packageName = "zod"; - version = "1.11.17"; - src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-1.11.17.tgz"; - sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; - }; - }; "zod-3.21.4" = { name = "zod"; packageName = "zod"; @@ -61742,15 +60851,6 @@ let sha512 = "fjUZh4nQ1s6HMccgIeE0VP4QG/YRGPmyjO9sAh890aQKPEk3nqbfUXhMFaC+Dr5KvYBm8BCyvfpZf2jY9aGSsw=="; }; }; - "zwave-js-12.3.0" = { - name = "zwave-js"; - packageName = "zwave-js"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.3.0.tgz"; - sha512 = "ZiGFyWSHT6xXgFsMj0gh+5D76h4oKSqoDBBVlrZitJShpan6LqE9eEhocP4XFTXs7XrLlbbo54gEz7y5P0KP9Q=="; - }; - }; "zwitch-1.0.5" = { name = "zwitch"; packageName = "zwitch"; @@ -61775,16 +60875,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz"; - sha512 = "wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-17.0.0.tgz"; + sha512 = "VzKYmN+1wSE2wLBEFu/NHSrRQbeaKkEDO9aZxd7nAnxC5T1Zcva7dfqZIXMHXH2HESYAZCvOS8ikBE/7DCtWWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1602.9" - sources."@angular-devkit/core-16.2.9" - sources."@angular-devkit/schematics-16.2.9" - sources."@gar/promisify-1.1.3" + sources."@angular-devkit/architect-0.1700.0" + sources."@angular-devkit/core-17.0.0" + sources."@angular-devkit/schematics-17.0.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -61796,36 +60895,24 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@npmcli/fs-2.1.2" - sources."@npmcli/git-4.1.0" + sources."@ljharb/through-2.3.11" + sources."@npmcli/agent-2.2.0" + sources."@npmcli/fs-3.1.0" + sources."@npmcli/git-5.0.3" sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/move-file-2.0.1" sources."@npmcli/node-gyp-3.0.0" - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@schematics/angular-16.2.9" - sources."@sigstore/bundle-1.1.0" + sources."@npmcli/promise-spawn-7.0.0" + sources."@npmcli/run-script-7.0.2" + sources."@schematics/angular-17.0.0" + sources."@sigstore/bundle-2.1.0" sources."@sigstore/protobuf-specs-0.2.1" - (sources."@sigstore/sign-1.0.0" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."@sigstore/sign-2.2.0" + sources."@sigstore/tuf-2.2.0" + sources."@tufjs/canonical-json-2.0.0" + sources."@tufjs/models-2.0.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" + sources."abbrev-2.0.0" + sources."agent-base-7.1.0" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -61833,113 +60920,89 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" + (sources."anymatch-3.1.3" // { + dependencies = [ + sources."picomatch-2.3.1" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."@npmcli/fs-3.1.0" - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - ]; - }) - sources."chalk-4.1.2" + sources."cacache-18.0.0" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-width-3.0.0" - sources."cliui-8.0.1" + sources."cli-width-4.1.0" + (sources."cliui-8.0.1" // { + dependencies = [ + sources."wrap-ansi-7.0.0" + ]; + }) sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" (sources."cross-spawn-7.0.3" // { dependencies = [ + sources."isexe-2.0.0" sources."which-2.0.2" ]; }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.4" sources."defaults-1.0.4" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" - sources."delegates-1.0.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-5.0.0" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."figures-3.2.0" + sources."figures-5.0.0" sources."fill-range-7.0.1" (sources."foreground-child-3.1.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."fs.realpath-1.0.0" + sources."fs-minipass-3.0.3" sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."gauge-4.0.4" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."get-intrinsic-1.2.2" + 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-unicode-2.0.1" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" sources."hasown-2.0.0" - sources."hosted-git-info-6.1.1" + sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."ignore-walk-6.0.3" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-8.2.4" + sources."inquirer-9.2.11" sources."ip-2.0.0" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" @@ -61950,42 +61013,33 @@ in sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-number-7.0.0" - sources."is-unicode-supported-0.1.0" + sources."is-unicode-supported-1.3.0" sources."is-wsl-2.2.0" - sources."isexe-2.0.0" + sources."isexe-3.1.1" sources."jackspeak-2.3.6" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" sources."jsonparse-1.3.1" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."magic-string-0.30.1" - (sources."make-fetch-happen-10.2.1" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."cacache-16.1.3" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."ssri-9.0.1" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) + sources."lru-cache-10.0.1" + sources."magic-string-0.30.5" + sources."make-fetch-happen-13.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-fetch-3.0.4" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -62012,71 +61066,53 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."mute-stream-0.0.8" + sources."ms-2.1.2" + sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - (sources."node-gyp-9.4.1" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" + sources."node-gyp-10.0.1" + sources."nopt-7.2.0" + sources."normalize-package-data-6.0.0" sources."normalize-path-3.0.0" sources."npm-bundled-3.0.0" sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" - (sources."npm-registry-fetch-14.0.5" // { + sources."npm-package-arg-11.0.1" + sources."npm-packlist-8.0.0" + sources."npm-pick-manifest-9.0.0" + sources."npm-registry-fetch-16.1.0" + sources."onetime-5.1.2" + sources."open-8.4.2" + (sources."ora-5.4.1" // { dependencies = [ - sources."make-fetch-happen-11.1.1" - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-15.2.0" - sources."path-is-absolute-1.0.1" + sources."pacote-17.0.4" sources."path-key-3.1.1" sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."picomatch-2.3.1" + sources."path-scurry-1.10.1" + sources."picomatch-3.0.1" sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."punycode-2.3.1" - (sources."read-package-json-6.0.4" // { + sources."read-package-json-7.0.0" + sources."read-package-json-fast-3.0.2" + sources."readable-stream-3.6.2" + (sources."readdirp-3.6.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" + sources."picomatch-2.3.1" ]; }) - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.2" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -62085,30 +61121,20 @@ in sources."lru-cache-6.0.0" ]; }) - sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - (sources."sigstore-1.9.0" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) + sources."sigstore-2.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" + sources."socks-proxy-agent-8.0.2" sources."source-map-0.7.4" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.16" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."ssri-10.0.5" sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" @@ -62124,32 +61150,24 @@ in sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" ]; }) - sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - (sources."tuf-js-1.1.7" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) + sources."tuf-js-2.1.0" sources."type-fest-0.21.3" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.0" sources."wcwidth-1.0.1" - sources."which-3.0.1" - sources."wide-align-1.1.5" - sources."wrap-ansi-7.0.0" + sources."which-4.0.0" + sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.7.2" @@ -62186,13 +61204,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.1.tgz"; - sha512 = "CBSGC3lsGnauVloVWq7+8N8F+IRsyiVe/3WevYf0TmmO8aPhmSzbAAF3vhYWfja3/HLtwNJsm6ltfRkMyYOyaQ=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.2.tgz"; + sha512 = "O5SMzoQ65wSxA1KygreI9UJYmHpgt15bSYBxceHwqX7OCDM4Ek8mr6mZn45LGDtwM3dp1uup7kp8exfRPwIFbA=="; }; dependencies = [ - sources."@astrojs/compiler-2.2.1" + sources."@astrojs/compiler-2.3.0" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -62214,7 +61232,7 @@ in sources."@vscode/l10n-0.0.16" sources."braces-3.0.2" sources."emmet-2.4.6" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -62246,12 +61264,12 @@ in sources."typesafe-path-0.2.2" sources."typescript-5.2.2" sources."typescript-auto-import-cache-0.3.0" - sources."volar-service-css-0.0.14" - sources."volar-service-emmet-0.0.14" - sources."volar-service-html-0.0.14" - sources."volar-service-prettier-0.0.14" - sources."volar-service-typescript-0.0.14" - sources."volar-service-typescript-twoslash-queries-0.0.14" + sources."volar-service-css-0.0.16" + sources."volar-service-emmet-0.0.16" + sources."volar-service-html-0.0.16" + sources."volar-service-prettier-0.0.16" + sources."volar-service-typescript-0.0.16" + sources."volar-service-typescript-twoslash-queries-0.0.16" sources."vscode-css-languageservice-6.2.10" sources."vscode-html-languageservice-5.1.1" sources."vscode-jsonrpc-8.2.0" @@ -62284,13 +61302,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ sources."semver-6.3.1" @@ -62300,7 +61318,7 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -62308,10 +61326,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -62321,7 +61339,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -62329,7 +61347,7 @@ 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.574" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -62415,9 +61433,9 @@ in sources."@commitlint/to-lines-18.1.0" sources."@commitlint/top-level-18.1.0" sources."@commitlint/types-18.1.0" - sources."@types/minimist-1.2.4" - sources."@types/node-18.18.8" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -62713,7 +61731,7 @@ in ]; }) sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" @@ -62721,10 +61739,10 @@ in sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" @@ -62735,7 +61753,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" + sources."@opentelemetry/api-1.7.0" sources."@pnpm/crypto.base32-hash-2.0.0" sources."@pnpm/dependency-path-2.1.5" sources."@pnpm/error-1.4.0" @@ -62796,20 +61814,20 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-2.0.0" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.14.200" + sources."@types/lodash-4.14.201" sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.4" - sources."@types/node-20.8.10" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" sources."@types/node-fetch-2.6.2" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse-json-4.0.1" + 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.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -62952,7 +61970,7 @@ in sources."expand-tilde-2.0.2" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.0.0" sources."fill-range-7.0.1" @@ -63169,7 +62187,7 @@ in sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" sources."normalize-package-data-3.0.3" @@ -63455,10 +62473,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.1.tgz"; - sha512 = "B7r0I4Ft5Tg814hKnIabQVZ4hXKK+PcpaYlLu1IEfCCueaL4r43IBnVeOzLOqIa3REfxS3RTglxSYOPl1vawQg=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.2.tgz"; + sha512 = "7Lzgcpk/Ic/mKb4cvXy9CLlU3/VPs0ZLD/8rviL+yV35th/rsYeoeEpTO2xzzYTkhdcQMJM0+TzsggS3sQLKeQ=="; }; dependencies = [ (sources."@alcalzone/ansi-tokenize-0.1.3" // { @@ -63546,12 +62564,13 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.50.1" // { + (sources."@shopify/cli-kit-3.50.2" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" sources."argparse-2.0.1" sources."chalk-5.3.0" + sources."fast-glob-3.3.1" sources."fs-extra-11.1.0" sources."js-yaml-4.1.0" sources."strip-ansi-7.1.0" @@ -63560,27 +62579,27 @@ in sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.50.1" + sources."@shopify/plugin-did-you-mean-3.50.2" sources."@sindresorhus/is-5.6.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@szmarczak/http-timer-5.0.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/archiver-5.3.2" - sources."@types/cli-progress-3.11.4" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/node-20.8.10" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/readdir-glob-1.1.3" - sources."@types/scheduler-0.16.5" - sources."@types/tinycolor2-1.4.5" + sources."@types/cli-progress-3.11.5" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/readdir-glob-1.1.4" + sources."@types/scheduler-0.16.6" + sources."@types/tinycolor2-1.4.6" sources."abort-controller-3.0.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" @@ -63607,7 +62626,7 @@ in sources."array-union-2.1.0" sources."as-table-1.0.55" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atomically-2.0.2" @@ -63725,7 +62744,7 @@ in }) sources."extract-files-9.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fetch-blob-3.2.0" (sources."figures-5.0.0" // { @@ -63906,7 +62925,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-8.0.0" - sources."npm-9.9.0" + sources."npm-9.9.1" sources."npm-run-path-4.0.1" sources."object-treeify-1.1.33" sources."once-1.4.0" @@ -64120,16 +63139,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64152,7 +63171,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64180,7 +63199,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64223,7 +63242,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64255,16 +63274,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64287,7 +63306,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64316,7 +63335,7 @@ in sources."mini-svg-data-uri-1.4.4" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64359,7 +63378,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64409,16 +63428,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64441,7 +63460,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64469,7 +63488,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64512,7 +63531,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64544,16 +63563,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64576,7 +63595,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64607,7 +63626,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64658,7 +63677,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64674,10 +63693,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.10.1.tgz"; - sha512 = "Z/Qw8aXr4G5DsMDoGRFIXUv2tR5I1Us45xuH3f4bSxpoxff7b4xeQ7LEoY6ebL2fjM7ELwLjF/9TEYTvyGmV6w=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.11.0.tgz"; + sha512 = "TycDEH1WPvMj5oEz76eq+iioCzamb5ml1KmfR9KLHsoAucTbj6NGiWNjCCKdduxefbeKP0PQtvVZUnjZnIPafg=="; }; dependencies = [ (sources."@aws-crypto/crc32-3.0.0" // { @@ -64720,17 +63739,17 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.441.0" - sources."@aws-sdk/client-sso-3.441.0" - sources."@aws-sdk/client-sts-3.441.0" - sources."@aws-sdk/core-3.441.0" + sources."@aws-sdk/client-s3-3.445.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.441.0" - sources."@aws-sdk/credential-provider-node-3.441.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.441.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" - (sources."@aws-sdk/lib-storage-3.441.0" // { + (sources."@aws-sdk/lib-storage-3.445.0" // { dependencies = [ sources."buffer-5.6.0" ]; @@ -64748,8 +63767,8 @@ in sources."@aws-sdk/middleware-ssec-3.433.0" sources."@aws-sdk/middleware-user-agent-3.438.0" sources."@aws-sdk/region-config-resolver-3.433.0" - sources."@aws-sdk/s3-presigned-post-3.441.0" - sources."@aws-sdk/s3-request-presigner-3.441.0" + sources."@aws-sdk/s3-presigned-post-3.445.0" + sources."@aws-sdk/s3-request-presigner-3.445.0" sources."@aws-sdk/signature-v4-multi-region-3.437.0" sources."@aws-sdk/token-providers-3.438.0" sources."@aws-sdk/types-3.433.0" @@ -64820,19 +63839,23 @@ in sources."@smithy/util-waiter-2.0.12" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/ws-8.5.8" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.18.3" - sources."axios-0.24.0" + sources."aws-crt-1.19.0" + (sources."axios-1.6.1" // { + dependencies = [ + sources."form-data-4.0.0" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -65075,6 +64098,7 @@ in sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" sources."querystringify-2.2.0" @@ -65177,7 +64201,7 @@ in sha512 = "+/kSxBAkZbeVBePoG2qRSvCkVIslk1dNlU5wQHAcbzOFTi7pEQR6C+kjoj94I+vGXVGMFfDwOYm07sPsd8dM6w=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -65204,13 +64228,13 @@ in ]; }) sources."@vscode/l10n-0.0.11" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."acorn-7.4.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" @@ -65236,7 +64260,7 @@ in sources."magic-string-0.30.5" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."object-assign-4.1.1" sources."picocolors-1.0.0" sources."postcss-8.4.31" @@ -65334,13 +64358,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -65366,7 +64390,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-remap-async-to-generator-7.22.20" @@ -65389,9 +64413,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.21.0" @@ -65401,12 +64426,12 @@ in sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -65415,66 +64440,66 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.23.2" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.23.2" // { + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/preset-flow-7.22.15" + sources."@babel/preset-flow-7.23.3" sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.23.2" + sources."@babel/preset-typescript-7.23.3" (sources."@babel/register-7.22.15" // { dependencies = [ sources."make-dir-2.1.0" @@ -65485,8 +64510,8 @@ in sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.20" // { dependencies = [ @@ -65525,15 +64550,15 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" - sources."@types/accepts-1.3.6" + sources."@types/accepts-1.3.7" sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.37" + sources."@types/connect-3.4.38" sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.4" + sources."@types/ejs-3.1.5" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.3" - sources."@types/inquirer-8.2.9" + sources."@types/http-errors-2.0.4" + sources."@types/inquirer-8.2.10" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" @@ -65541,13 +64566,13 @@ in ]; }) sources."@types/long-4.0.2" - sources."@types/mime-3.0.3" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" - sources."@types/serve-static-1.15.4" - sources."@types/through-0.0.32" + sources."@types/mime-3.0.4" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/serve-static-1.15.5" + sources."@types/through-0.0.33" sources."@vue/cli-shared-utils-5.0.8" (sources."@vue/cli-ui-5.0.8" // { dependencies = [ @@ -65556,10 +64581,10 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" sources."@vue/compiler-sfc-2.7.15" - sources."@vue/shared-3.3.7" + sources."@vue/shared-3.3.8" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -65651,7 +64676,7 @@ in }) sources."call-bind-1.0.5" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -65751,7 +64776,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -65804,7 +64829,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -65851,7 +64876,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.220.0" + sources."flow-parser-0.220.1" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -65966,7 +64991,7 @@ in sources."iterall-1.3.0" (sources."jake-10.8.7" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" ]; }) sources."javascript-stringify-2.1.0" @@ -66135,7 +65160,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-8.4.31" // { dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" ]; }) sources."prepend-http-2.0.0" @@ -66534,13 +65559,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -66640,21 +65665,21 @@ in sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" - sources."@types/concat-stream-2.0.1" - sources."@types/debug-4.1.10" - sources."@types/estree-1.0.4" - sources."@types/estree-jsx-1.0.2" - sources."@types/hast-2.3.7" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/is-empty-1.2.2" - sources."@types/mdast-3.0.14" - sources."@types/minimist-1.2.4" - sources."@types/ms-0.7.33" - sources."@types/nlcst-1.0.3" - sources."@types/node-18.18.8" - sources."@types/normalize-package-data-2.4.3" - sources."@types/supports-color-8.1.2" - sources."@types/unist-2.0.9" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" sources."abbrev-2.0.0" sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" @@ -67061,7 +66086,7 @@ in (sources."unified-engine-10.1.0" // { dependencies = [ sources."is-plain-obj-4.1.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."parse-json-6.0.2" ]; }) @@ -67133,7 +66158,7 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yargs-parser-21.1.1" sources."yocto-queue-1.0.0" sources."zwitch-2.0.4" @@ -67208,11 +66233,11 @@ in }; dependencies = [ sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001559" - sources."electron-to-chromium-1.4.574" + sources."caniuse-lite-1.0.30001561" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" sources."fraction.js-4.3.7" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-releases-2.0.13" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" @@ -67272,10 +66297,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.103.1"; + version = "2.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.103.1.tgz"; - sha512 = "5DXPlMi8Gf/a6fMqwY6uVwuR21PDDNGkAGkMVTTuaiulc4RsMjQUGq8I4xaPIYQRvR+VHFU+JQ5j5PnI5/gBrA=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.105.0.tgz"; + sha512 = "3ji+HNlCJUJ3o9h430gdRhocmeQrpM49fibXpvj3rvzBwuyWSTe2t8uohMPScSMETv59sHOlZpOdAEd+WwkuHQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -67315,21 +66340,21 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/debug-4.1.10" - sources."@types/eslint-8.44.6" - sources."@types/estree-1.0.4" - sources."@types/estree-jsx-1.0.2" - (sources."@types/hast-2.3.7" // { + sources."@types/debug-4.1.12" + sources."@types/eslint-8.44.7" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + (sources."@types/hast-2.3.8" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" ]; }) - sources."@types/http-cache-semantics-4.0.3" - sources."@types/json-schema-7.0.14" - sources."@types/mdast-4.0.2" - sources."@types/ms-0.7.33" - sources."@types/normalize-package-data-2.4.3" - sources."@types/unist-3.0.1" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/json-schema-7.0.15" + sources."@types/mdast-4.0.3" + sources."@types/ms-0.7.34" + sources."@types/normalize-package-data-2.4.4" + sources."@types/unist-3.0.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -67404,7 +66429,7 @@ in sources."eslint-rule-docs-1.1.235" sources."execa-8.0.1" sources."extend-3.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."form-data-encoder-2.1.4" @@ -67458,7 +66483,7 @@ in sources."keyv-4.5.4" sources."kind-of-6.0.3" sources."kleur-4.1.5" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."lodash.iteratee-4.7.0" sources."log-symbols-5.1.0" sources."longest-streak-3.1.0" @@ -67466,21 +66491,21 @@ in sources."lru-cache-10.0.1" (sources."mdast-comment-marker-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) sources."mdast-util-from-markdown-2.0.0" (sources."mdast-util-heading-style-2.0.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) (sources."mdast-util-mdx-expression-1.3.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-from-markdown-1.3.1" sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" @@ -67575,8 +66600,8 @@ in sources."remark-15.0.1" (sources."remark-lint-9.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67585,8 +66610,8 @@ in }) (sources."remark-lint-blockquote-indentation-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67597,8 +66622,8 @@ in }) (sources."remark-lint-checkbox-character-style-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67609,8 +66634,8 @@ in }) (sources."remark-lint-checkbox-content-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67621,8 +66646,8 @@ in }) (sources."remark-lint-code-block-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67633,8 +66658,8 @@ in }) (sources."remark-lint-definition-case-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67645,8 +66670,8 @@ in }) (sources."remark-lint-definition-spacing-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67657,7 +66682,7 @@ in }) (sources."remark-lint-double-link-0.2.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."normalize-url-5.3.1" sources."unist-util-is-5.2.1" sources."unist-util-visit-4.1.2" @@ -67665,8 +66690,8 @@ in }) (sources."remark-lint-emphasis-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67677,8 +66702,8 @@ in }) (sources."remark-lint-fenced-code-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67689,8 +66714,8 @@ in }) (sources."remark-lint-file-extension-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67699,8 +66724,8 @@ in }) (sources."remark-lint-final-newline-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67709,8 +66734,8 @@ in }) (sources."remark-lint-hard-break-spaces-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67721,8 +66746,8 @@ in }) (sources."remark-lint-heading-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67733,8 +66758,8 @@ in }) (sources."remark-lint-link-title-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67745,8 +66770,8 @@ in }) (sources."remark-lint-list-item-bullet-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67757,8 +66782,8 @@ in }) (sources."remark-lint-list-item-content-indent-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67769,8 +66794,8 @@ in }) (sources."remark-lint-list-item-indent-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67786,8 +66811,8 @@ in }) (sources."remark-lint-no-auto-link-without-protocol-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67799,8 +66824,8 @@ in }) (sources."remark-lint-no-blockquote-without-marker-5.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67811,8 +66836,8 @@ in }) (sources."remark-lint-no-emphasis-as-heading-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67832,8 +66857,8 @@ in }) (sources."remark-lint-no-file-name-articles-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67842,8 +66867,8 @@ in }) (sources."remark-lint-no-file-name-consecutive-dashes-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67852,8 +66877,8 @@ in }) (sources."remark-lint-no-file-name-irregular-characters-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67862,8 +66887,8 @@ in }) (sources."remark-lint-no-file-name-mixed-case-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67872,8 +66897,8 @@ in }) (sources."remark-lint-no-file-name-outer-dashes-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67882,8 +66907,8 @@ in }) (sources."remark-lint-no-heading-content-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67894,8 +66919,8 @@ in }) (sources."remark-lint-no-heading-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67906,8 +66931,8 @@ in }) (sources."remark-lint-no-heading-punctuation-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67919,8 +66944,8 @@ in }) (sources."remark-lint-no-inline-padding-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67932,8 +66957,8 @@ in }) (sources."remark-lint-no-multiple-toplevel-headings-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67949,8 +66974,8 @@ in }) (sources."remark-lint-no-shell-dollars-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67961,8 +66986,8 @@ in }) (sources."remark-lint-no-table-indentation-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67973,8 +66998,8 @@ in }) (sources."remark-lint-no-undefined-references-4.2.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -67987,8 +67012,8 @@ in }) (sources."remark-lint-no-unneeded-full-reference-image-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -68001,8 +67026,8 @@ in }) (sources."remark-lint-no-unneeded-full-reference-link-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -68015,8 +67040,8 @@ in }) (sources."remark-lint-no-unused-definitions-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68027,8 +67052,8 @@ in }) (sources."remark-lint-ordered-list-marker-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68039,8 +67064,8 @@ in }) (sources."remark-lint-ordered-list-marker-value-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68051,8 +67076,8 @@ in }) (sources."remark-lint-rule-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68063,8 +67088,8 @@ in }) (sources."remark-lint-strong-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68075,8 +67100,8 @@ in }) (sources."remark-lint-table-cell-padding-4.1.3" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68087,8 +67112,8 @@ in }) (sources."remark-lint-table-pipe-alignment-3.1.3" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68099,8 +67124,8 @@ in }) (sources."remark-lint-table-pipes-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68111,8 +67136,8 @@ in }) (sources."remark-lint-unordered-list-marker-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68123,8 +67148,8 @@ in }) (sources."remark-message-control-7.1.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -68183,11 +67208,11 @@ in sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" sources."trough-2.1.0" - sources."type-fest-4.6.0" + sources."type-fest-4.7.1" sources."unified-11.0.4" (sources."unified-lint-rule-2.1.2" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -68196,7 +67221,7 @@ in }) (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-3.1.0" @@ -68211,7 +67236,7 @@ in sources."unist-util-find-all-before-5.0.0" (sources."unist-util-find-all-between-2.1.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-find-1.0.4" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" @@ -68223,7 +67248,7 @@ in sources."unist-util-map-1.0.5" (sources."unist-util-position-4.0.4" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" ]; }) sources."unist-util-stringify-position-4.0.0" @@ -68242,7 +67267,7 @@ in }) (sources."unist-util-visit-parents-5.1.3" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-is-5.2.1" ]; }) @@ -68257,7 +67282,7 @@ in sources."vfile-6.0.1" (sources."vfile-location-4.1.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" sources."vfile-message-3.1.4" @@ -68720,8 +67745,8 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/node-20.8.10" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -68766,7 +67791,7 @@ in sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."engine.io-6.5.3" - sources."engine.io-client-6.5.2" + sources."engine.io-client-6.5.3" sources."engine.io-parser-5.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -68911,10 +67936,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.163.0"; + version = "2.172.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.163.0.tgz"; - sha512 = "NmAubHYjEj4VzjT/F82x+LLu5jCdLKC4Q/xYdOdrDeyw5ceZsmpNZD/kiTyeAleJpVO9BL2YpdHLd4zZiyPZHw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.172.0.tgz"; + sha512 = "gxFAdtebL8JG6ZmqtUvyAVJytqQSbsWpOVzxELPOwlJ6SDxI1kCvdmKOk/s3GAvkD4GLfbPXd+7jlTWL+BpCjg=="; }; dependencies = [ sources."@colors/colors-1.6.0" @@ -68936,8 +67961,8 @@ 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.60" - sources."@types/triple-beam-1.3.4" + sources."@types/node-16.18.61" + sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" @@ -68946,7 +67971,7 @@ in sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -68970,8 +67995,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.67.6" - sources."cdk8s-plus-25-2.22.49" + sources."cdk8s-2.68.2" + sources."cdk8s-plus-25-2.22.54" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -69019,7 +68044,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231101" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."emoji-regex-8.0.0" @@ -69034,7 +68059,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fecha-4.2.3" (sources."figures-3.2.0" // { @@ -69112,11 +68137,11 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.953" // { + (sources."jsii-srcmak-0.1.960" // { dependencies = [ sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.2.23" // { + (sources."jsii-5.2.26" // { dependencies = [ sources."yargs-17.7.2" ]; @@ -69229,7 +68254,7 @@ in sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."typescript-3.9.10" - sources."universal-user-agent-6.0.0" + sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -69246,7 +68271,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -69273,10 +68298,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.19.0.tgz"; - sha512 = "WGLs0IOgig8WDO2E6RYWtG5lCDL+ICX+plFipWT8JhuJpemxBhk8pO8uhDSWvBF85ZpVecQv+szfQVmXq8mdUg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.19.1.tgz"; + sha512 = "itqPbZKIYpdCCIUGzX/yVSrcD0U16XqpNbnE8hX7E3Kg2Lus5/fjeXX2ijyZw3vp63ScS+5PStEyMNooCh84IA=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -69290,7 +68315,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" (sources."@babel/highlight-7.22.20" // { @@ -69304,51 +68329,50 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" - sources."@cdktf/cli-core-0.19.0" - (sources."@cdktf/commons-0.19.0" // { + sources."@babel/types-7.23.3" + sources."@cdktf/cli-core-0.19.1" + (sources."@cdktf/commons-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" sources."uuid-9.0.1" ]; }) - (sources."@cdktf/hcl2cdk-0.19.0" // { + (sources."@cdktf/hcl2cdk-0.19.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."camelcase-6.3.0" sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."zod-3.22.4" ]; }) - (sources."@cdktf/hcl2json-0.19.0" // { + (sources."@cdktf/hcl2json-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" - (sources."@cdktf/provider-generator-0.19.0" // { + (sources."@cdktf/provider-generator-0.19.1" // { dependencies = [ - sources."@types/node-18.11.19" + sources."@types/node-18.18.8" ]; }) - (sources."@cdktf/provider-schema-0.19.0" // { + (sources."@cdktf/provider-schema-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) - (sources."@inquirer/checkbox-1.4.0" // { + (sources."@inquirer/checkbox-1.5.0" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/confirm-2.0.14" // { + (sources."@inquirer/confirm-2.0.15" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -69359,39 +68383,39 @@ in sources."cli-spinners-2.9.1" ]; }) - (sources."@inquirer/editor-1.2.12" // { + (sources."@inquirer/editor-1.2.13" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/expand-1.1.13" // { + (sources."@inquirer/expand-1.1.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/input-1.2.13" // { + (sources."@inquirer/input-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/password-1.1.13" + sources."@inquirer/password-1.1.14" sources."@inquirer/prompts-2.3.1" - (sources."@inquirer/rawlist-1.2.13" // { + (sources."@inquirer/rawlist-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/select-1.3.0" // { + (sources."@inquirer/select-1.3.1" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -69412,23 +68436,23 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@jsii/check-node-1.90.0" + sources."@jsii/check-node-1.91.0" sources."@jsii/spec-1.91.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sentry-internal/tracing-7.77.0" - sources."@sentry/core-7.77.0" - sources."@sentry/node-7.77.0" - sources."@sentry/types-7.77.0" - sources."@sentry/utils-7.77.0" - sources."@types/mute-stream-0.0.2" - sources."@types/node-20.8.10" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@sentry-internal/tracing-7.80.0" + sources."@sentry/core-7.80.0" + sources."@sentry/node-7.80.0" + sources."@sentry/types-7.80.0" + sources."@sentry/utils-7.80.0" + sources."@types/mute-stream-0.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/wrap-ansi-3.0.0" - sources."@types/yauzl-2.10.2" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" @@ -69453,7 +68477,7 @@ in sources."arr-rotate-1.0.0" sources."array-buffer-byte-length-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.5" @@ -69469,7 +68493,7 @@ in sources."call-bind-1.0.5" sources."camelcase-5.3.1" sources."case-1.6.3" - sources."cdktf-0.19.0" + sources."cdktf-0.19.1" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -69507,7 +68531,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.2" // { + (sources."deep-equal-2.2.3" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -69522,7 +68546,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231101" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."eastasianwidth-0.2.0" @@ -69551,7 +68575,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -69657,14 +68681,9 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-5.2.23" // { - dependencies = [ - sources."@jsii/check-node-1.91.0" - ]; - }) + sources."jsii-5.2.26" (sources."jsii-pacmak-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.91.0" sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" @@ -69679,7 +68698,6 @@ in }) (sources."jsii-reflect-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.91.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."wrap-ansi-7.0.0" @@ -69688,8 +68706,8 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."jsii-rosetta-5.2.1" - (sources."jsii-srcmak-0.1.953" // { + sources."jsii-rosetta-5.2.2" + (sources."jsii-srcmak-0.1.960" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-15.4.1" @@ -69896,7 +68914,7 @@ in sources."archiver-utils-3.0.4" ]; }) - sources."zod-1.11.17" + sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; meta = { @@ -70222,10 +69240,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.27"; + version = "1.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.27.tgz"; - sha512 = "db1WeOPFArtbNEa6IMCtovlXJUS4W+qfXWoqiUCDPvRxBMDZMROSum2nx+hbo6TZwkDacT9X59hkqRxDLVdprA=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.28.tgz"; + sha512 = "XbjcMohLS6V8sonh9sJRFVMCv2YP0dGlFT+y/bQ1qkj1zsyd7WutWAJAqfpopZTJN0SQxbStRcre8CV0fTE5EA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -70703,13 +69721,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.334.tgz"; - sha512 = "U6gGd8uvMPXW1TMrIcx1QeW+GnbKrWWGer5EOgbQFRFrzWuEipe/NU5Iv/S+YqUnkkdPMN2HeKL2BLoLsNq60Q=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.335.tgz"; + sha512 = "c5G9caUYxOC7PjiagbQhShXpx1Pj92Vya3wVr782rEwOmIxELZsFuiGWhgQEwKhneB+grH6do2QF6mSiUr07Xw=="; }; dependencies = [ - sources."pyright-1.1.334" + sources."pyright-1.1.335" ]; buildInputs = globalBuildInputs; meta = { @@ -71057,15 +70075,15 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -71077,10 +70095,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -71091,11 +70109,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.3" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.14" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse-json-4.0.1" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -71119,7 +70137,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71156,7 +70174,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71166,7 +70184,7 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" @@ -72224,7 +71242,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.3" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" sources."ansi-styles-3.2.1" @@ -72268,7 +71286,7 @@ in sources."json-parse-even-better-errors-3.0.0" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" sources."meow-12.1.1" @@ -72301,7 +71319,7 @@ in sources."tempfile-5.0.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."type-fest-4.6.0" + sources."type-fest-4.7.1" sources."uglify-js-3.17.4" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -72338,7 +71356,7 @@ in sources."cpy-10.1.0" sources."dir-glob-3.0.1" sources."escape-string-regexp-5.0.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -72398,8 +71416,8 @@ in }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/cookiejar-2.1.3" - sources."@types/node-20.8.10" + sources."@types/cookiejar-2.1.4" + sources."@types/node-20.9.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -72574,10 +71592,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-7.3.8.tgz"; - sha512 = "8AkqsBQAMsKYV5XyJLB6rBs5hgspL4+MPOg6mBKG2j5EvQgRVc6dIfAPWDNLpIeW2a3+7K5BIWqKHapKPeiknQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-8.0.0.tgz"; + sha512 = "Nayy25Dh+GAlDFDpVZaQhmidP947rpj1Pn9lmZ3nUFjD9W/yj0h0vrjMLMN4dbonddkmKh4t51C+7NuMP405hg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -72591,12 +71609,12 @@ in sources."chalk-2.4.2" ]; }) - sources."@cspell/cspell-bundled-dicts-7.3.8" - sources."@cspell/cspell-json-reporter-7.3.8" - sources."@cspell/cspell-pipe-7.3.8" - sources."@cspell/cspell-resolver-7.3.8" - sources."@cspell/cspell-service-bus-7.3.8" - sources."@cspell/cspell-types-7.3.8" + sources."@cspell/cspell-bundled-dicts-8.0.0" + sources."@cspell/cspell-json-reporter-8.0.0" + sources."@cspell/cspell-pipe-8.0.0" + sources."@cspell/cspell-resolver-8.0.0" + sources."@cspell/cspell-service-bus-8.0.0" + sources."@cspell/cspell-types-8.0.0" sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-4.0.0" sources."@cspell/dict-bash-4.1.2" @@ -72629,6 +71647,7 @@ in sources."@cspell/dict-latex-4.0.0" sources."@cspell/dict-lorem-ipsum-4.0.0" sources."@cspell/dict-lua-4.0.2" + sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-node-4.0.3" sources."@cspell/dict-npm-5.0.12" sources."@cspell/dict-php-4.0.4" @@ -72645,8 +71664,8 @@ in sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.2" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-7.3.8" - sources."@cspell/strong-weak-map-7.3.8" + sources."@cspell/dynamic-import-8.0.0" + sources."@cspell/strong-weak-map-8.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -72670,16 +71689,16 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-4.0.0" - (sources."cspell-dictionary-7.3.8" // { + (sources."cspell-dictionary-8.0.0" // { dependencies = [ sources."fast-equals-4.0.3" ]; }) - sources."cspell-gitignore-7.3.8" - sources."cspell-glob-7.3.8" - sources."cspell-grammar-7.3.8" - sources."cspell-io-7.3.8" - (sources."cspell-lib-7.3.8" // { + sources."cspell-gitignore-8.0.0" + sources."cspell-glob-8.0.0" + sources."cspell-grammar-8.0.0" + sources."cspell-io-8.0.0" + (sources."cspell-lib-8.0.0" // { dependencies = [ sources."find-up-6.3.0" sources."locate-path-7.2.0" @@ -72689,14 +71708,13 @@ in sources."yocto-queue-1.0.0" ]; }) - sources."cspell-trie-lib-7.3.8" + sources."cspell-trie-lib-8.0.0" sources."dot-prop-6.0.1" - sources."encoding-0.1.13" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-equals-5.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."file-entry-cache-7.0.1" @@ -72713,14 +71731,13 @@ in sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" sources."has-own-prop-2.0.0" - sources."iconv-lite-0.6.3" (sources."import-fresh-3.3.0" // { dependencies = [ sources."parent-module-1.0.1" sources."resolve-from-4.0.0" ]; }) - sources."import-meta-resolve-3.0.0" + sources."import-meta-resolve-3.1.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -72742,7 +71759,6 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.7.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -72758,20 +71774,16 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" sources."semver-7.5.4" sources."signal-exit-3.0.7" sources."strip-ansi-7.1.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" sources."type-fest-1.4.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.8" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" @@ -72854,7 +71866,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.1.1" sources."dir-glob-3.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -73078,17 +72090,17 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.4" - sources."@types/node-20.8.10" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-escapes-4.3.2" @@ -73099,7 +72111,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -73144,7 +72156,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -73293,10 +72305,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.104.1"; + version = "6.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.104.1.tgz"; - sha512 = "XNJKI18duz36jomTjGE0kbMzAx++Wh7+xW53CLUTjACvm0COhopTkj9jRY/kuRiYT8NhuGM/JYzXLI7xuET9gg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.106.0.tgz"; + sha512 = "jbj++5ILcP+Hn/dX8Cj8YWICYKRPVMVyzaI4wW/O0NMlRnEWrWU5Qo1m3UKRolPuZ/KcP+pIXvUJJHdvUlojsw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -73496,7 +72508,7 @@ in sources."@electron-forge/template-vite-typescript-6.4.2" sources."@electron-forge/template-webpack-6.4.2" sources."@electron-forge/template-webpack-typescript-6.4.2" - (sources."@electron/asar-3.2.7" // { + (sources."@electron/asar-3.2.8" // { dependencies = [ sources."commander-5.1.0" ]; @@ -73516,7 +72528,7 @@ in }) sources."@electron/osx-sign-1.0.5" sources."@electron/rebuild-3.3.0" - (sources."@electron/universal-1.4.2" // { + (sources."@electron/universal-1.4.5" // { dependencies = [ sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" @@ -73533,11 +72545,11 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/yauzl-2.10.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -73646,7 +72658,7 @@ in sources."expand-tilde-2.0.2" sources."exponential-backoff-3.1.1" sources."extract-zip-2.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."filename-reserved-regex-2.0.0" @@ -73943,10 +72955,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.6.0.tgz"; - sha512 = "M1lBKzISUsUhXWmY+f08Nsn5sbKIKRYjymSMdEVh47C46r9sWqL6zqsIrN3Kfv/DXvXL4qo2YiWrAQLxuvWk4A=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.7.0.tgz"; + sha512 = "kfYqd9I7S5qm0G4mUF2pNyNuHNImLTOdtd339rV+Y2/mcYMYSeu55tMBMGNFYpDMCHGCNf7d0oLJJ4lqhwdgbQ=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" @@ -73975,21 +72987,15 @@ in ]; }) sources."@expo/config-types-49.0.0" - (sources."@expo/eas-build-job-1.0.46" // { + (sources."@expo/eas-build-job-1.0.48" // { dependencies = [ sources."joi-17.11.0" sources."semver-7.5.4" ]; }) - (sources."@expo/eas-json-5.5.0" // { + (sources."@expo/eas-json-5.7.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" - (sources."@expo/eas-build-job-1.0.39" // { - dependencies = [ - sources."joi-17.11.0" - sources."semver-7.5.4" - ]; - }) ]; }) (sources."@expo/fingerprint-0.4.0" // { @@ -74091,8 +73097,8 @@ in sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@types/bunyan-1.8.10" - sources."@types/node-20.8.10" + sources."@types/bunyan-1.8.11" + sources."@types/node-20.9.0" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.8.10" @@ -74112,7 +73118,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asn1-0.2.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" @@ -74463,7 +73469,7 @@ in }) sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -74504,9 +73510,9 @@ in }; dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ansi-escapes-6.2.0" // { @@ -74681,17 +73687,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz"; - sha512 = "zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.52.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.1" @@ -74717,7 +73723,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.52.0" + sources."eslint-8.53.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -74825,8 +73831,8 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" @@ -74834,7 +73840,7 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -74860,7 +73866,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-remap-async-to-generator-7.22.20" @@ -74878,13 +73884,14 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-decorators-7.23.2" - sources."@babel/plugin-proposal-export-default-from-7.22.17" + sources."@babel/plugin-proposal-decorators-7.23.3" + sources."@babel/plugin-proposal-export-default-from-7.23.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" @@ -74893,16 +73900,16 @@ in sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.22.10" + sources."@babel/plugin-syntax-decorators-7.23.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.22.5" + sources."@babel/plugin-syntax-export-default-from-7.23.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -74911,68 +73918,68 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.23.2" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-react-display-name-7.22.5" + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-react-display-name-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - (sources."@babel/plugin-transform-runtime-7.23.2" // { + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + (sources."@babel/plugin-transform-runtime-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.23.2" // { + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; @@ -74986,13 +73993,13 @@ in sources."chalk-2.4.2" ]; }) - (sources."@babel/traverse-7.23.2" // { + (sources."@babel/traverse-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" ]; }) - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" @@ -75163,41 +74170,41 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" - sources."@types/body-parser-1.19.4" - sources."@types/bonjour-3.5.12" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" sources."@types/cacheable-request-6.0.3" - sources."@types/connect-3.4.37" - sources."@types/connect-history-api-fallback-1.5.2" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/express-4.17.20" - sources."@types/express-serve-static-core-4.17.39" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + 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.41" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/http-errors-2.0.3" - sources."@types/http-proxy-1.17.13" - sources."@types/istanbul-lib-coverage-2.0.5" - sources."@types/istanbul-lib-report-3.0.2" - sources."@types/istanbul-reports-3.0.3" - sources."@types/json-schema-7.0.14" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/http-errors-2.0.4" + sources."@types/http-proxy-1.17.14" + sources."@types/istanbul-lib-coverage-2.0.6" + sources."@types/istanbul-lib-report-3.0.3" + sources."@types/istanbul-reports-3.0.4" + sources."@types/json-schema-7.0.15" sources."@types/keyv-3.1.4" - sources."@types/mime-1.3.4" + sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" - sources."@types/responselike-1.0.2" - sources."@types/retry-0.12.4" - sources."@types/send-0.17.3" - sources."@types/serve-index-1.9.3" - sources."@types/serve-static-1.15.4" - sources."@types/sockjs-0.3.35" - sources."@types/ws-8.5.8" - sources."@types/yargs-15.0.17" - sources."@types/yargs-parser-21.0.2" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/responselike-1.0.3" + sources."@types/retry-0.12.5" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" + sources."@types/yargs-15.0.18" + sources."@types/yargs-parser-21.0.3" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" sources."@webassemblyjs/ast-1.11.6" @@ -75316,7 +74323,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75459,7 +74466,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -75581,7 +74588,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."faye-websocket-0.11.4" @@ -75829,7 +74836,7 @@ in sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -76399,16 +75406,16 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -76417,28 +75424,28 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/minimist-1.2.4" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" - sources."@types/yauzl-2.10.2" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."agent-base-6.0.2" (sources."ansi-escapes-4.3.2" // { @@ -76464,7 +75471,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -76490,7 +75497,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -76690,10 +75697,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.0.tgz"; - sha512 = "eEXMUd+tdYj3W4jvMvnOhANmLmQSOpr4pNssVjyiBUHq1QD2t8E+WlNoeTEpX7dO7H+fIXKAWWHyeUvOIYHvGA=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.2.tgz"; + sha512 = "gGfiMOxAZQTuVW2aWMhNTCBu6L/cdt5olLH/wy2teL4ZiM5c1YYCXt/NHP1mOSATV/l9i/CxmGiFomgcDzCDfQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -76731,17 +75738,17 @@ in sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.4" - sources."@types/node-20.8.10" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ajv-6.12.6" @@ -76756,7 +75763,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -76885,7 +75892,7 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -77200,97 +76207,58 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.1.0.tgz"; - sha512 = "EkJbYwI1Wt3oujxNlFF0Mq3hqdkDtQz7cPhZnXzUxmNhaxVopDqiwnB3zZmVvt2t6uKvplh21kLTTJ11hWH+0w=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-8.0.0.tgz"; + sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ=="; }; dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."aggregate-error-4.0.1" + sources."@ljharb/through-2.3.11" + sources."aggregate-error-5.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" - sources."ansi-styles-4.3.0" - sources."arrify-3.0.0" + sources."ansi-styles-6.2.1" sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.2" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."chalk-4.1.2" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" - sources."clean-stack-4.2.0" + sources."clean-stack-5.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-truncate-3.1.0" - sources."cli-width-3.0.0" + sources."cli-truncate-4.0.0" + sources."cli-width-4.1.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."decamelize-5.0.1" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) sources."defaults-1.0.4" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."error-ex-1.3.2" + sources."define-data-property-1.1.1" + sources."emoji-regex-10.3.0" sources."esc-exit-3.0.0" sources."escape-string-regexp-5.0.0" - sources."execa-5.1.1" + sources."execa-8.0.1" sources."external-editor-3.1.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."find-up-5.0.0" - sources."fkill-8.1.1" + sources."figures-5.0.0" + sources."fkill-9.0.0" sources."function-bind-1.1.2" sources."fuzzy-search-3.2.1" - sources."get-stream-6.0.1" - sources."hard-rejection-2.1.0" + sources."get-east-asian-width-1.2.0" + sources."get-intrinsic-1.2.2" + 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-proto-1.0.1" + sources."has-symbols-1.0.3" sources."hasown-2.0.0" - sources."hosted-git-info-4.1.0" - sources."human-signals-2.1.0" + 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-8.2.6" // { + (sources."inquirer-9.2.12" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -77299,125 +76267,98 @@ in sources."strip-ansi-6.0.1" ]; }) - (sources."inquirer-autocomplete-prompt-1.4.0" // { + (sources."inquirer-autocomplete-prompt-3.0.1" // { dependencies = [ - sources."rxjs-6.6.7" - sources."tslib-1.14.1" + sources."ansi-escapes-6.2.0" + sources."run-async-2.4.1" + sources."type-fest-3.13.1" ]; }) - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-1.0.0" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" + sources."is-stream-3.0.0" + sources."is-unicode-supported-1.3.0" sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - (sources."meow-10.1.5" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) + sources."meow-12.1.1" sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - (sources."minimist-options-4.1.0" // { + sources."mimic-fn-4.0.0" + sources."mute-stream-1.0.0" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."arrify-1.0.1" + sources."path-key-4.0.0" ]; }) - sources."mute-stream-0.0.8" - sources."normalize-package-data-3.0.3" - sources."npm-run-path-4.0.1" sources."num-sort-3.0.0" - sources."onetime-5.1.2" + sources."onetime-6.0.0" (sources."ora-5.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" sources."strip-ansi-6.0.1" ]; }) sources."os-tmpdir-1.0.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."pid-port-0.2.0" - (sources."process-exists-4.1.0" // { - dependencies = [ - sources."ps-list-6.3.0" - ]; - }) - sources."ps-list-7.2.0" - sources."quick-lru-5.1.1" - (sources."read-pkg-6.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."read-pkg-up-8.0.0" // { + sources."picocolors-1.0.0" + sources."pid-port-1.0.0" + sources."process-exists-5.0.0" + sources."ps-list-8.1.1" + sources."readable-stream-3.6.2" + (sources."restore-cursor-3.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."signal-exit-3.0.7" ]; }) - sources."readable-stream-3.6.2" - sources."redent-4.0.0" - sources."restore-cursor-3.1.0" - sources."run-async-2.4.1" + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - (sources."slice-ansi-5.0.0" // { - dependencies = [ - sources."ansi-styles-6.2.1" - ]; - }) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" - sources."string-width-5.1.2" + sources."signal-exit-4.1.0" + sources."slice-ansi-5.0.0" + sources."string-width-7.0.0" sources."string_decoder-1.3.0" sources."strip-ansi-7.1.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-4.0.0" + sources."strip-final-newline-3.0.0" sources."supports-color-7.2.0" - sources."taskkill-4.0.0" - sources."through-2.3.8" + (sources."taskkill-5.0.0" // { + dependencies = [ + sources."execa-6.1.0" + sources."get-stream-6.0.1" + sources."human-signals-3.0.1" + sources."signal-exit-3.0.7" + ]; + }) sources."tmp-0.0.33" - sources."trim-newlines-4.1.1" sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-2.0.2" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" ]; }) - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -77445,10 +76386,10 @@ in sources."@scure/base-1.1.3" sources."@scure/bip32-1.3.1" sources."@scure/bip39-1.2.1" - sources."@types/atob-2.1.3" + sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.8.10" - sources."@types/through-0.0.32" + sources."@types/node-20.9.0" + sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -77633,7 +76574,7 @@ in dependencies = [ sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@types/triple-beam-1.3.4" + sources."@types/triple-beam-1.3.5" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -77710,7 +76651,7 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" - sources."deep-equal-2.2.2" + sources."deep-equal-2.2.3" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" @@ -78003,7 +76944,7 @@ in sources."which-typed-array-1.1.13" (sources."winston-3.11.0" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."readable-stream-3.6.2" ]; }) @@ -78060,9 +77001,9 @@ in sources."utf-8-validate-6.0.3" ]; }) - sources."@types/bn.js-5.1.4" + sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -78115,13 +77056,13 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -78138,7 +77079,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-replace-supers-7.22.20" @@ -78154,16 +77095,16 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/preset-typescript-7.23.2" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" + sources."@babel/plugin-syntax-typescript-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/preset-typescript-7.23.3" sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" @@ -78186,12 +77127,12 @@ in sources."@turist/fetch-7.2.0" sources."@turist/time-0.0.2" sources."@types/cacheable-request-6.0.3" - sources."@types/common-tags-1.8.3" - sources."@types/http-cache-semantics-4.0.3" + 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.8.10" - sources."@types/node-fetch-2.6.8" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/node-fetch-2.6.9" + sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -78216,7 +77157,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78277,7 +77218,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -79006,8 +77947,8 @@ 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.8.10" - sources."@types/parse-json-4.0.1" + sources."@types/node-20.9.0" + sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" sources."aggregate-error-3.1.0" @@ -79090,7 +78031,7 @@ in sources."dataloader-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" - sources."deep-equal-2.2.2" + sources."deep-equal-2.2.3" sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" @@ -79120,7 +78061,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" @@ -79493,15 +78434,15 @@ in sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -79510,12 +78451,12 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-import-assertions-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" sources."@babel/polyfill-7.12.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/batch-execute-9.0.2" sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.3" @@ -79543,18 +78484,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@repeaterjs/repeater-3.0.4" - sources."@types/estree-1.0.4" - sources."@types/node-20.8.10" - sources."@types/ws-8.5.8" + sources."@repeaterjs/repeater-3.0.5" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.2" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@types/yargs-parser-21.0.3" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.14" sources."@whatwg-node/node-fetch-0.5.0" @@ -79572,7 +78513,7 @@ in sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -79596,7 +78537,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -79605,7 +78546,7 @@ in 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.1" + sources."fast-glob-3.3.2" sources."fast-querystring-1.1.2" sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" @@ -79661,7 +78602,7 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-fetch-2.7.0" @@ -81143,8 +80084,8 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.25" - sources."@types/sizzle-2.3.5" + sources."@types/jquery-3.5.27" + sources."@types/sizzle-2.3.6" sources."ansidec-0.3.4" sources."arch-2.2.0" sources."clipboardy-2.3.0" @@ -81195,22 +80136,25 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.5.tgz"; - sha512 = "5iU2b84SLE3JOlfGU/g6XCzioEdcflmpHRxPLKEMhEzV43DHgBwbdsTagDtXKtO50hi8osrzA85/HOCglrylKA=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.10.0.tgz"; + sha512 = "Qr0HfhN1dGPHCAaboH2ypopDadAQyH3uIcIbegslWZao2msrpJ6sIJwKWc10QJBbS5s/jorA9NCk+x+2fwlhaw=="; }; dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" - sources."@azure/core-http-2.3.2" - sources."@azure/core-tracing-1.0.0-preview.13" - sources."@azure/core-util-1.6.1" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.2.0" sources."@azure/logger-1.0.4" - sources."@bmewburn/js-beautify-1.14.7" - sources."@bmewburn/vscode-html-languageserver-1.9.0" + sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" + sources."@bmewburn/js-beautify-1.14.9" + sources."@bmewburn/vscode-html-languageserver-1.10.0" + sources."@isaacs/cliui-8.0.2" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ + sources."abbrev-1.1.1" sources."nopt-5.0.0" ]; }) @@ -81218,11 +80162,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" - sources."@opentelemetry/core-1.17.1" - sources."@opentelemetry/resources-1.17.1" - sources."@opentelemetry/sdk-trace-base-1.17.1" - sources."@opentelemetry/semantic-conventions-1.17.1" + sources."@one-ini/wasm-0.1.1" + sources."@opentelemetry/api-1.7.0" + sources."@opentelemetry/core-1.18.1" + sources."@opentelemetry/instrumentation-0.41.2" + sources."@opentelemetry/resources-1.18.1" + sources."@opentelemetry/sdk-trace-base-1.18.1" + sources."@opentelemetry/semantic-conventions-1.18.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -81234,15 +80180,18 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.8.10" - sources."@types/node-fetch-2.6.8" - sources."@types/tunnel-0.0.3" + sources."@tootallnate/once-2.0.0" + sources."@types/node-20.9.0" + sources."@types/shimmer-1.0.5" sources."@vscode/l10n-0.0.16" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" - sources."applicationinsights-2.3.6" + sources."ansi-styles-6.2.1" + sources."applicationinsights-2.7.3" sources."applicationinsights-native-metrics-0.0.10" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -81263,103 +80212,105 @@ in sources."braces-3.0.2" sources."caseless-0.12.0" sources."chownr-2.0.0" + sources."cjs-module-lexer-1.2.3" (sources."cls-hooked-4.2.2" // { dependencies = [ sources."semver-5.7.2" ]; }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-10.0.1" sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-4.3.4" sources."deepmerge-4.3.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.2" - (sources."diagnostic-channel-1.1.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."diagnostic-channel-publishers-1.0.5" + sources."diagnostic-channel-1.1.1" + sources."diagnostic-channel-publishers-1.0.7" sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domino-2.1.6" sources."domutils-3.1.0" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."semver-5.7.2" - ]; - }) + sources."editorconfig-1.0.4" sources."emitter-listener-1.1.2" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."entities-4.5.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fill-range-7.0.1" + sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" sources."form-data-4.0.0" - (sources."fs-extra-11.1.1" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) + sources."fs-extra-11.1.1" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."function-bind-1.1.2" + (sources."gauge-3.0.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."signal-exit-3.0.7" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."getpass-0.1.7" - sources."glob-8.1.0" + sources."glob-10.3.10" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."html-to-text-9.0.5" sources."htmlparser2-8.0.2" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" + sources."import-in-the-middle-1.4.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jackspeak-2.3.6" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) + sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."leac-0.6.0" sources."long-5.2.3" - sources."lru-cache-7.14.1" + sources."lru-cache-10.0.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -81369,46 +80320,46 @@ in sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-5.1.6" - sources."minipass-5.0.0" + sources."minimatch-9.0.1" + sources."minipass-7.0.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."mkdirp-1.0.4" + sources."module-details-from-path-1.0.3" sources."ms-2.1.2" sources."nan-2.18.0" sources."node-fetch-2.7.0" - sources."nopt-6.0.0" + sources."nopt-7.2.0" sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."parseley-0.12.1" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-scurry-1.10.1" sources."peberminta-0.9.0" sources."performance-now-2.1.0" sources."picomatch-2.3.1" - sources."process-0.11.10" sources."proto-list-1.2.4" sources."protobufjs-7.2.5" - sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."punycode-2.3.1" sources."qs-6.5.3" - sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."tough-cookie-2.5.0" sources."uuid-3.4.0" ]; }) - sources."requires-port-1.0.0" + sources."require-in-the-middle-7.2.0" + sources."resolve-1.22.8" sources."reusify-1.0.4" (sources."rimraf-3.0.2" // { dependencies = [ @@ -81420,78 +80371,89 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.3.0" sources."selderee-0.11.0" - (sources."semver-7.3.8" // { + (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" - sources."yallist-4.0.0" ]; }) sources."set-blocking-2.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shimmer-1.2.1" - sources."sigmund-1.0.1" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sshpk-1.18.0" sources."stack-chain-1.3.7" - sources."string-width-4.2.3" + 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.3.0" - sources."strip-ansi-6.0.1" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.2.0" // { dependencies = [ - sources."yallist-4.0.0" + sources."minipass-5.0.0" ]; }) sources."to-regex-range-5.0.1" - sources."tough-cookie-4.1.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" sources."turndown-plugin-gfm-1.0.2" sources."tweetnacl-0.14.5" - sources."typescript-4.9.5" + sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-0.2.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" - sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - (sources."vscode-css-languageservice-6.2.10" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" - ]; - }) - (sources."vscode-html-languageservice-5.1.1" // { + sources."vscode-css-languageservice-6.2.10" + sources."vscode-html-languageservice-5.1.1" + sources."vscode-jsonrpc-8.2.0" + (sources."vscode-languageserver-8.2.0-next.3" // { dependencies = [ - sources."vscode-languageserver-types-3.17.5" + sources."vscode-jsonrpc-8.2.0-next.2" + sources."vscode-languageserver-protocol-3.17.4-next.3" + sources."vscode-languageserver-types-3.17.4-next.2" ]; }) - sources."vscode-jsonrpc-8.2.0" - (sources."vscode-languageserver-8.0.2" // { + sources."vscode-languageserver-protocol-3.17.5" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" + sources."vscode-uri-3.0.8" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-2.0.2" + (sources."wide-align-1.1.5" // { dependencies = [ - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - (sources."vscode-languageserver-protocol-3.17.5" // { + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { dependencies = [ - sources."vscode-languageserver-types-3.17.5" + 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."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.8" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" sources."wrappy-1.0.2" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -81701,8 +80663,8 @@ in sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.8.10" - sources."@types/ws-8.5.8" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -81732,7 +80694,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.3" + sources."aws-crt-1.19.0" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -81745,7 +80707,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.12.0" - sources."axios-0.24.0" + sources."axios-1.6.1" sources."b4a-1.6.4" sources."balanced-match-1.0.2" sources."base-64-1.0.0" @@ -82315,6 +81277,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."proper-lockfile-4.1.2" + sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.3.1" @@ -82569,35 +81532,71 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.9"; + version = "1.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"; - sha512 = "coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz"; + sha512 = "rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."@one-ini/wasm-0.1.1" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-6.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-10.0.1" sources."config-chain-1.1.13" + sources."cross-spawn-7.0.3" + sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" - sources."fs.realpath-1.0.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."emoji-regex-9.2.2" + sources."foreground-child-3.1.1" + sources."glob-10.3.10" sources."ini-1.3.8" + sources."is-fullwidth-code-point-3.0.0" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."lru-cache-6.0.0" sources."minimatch-9.0.1" - sources."nopt-6.0.0" - sources."once-1.4.0" + sources."minipass-7.0.4" + sources."nopt-7.2.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."proto-list-1.2.4" sources."semver-7.5.4" - sources."wrappy-1.0.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" + 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."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."which-2.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."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -82640,11 +81639,11 @@ in sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@jsdoc/salty-0.2.5" - sources."@types/linkify-it-3.0.4" + sources."@types/linkify-it-3.0.5" sources."@types/markdown-it-12.2.3" - sources."@types/mdurl-1.0.4" + sources."@types/mdurl-1.0.5" sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -82949,7 +81948,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."object-inspect-1.13.1" @@ -83650,7 +82649,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" (sources."figures-3.2.0" // { @@ -83808,13 +82807,13 @@ in sources."@ampproject/remapping-2.2.1" sources."@babel/cli-7.23.0" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -83825,7 +82824,7 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -83835,13 +82834,13 @@ in sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" sources."@babel/node-7.22.19" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/register-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -83947,7 +82946,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -84007,7 +83006,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -84034,7 +83033,7 @@ in ]; }) sources."express-validator-6.15.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -84465,7 +83464,7 @@ in sources."core-util-is-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" @@ -84637,7 +83636,7 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" @@ -84650,8 +83649,8 @@ in ]; }) sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ @@ -84681,9 +83680,9 @@ in sources."array-ify-1.0.0" sources."array-union-2.1.0" sources."arrify-1.0.1" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" - sources."axios-1.6.0" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -84811,7 +83810,7 @@ in sources."tmp-0.0.33" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -85107,7 +84106,7 @@ in dependencies = [ sources."cli-spinners-2.6.1" sources."glob-7.1.4" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."lru-cache-6.0.0" sources."semver-7.5.3" sources."yargs-17.7.2" @@ -85384,7 +84383,7 @@ in sources."uglify-js-3.17.4" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" - sources."universal-user-agent-6.0.0" + sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" sources."upath-2.0.1" sources."util-deprecate-1.0.2" @@ -86320,9 +85319,9 @@ in }; dependencies = [ sources."@types/commander-2.12.2" - sources."@types/diff-3.5.7" + sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -86400,7 +85399,7 @@ in sha512 = "zave+vI4AMeLp0FlUllAwGbNytSKsS3R2Zgtf3ufVT892Z/L6Ro9osZwE9PNA7s0IkJ4onnuHqatpsaCiAShJw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."boolbase-1.0.0" sources."chalk-5.3.0" sources."cheerio-1.0.0-rc.12" @@ -86998,8 +85997,8 @@ in sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.8.0" - sources."@types/triple-beam-1.3.4" - sources."async-3.2.4" + sources."@types/triple-beam-1.3.5" + sources."async-3.2.5" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -87065,10 +86064,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.0.tgz"; - sha512 = "LkaKUbjyacJGRHiuhUeUblzZNxTF1/XNooyAl6aiaJ6ZpeurR4Mk9sjxncGNSI7pETqyqM+hLAER0788oSxt0A=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -87346,7 +86345,7 @@ in sources."@node-red/util-3.1.0" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."acorn-8.8.2" @@ -88037,13 +87036,13 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + 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.771" + sources."all-package-names-2.0.773" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -88151,7 +87150,7 @@ in sources."execa-7.2.0" sources."exit-hook-3.2.0" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-5.0.0" sources."fill-range-7.0.1" @@ -88209,7 +87208,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-9.2.11" + sources."inquirer-9.2.12" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -88619,10 +87618,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.2.2"; + version = "10.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.2.2.tgz"; - sha512 = "VSP/rh88wBQ+b7bz0NOdZQBQCuWLI/etpWfgUWDmNaMy0MuD1xJBMofEzuFojNpJANVaJCkN5U7KgfPdR2V1fg=="; + url = "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz"; + sha512 = "GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -88691,10 +87690,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.19.1.tgz"; - sha512 = "V7z+mn8X4JcgC0uaGs6rwNNOJH4wk+LUidxiPoXVaLtHt8g7qUfKQseozbXx8rk+Qgx8WT7EY2+AjDNYNSTjGA=="; + url = "https://registry.npmjs.org/orval/-/orval-6.20.0.tgz"; + sha512 = "hBH0oRgV3Opwd0kOZa3An0+bPESlclzLqLA37jCGky4yNCwG3DTvhgGRqCgB0De6hBoOlOcRs/jh919LfaALIA=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -88702,30 +87701,48 @@ in sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-4.3.1" - sources."@esbuild/android-arm-0.15.18" - sources."@esbuild/linux-loong64-0.15.18" + sources."@esbuild/android-arm-0.19.5" + sources."@esbuild/android-arm64-0.19.5" + sources."@esbuild/android-x64-0.19.5" + sources."@esbuild/darwin-arm64-0.19.5" + sources."@esbuild/darwin-x64-0.19.5" + sources."@esbuild/freebsd-arm64-0.19.5" + sources."@esbuild/freebsd-x64-0.19.5" + sources."@esbuild/linux-arm-0.19.5" + sources."@esbuild/linux-arm64-0.19.5" + sources."@esbuild/linux-ia32-0.19.5" + sources."@esbuild/linux-loong64-0.19.5" + sources."@esbuild/linux-mips64el-0.19.5" + sources."@esbuild/linux-ppc64-0.19.5" + sources."@esbuild/linux-riscv64-0.19.5" + sources."@esbuild/linux-s390x-0.19.5" + sources."@esbuild/linux-x64-0.19.5" + sources."@esbuild/netbsd-x64-0.19.5" + sources."@esbuild/openbsd-x64-0.19.5" + sources."@esbuild/sunos-x64-0.19.5" + sources."@esbuild/win32-arm64-0.19.5" + sources."@esbuild/win32-ia32-0.19.5" + sources."@esbuild/win32-x64-0.19.5" sources."@exodus/schemasafe-1.3.0" - sources."@ibm-cloud/openapi-ruleset-0.45.5" - sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" + sources."@ibm-cloud/openapi-ruleset-1.14.2" + sources."@ibm-cloud/openapi-ruleset-utilities-1.3.0" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" sources."@jsep-plugin/ternary-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.19.1" - sources."@orval/axios-6.19.1" - sources."@orval/core-6.19.1" - sources."@orval/msw-6.19.1" - sources."@orval/query-6.19.1" - sources."@orval/swr-6.19.1" - sources."@orval/zod-6.19.1" - sources."@rollup/plugin-commonjs-22.0.2" - (sources."@rollup/pluginutils-3.1.0" // { + sources."@orval/angular-6.20.0" + sources."@orval/axios-6.20.0" + (sources."@orval/core-6.20.0" // { dependencies = [ - sources."estree-walker-1.0.1" + sources."fs-extra-11.1.1" ]; }) + sources."@orval/msw-6.20.0" + sources."@orval/query-6.20.0" + sources."@orval/swr-6.20.0" + sources."@orval/zod-6.20.0" sources."@stoplight/better-ajv-errors-1.0.3" sources."@stoplight/json-3.21.0" (sources."@stoplight/json-ref-readers-1.2.2" // { @@ -88736,23 +87753,16 @@ in sources."@stoplight/json-ref-resolver-3.1.6" sources."@stoplight/ordered-object-literal-1.0.4" sources."@stoplight/path-1.3.2" - (sources."@stoplight/spectral-cli-6.11.0" // { - dependencies = [ - sources."fast-glob-3.2.12" - ]; - }) (sources."@stoplight/spectral-core-1.18.3" // { dependencies = [ sources."@stoplight/types-13.6.0" + sources."minimatch-3.1.2" ]; }) - sources."@stoplight/spectral-formats-1.5.0" - sources."@stoplight/spectral-formatters-1.3.0" + sources."@stoplight/spectral-formats-1.6.0" sources."@stoplight/spectral-functions-1.7.2" sources."@stoplight/spectral-parsers-1.0.3" sources."@stoplight/spectral-ref-resolver-1.0.4" - sources."@stoplight/spectral-ruleset-bundler-1.5.2" - sources."@stoplight/spectral-ruleset-migrator-1.9.5" sources."@stoplight/spectral-rulesets-1.18.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ @@ -88762,12 +87772,10 @@ in sources."@stoplight/types-13.20.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" - sources."@types/es-aggregate-error-1.0.4" - sources."@types/estree-0.0.39" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" - sources."@types/sarif-2.1.6" - sources."@types/urijs-1.19.22" + sources."@types/es-aggregate-error-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" + sources."@types/urijs-1.19.23" sources."abort-controller-3.0.0" sources."acorn-8.11.2" sources."ajv-8.12.0" @@ -88782,35 +87790,24 @@ in sources."array-buffer-byte-length-1.0.0" sources."array-union-2.1.0" sources."arraybuffer.prototype.slice-1.0.2" - sources."as-table-1.0.55" - sources."ast-types-0.14.2" sources."astring-1.8.6" sources."available-typed-arrays-1.0.5" - sources."backslash-0.2.0" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."builtins-1.0.3" sources."cac-6.7.14" sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" - sources."cliui-7.0.4" - sources."clone-1.0.4" + sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."commondir-1.0.1" sources."compare-versions-6.1.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."cuid-2.1.8" - sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" - sources."deepmerge-2.2.1" - sources."defaults-1.0.4" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."dependency-graph-0.11.0" @@ -88823,62 +87820,29 @@ in sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" - sources."esbuild-0.15.18" - sources."esbuild-android-64-0.15.18" - sources."esbuild-android-arm64-0.15.18" - sources."esbuild-darwin-64-0.15.18" - sources."esbuild-darwin-arm64-0.15.18" - sources."esbuild-freebsd-64-0.15.18" - sources."esbuild-freebsd-arm64-0.15.18" - sources."esbuild-linux-32-0.15.18" - sources."esbuild-linux-64-0.15.18" - sources."esbuild-linux-arm-0.15.18" - sources."esbuild-linux-arm64-0.15.18" - sources."esbuild-linux-mips64le-0.15.18" - sources."esbuild-linux-ppc64le-0.15.18" - sources."esbuild-linux-riscv64-0.15.18" - sources."esbuild-linux-s390x-0.15.18" - sources."esbuild-netbsd-64-0.15.18" - sources."esbuild-openbsd-64-0.15.18" - sources."esbuild-sunos-64-0.15.18" - sources."esbuild-windows-32-0.15.18" - sources."esbuild-windows-64-0.15.18" - sources."esbuild-windows-arm64-0.15.18" + sources."esbuild-0.19.5" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" - (sources."find-up-5.0.0" // { - dependencies = [ - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - }) + sources."find-up-5.0.0" sources."for-each-0.3.3" - sources."format-util-1.0.5" sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.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-source-2.0.12" sources."get-stream-6.0.1" sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" sources."globby-11.1.0" @@ -88891,26 +87855,17 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hasown-2.0.0" - sources."hpagent-1.2.0" sources."http2-client-1.3.5" sources."human-signals-2.1.0" - (sources."ibm-openapi-validator-0.97.5" // { - dependencies = [ - sources."find-up-3.0.0" - ]; - }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" sources."immer-9.0.21" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" - sources."is-core-module-2.13.1" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -88918,7 +87873,6 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" - sources."is-reference-1.2.1" sources."is-regex-1.1.4" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" @@ -88930,20 +87884,13 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."jsep-1.3.8" - sources."json-dup-key-validator-1.0.3" - (sources."json-schema-ref-parser-5.1.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" sources."jsonfile-6.1.0" sources."jsonpath-plus-7.1.0" sources."jsonpointer-5.0.1" - sources."jsonschema-1.4.1" sources."leven-3.1.0" - sources."locate-path-3.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."lodash.isempty-4.4.0" @@ -88953,13 +87900,17 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."magic-string-0.25.9" - sources."matcher-1.1.1" + sources."loglevel-1.8.1" + sources."loglevel-plugin-prefix-0.8.4" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" + (sources."minimatch-6.2.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + ]; + }) sources."ms-2.1.2" (sources."nimma-0.2.2" // { dependencies = [ @@ -88969,7 +87920,6 @@ in sources."node-fetch-2.7.0" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" - sources."node-sarif-builder-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."oas-kit-common-1.0.8" @@ -88980,45 +87930,33 @@ in sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" - sources."once-1.4.0" sources."onetime-5.1.2" - sources."ono-4.0.11" sources."openapi-types-12.1.3" (sources."openapi3-ts-3.2.0" // { dependencies = [ - sources."yaml-2.3.3" + sources."yaml-2.3.4" ]; }) - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pad-2.3.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pony-cause-1.1.1" - sources."printable-characters-1.0.42" sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" sources."regexp.prototype.flags-1.5.1" - sources."require-all-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."reserved-0.1.2" - sources."resolve-1.22.8" sources."reusify-1.0.4" - sources."rollup-2.79.1" sources."run-parallel-1.2.0" sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.2" sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" @@ -89033,10 +87971,7 @@ in sources."signal-exit-3.0.7" sources."simple-eval-1.0.0" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."stacktracey-2.1.8" sources."string-argv-0.3.2" sources."string-width-4.2.3" sources."string.prototype.trim-1.2.8" @@ -89045,9 +87980,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" sources."swagger2openapi-7.0.8" - sources."text-table-0.2.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tsconfck-2.1.2" @@ -89063,20 +87996,16 @@ in sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.10.0" - sources."validate-npm-package-name-3.0.0" sources."validator-13.11.0" - sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" 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."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yaml-1.10.2" - sources."yaml-js-0.2.3" - sources."yargs-17.3.1" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yocto-queue-0.1.0" ]; @@ -89117,7 +88046,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" sources."@lezer/common-1.1.0" - sources."@lezer/lr-1.3.13" + sources."@lezer/lr-1.3.14" sources."@lmdb/lmdb-darwin-arm64-2.8.5" sources."@lmdb/lmdb-darwin-x64-2.8.5" sources."@lmdb/lmdb-linux-arm-2.8.5" @@ -89211,7 +88140,7 @@ in sources."@parcel/watcher-win32-ia32-2.3.0" sources."@parcel/watcher-win32-x64-2.3.0" sources."@parcel/workers-2.10.2" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" @@ -89246,7 +88175,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -89296,7 +88225,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -89325,7 +88254,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-2.1.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) (sources."htmlparser2-7.2.0" // { @@ -89370,20 +88299,11 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - (sources."lightningcss-1.22.0" // { + (sources."lightningcss-1.22.1" // { dependencies = [ sources."detect-libc-1.0.3" ]; }) - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lmdb-2.8.5" @@ -89398,7 +88318,7 @@ in sources."mime-types-2.1.35" sources."minimatch-5.1.6" sources."msgpackr-1.9.9" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-addon-api-6.1.0" sources."node-gyp-build-optional-packages-5.1.1" sources."node-releases-2.0.13" @@ -89447,7 +88367,7 @@ in sources."postcss-selector-parser-6.0.13" (sources."postcss-svgo-6.0.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) sources."postcss-unique-selectors-6.0.0" @@ -89913,7 +88833,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" ]; buildInputs = globalBuildInputs; meta = { @@ -90002,7 +88922,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.1.1" + sources."deep-equal-1.1.2" sources."deep-extend-0.6.0" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" @@ -90659,15 +89579,16 @@ in src = ../../tools/networking/pgrok/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@alloc/quick-lru-5.2.0" sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/generator-7.23.3" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."semver-6.3.1" ]; }) @@ -90682,29 +89603,29 @@ in sources."@babel/helper-environment-visitor-7.22.20" (sources."@babel/helper-function-name-7.23.0" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-hoist-variables-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-module-imports-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" (sources."@babel/helper-simple-access-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-split-export-declaration-7.22.6" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/helper-string-parser-7.22.5" @@ -90712,22 +89633,22 @@ in sources."@babel/helper-validator-option-7.22.15" (sources."@babel/helpers-7.23.2" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" (sources."@babel/template-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/traverse-7.23.2" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/generator-7.23.3" + sources."@babel/types-7.23.3" ]; }) sources."@babel/types-7.17.0" @@ -90760,7 +89681,7 @@ in sources."@esbuild/win32-x64-0.18.20" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - (sources."@eslint/eslintrc-2.1.2" // { + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ sources."globals-13.23.0" ]; @@ -90781,26 +89702,26 @@ 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tailwindcss/forms-0.5.6" sources."@trivago/prettier-plugin-sort-imports-4.2.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/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/json5-0.0.29" sources."@types/node-20.5.9" - sources."@types/normalize-package-data-2.4.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/react-dom-18.2.14" - sources."@types/scheduler-0.16.5" - sources."@types/semver-7.5.4" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/react-dom-18.2.15" + sources."@types/scheduler-0.16.6" + sources."@types/semver-7.5.5" sources."@typescript-eslint/eslint-plugin-6.0.0" sources."@typescript-eslint/parser-6.0.0" sources."@typescript-eslint/scope-manager-6.0.0" @@ -90810,12 +89731,12 @@ 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.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.3.0" @@ -90850,7 +89771,7 @@ in sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chokidar-3.5.3" sources."ci-info-3.9.0" @@ -90898,7 +89819,7 @@ in sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es-abstract-1.22.3" @@ -90973,7 +89894,7 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -91072,16 +89993,7 @@ in ]; }) sources."levn-0.4.1" - sources."lightningcss-1.22.0" - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" + sources."lightningcss-1.22.1" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" @@ -91109,7 +90021,7 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" (sources."needle-3.2.0" // { @@ -91240,9 +90152,8 @@ in sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-3.1.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -91305,7 +90216,7 @@ in sources."which-typed-array-1.1.13" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; @@ -91368,7 +90279,7 @@ in ]; }) sources."ast-types-0.13.4" - sources."async-3.2.4" + sources."async-3.2.5" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.2" @@ -91507,7 +90418,7 @@ in sources."sprintf-js-1.1.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.15" + sources."systeminformation-5.21.16" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" sources."tv4-1.3.0" @@ -91590,7 +90501,7 @@ in sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."picocolors-1.0.0" sources."source-map-js-1.0.2" ]; @@ -91620,16 +90531,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-regex-5.0.1" @@ -91648,7 +90559,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs-extra-11.1.1" @@ -91673,7 +90584,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" @@ -91703,7 +90614,7 @@ in sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yn-3.1.1" @@ -91854,19 +90765,19 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."convert-source-map-2.0.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -91874,10 +90785,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.3.3" @@ -91898,7 +90809,7 @@ in sources."browserslist-4.22.1" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -91911,7 +90822,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -91940,7 +90851,7 @@ in sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" + sources."istanbul-lib-coverage-3.2.2" sources."istanbul-lib-hook-3.0.0" sources."istanbul-lib-instrument-4.0.3" sources."istanbul-lib-processinfo-2.0.3" @@ -92500,10 +91411,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; - sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; buildInputs = globalBuildInputs; meta = { @@ -92524,9 +91435,9 @@ in sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; }; dependencies = [ - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -92663,10 +91574,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.1.tgz"; - sha512 = "cgbEasV/Yh8QIRyCCiOHRtio6uxAwmOAhyr80vegX2P69/iwE1FX77EXJ9NAPvcODxoIyYrgvxAaPxR5TKcsFw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.2.tgz"; + sha512 = "G5dhsr/2wormdrYPtZBfRamvnPrHc/8TtYVH3EpIzfMyKSiTprFwn61nFZbcmeK4iKKdLq2MMiiMNqlRmkBU4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -92747,10 +91658,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.2.0.tgz"; - sha512 = "deaMa9Z+jPVeBD2dKXv+h7EbdKte9++V2potc/ADqvVgEr6DEJ3ia9u0joarjC2lX/ubaCRYz3QVx0TzuVqAJA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.3.0.tgz"; + sha512 = "scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg=="; }; buildInputs = globalBuildInputs; meta = { @@ -92771,14 +91682,14 @@ in sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - (sources."@eslint/eslintrc-2.1.2" // { + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" sources."strip-json-comments-3.1.1" ]; }) - sources."@eslint/js-8.52.0" + sources."@eslint/js-8.53.0" sources."@hpcc-js/wasm-2.14.1" (sources."@humanwhocodes/config-array-0.11.13" // { dependencies = [ @@ -92793,18 +91704,18 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" sources."@tsconfig/strictest-2.0.2" - sources."@types/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/node-16.11.68" - sources."@types/semver-7.5.4" + sources."@types/semver-7.5.5" sources."@types/vscode-1.75.1" - sources."@typescript-eslint/eslint-plugin-6.9.1" - sources."@typescript-eslint/parser-6.9.1" - sources."@typescript-eslint/scope-manager-6.9.1" - sources."@typescript-eslint/type-utils-6.9.1" - sources."@typescript-eslint/types-6.9.1" - sources."@typescript-eslint/typescript-estree-6.9.1" - sources."@typescript-eslint/utils-6.9.1" - sources."@typescript-eslint/visitor-keys-6.9.1" + sources."@typescript-eslint/eslint-plugin-6.10.0" + sources."@typescript-eslint/parser-6.10.0" + sources."@typescript-eslint/scope-manager-6.10.0" + sources."@typescript-eslint/type-utils-6.10.0" + sources."@typescript-eslint/types-6.10.0" + sources."@typescript-eslint/typescript-estree-6.10.0" + sources."@typescript-eslint/utils-6.10.0" + sources."@typescript-eslint/visitor-keys-6.10.0" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.3.6" (sources."@vscode/vsce-2.22.0" // { @@ -92874,11 +91785,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - (sources."d3-graphviz-5.1.0" // { - dependencies = [ - sources."@hpcc-js/wasm-2.13.1" - ]; - }) + sources."d3-graphviz-5.2.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -92912,7 +91819,7 @@ in sources."entities-4.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.52.0" // { + (sources."eslint-8.53.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."chalk-4.1.2" @@ -92933,7 +91840,7 @@ in sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -93356,19 +92263,19 @@ in sources."tslib-1.14.1" ]; }) - (sources."@aws-sdk/client-cloudformation-3.441.0" // { + (sources."@aws-sdk/client-cloudformation-3.445.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/client-sso-3.441.0" - sources."@aws-sdk/client-sts-3.441.0" - sources."@aws-sdk/core-3.441.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.441.0" - sources."@aws-sdk/credential-provider-node-3.441.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.441.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" sources."@aws-sdk/middleware-host-header-3.433.0" sources."@aws-sdk/middleware-logger-3.433.0" @@ -93460,12 +92367,12 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.200" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/ws-8.5.8" + sources."@types/lodash-4.14.201" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."abort-controller-3.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -93489,12 +92396,12 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asap-2.0.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.3" - (sources."aws-sdk-2.1486.0" // { + sources."aws-crt-1.19.0" + (sources."aws-sdk-2.1492.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93502,7 +92409,7 @@ in sources."uuid-8.0.0" ]; }) - sources."axios-0.24.0" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -93673,7 +92580,7 @@ in sources."ext-name-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-safe-stringify-2.1.1" sources."fast-xml-parser-4.2.5" sources."fastest-levenshtein-1.0.16" @@ -93867,6 +92774,7 @@ in sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-2.3.1" sources."qs-6.11.2" @@ -94274,7 +93182,7 @@ in sha512 = "fKmMA8q5OyeZpFCxBa3FuFywQcziQXKBw9B8jwDJ/Ra3H/pkZpQJl9g5s3MIjUo2jwUDHUnaxXgVXObXFdiJBw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."cli-table-0.3.11" sources."colors-1.0.3" sources."commander-11.1.0" @@ -94455,15 +93363,15 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/node-20.8.10" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.4" - sources."engine.io-6.5.3" + sources."engine.io-6.5.4" sources."engine.io-parser-5.2.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -94518,8 +93426,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."agent-base-4.3.0" sources."ansi-escapes-5.0.0" sources."ansi-regex-6.0.1" @@ -94718,15 +93626,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -94734,10 +93642,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -94751,18 +93659,18 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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/estree-1.0.4" - sources."@types/node-20.8.10" - sources."@types/pug-2.0.8" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" @@ -94782,7 +93690,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -94804,13 +93712,13 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-3.0.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -94875,7 +93783,7 @@ in sources."mkdirp-0.5.6" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -94959,7 +93867,7 @@ in sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -94983,15 +93891,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" sources."@babel/helper-string-parser-7.22.5" @@ -94999,10 +93907,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -95019,17 +93927,17 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" - sources."@types/pug-2.0.8" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -95052,7 +93960,7 @@ in sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -95072,14 +93980,14 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -95142,7 +94050,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -95240,7 +94148,7 @@ in sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -95256,10 +94164,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; dependencies = [ sources."@trysound/sax-0.2.0" @@ -95287,7 +94195,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = "https://svgo.dev"; license = "MIT"; }; production = true; @@ -95313,16 +94221,16 @@ in 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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -95345,7 +94253,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -95373,7 +94281,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -95415,7 +94323,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -95504,33 +94412,33 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.3.3.tgz"; - sha512 = "1LhJTNBFVNYtl4C6IJXt1XwAJANvquyDuP4NrhcG+1DwT3S7kiUR9vLo5yo046X83VT7ownzS97Q/yC6A7bZXg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.4.0.tgz"; + sha512 = "Op3Tt6J7yOJY8hbYkU6Pakw2tb37SlyS1F/KAVNSKHSeW9Kp/GF+9O6HDmdaM8dhGldy2vVBhxm9/nlXTU1p0w=="; }; 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.3.3" - sources."@textlint/ast-tester-13.3.3" - sources."@textlint/ast-traverse-13.3.3" - sources."@textlint/config-loader-13.3.3" - sources."@textlint/feature-flag-13.3.3" - sources."@textlint/fixer-formatter-13.3.3" - sources."@textlint/kernel-13.3.3" - sources."@textlint/linter-formatter-13.3.3" - sources."@textlint/markdown-to-ast-13.3.3" - sources."@textlint/module-interop-13.3.3" - sources."@textlint/source-code-fixer-13.3.3" - sources."@textlint/text-to-ast-13.3.3" - sources."@textlint/textlint-plugin-markdown-13.3.3" - sources."@textlint/textlint-plugin-text-13.3.3" - sources."@textlint/types-13.3.3" - sources."@textlint/utils-13.3.3" - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@textlint/ast-tester-13.4.0" + sources."@textlint/ast-traverse-13.4.0" + sources."@textlint/config-loader-13.4.0" + sources."@textlint/feature-flag-13.4.0" + sources."@textlint/fixer-formatter-13.4.0" + sources."@textlint/kernel-13.4.0" + sources."@textlint/linter-formatter-13.4.0" + sources."@textlint/markdown-to-ast-13.4.0" + sources."@textlint/module-interop-13.4.0" + sources."@textlint/source-code-fixer-13.4.0" + sources."@textlint/text-to-ast-13.4.0" + sources."@textlint/textlint-plugin-markdown-13.4.0" + sources."@textlint/textlint-plugin-text-13.4.0" + sources."@textlint/types-13.4.0" + sources."@textlint/utils-13.4.0" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -95639,7 +94547,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-to-glob-pattern-1.0.2" + sources."path-to-glob-pattern-2.0.1" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -95775,291 +94683,401 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-3.0.0.tgz"; - sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-4.0.0.tgz"; + sha512 = "WdDWGMuwqvj2HzFi7qZ/kyMFEH0wu7FlwXItZZBsH67azzmigMih3X8xxr3Gw5SBqQ4SZoqM/KJErqQ1jSCCBA=="; }; dependencies = [ sources."@babel/code-frame-7.22.13" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-13.3.3" - sources."@types/hast-2.3.7" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse5-5.0.3" - sources."@types/unist-2.0.9" - sources."alex-9.1.1" - sources."ansi-align-3.0.1" + sources."@isaacs/cliui-8.0.2" + sources."@npmcli/config-6.4.0" + (sources."@npmcli/map-workspaces-3.0.4" // { + dependencies = [ + sources."glob-10.3.10" + sources."minimatch-9.0.3" + ]; + }) + sources."@npmcli/name-from-folder-2.0.0" + sources."@pnpm/config.env-replace-1.1.0" + (sources."@pnpm/network.ca-file-1.0.2" // { + dependencies = [ + sources."graceful-fs-4.2.10" + ]; + }) + sources."@pnpm/npm-conf-2.2.2" + sources."@sindresorhus/is-5.6.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/acorn-4.0.6" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-jsx-5.3.2" + sources."alex-11.0.1" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."array-iterate-1.1.4" + sources."array-iterate-2.0.1" sources."arrify-1.0.1" - sources."bail-1.0.5" + sources."bail-2.0.2" sources."balanced-match-1.0.2" sources."boundary-2.0.0" - (sources."boxen-4.2.0" // { + (sources."boxen-7.1.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" + sources."chalk-5.3.0" + sources."type-fest-2.19.0" ]; }) - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.14" + sources."camelcase-7.0.1" + (sources."camelcase-keys-8.0.2" // { dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - sources."pump-3.0.0" + sources."type-fest-2.19.0" ]; }) - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."ccount-1.1.0" + sources."ccount-2.0.1" sources."chalk-2.4.2" - sources."character-entities-1.2.4" - sources."character-entities-html4-1.1.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" - sources."collapse-white-space-1.0.6" + sources."character-entities-2.0.2" + sources."character-entities-html4-2.1.0" + sources."character-entities-legacy-3.0.0" + sources."character-reference-invalid-2.0.1" + sources."ci-info-3.9.0" + sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."comma-separated-tokens-1.0.8" - sources."concat-map-0.0.1" + sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) - sources."configstore-5.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."configstore-6.0.0" sources."core-util-is-1.0.3" - sources."crypto-random-string-2.0.0" - sources."cuss-1.21.0" + sources."cross-spawn-7.0.3" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) + sources."cuss-2.2.0" sources."debug-4.3.4" - sources."decamelize-1.2.0" + sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decompress-response-3.3.0" + sources."decode-named-character-reference-1.0.2" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" + sources."defer-to-connect-2.0.1" + sources."dequal-2.0.3" + sources."diff-5.1.0" + sources."dot-prop-6.0.1" sources."duplexer-0.1.2" - sources."duplexer3-0.1.5" - sources."emoji-regex-8.0.0" + sources."eastasianwidth-0.2.0" + sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."escape-goat-2.1.1" + sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" - sources."fault-1.0.4" - sources."figgy-pudding-3.5.2" - sources."figures-3.2.0" - sources."find-up-4.1.0" + sources."fault-2.0.1" + sources."find-up-6.3.0" + sources."foreground-child-3.1.1" + sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - (sources."get-stream-4.1.0" // { - dependencies = [ - sources."pump-3.0.0" - ]; - }) + sources."get-stream-6.0.1" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.2.3" - (sources."global-dirs-2.1.0" // { + sources."glob-8.1.0" + (sources."global-dirs-3.0.1" // { dependencies = [ - sources."ini-1.3.7" + sources."ini-2.0.0" ]; }) - sources."got-9.6.0" + sources."got-12.6.1" sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" - sources."has-yarn-2.1.0" + sources."has-yarn-3.0.0" sources."hasown-2.0.0" - sources."hast-util-embedded-1.0.6" - sources."hast-util-from-parse5-6.0.1" - sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.5" - sources."hast-util-phrasing-1.0.5" - sources."hast-util-to-nlcst-1.2.8" - sources."hast-util-to-string-1.0.4" - sources."hast-util-whitespace-1.0.4" - sources."hastscript-6.0.0" - sources."hosted-git-info-2.8.9" + sources."hast-util-embedded-2.0.1" + sources."hast-util-from-parse5-7.1.2" + sources."hast-util-has-property-2.0.1" + sources."hast-util-is-body-ok-link-2.0.0" + sources."hast-util-is-element-2.1.3" + sources."hast-util-parse-selector-3.1.1" + sources."hast-util-phrasing-2.0.2" + sources."hast-util-to-nlcst-2.2.0" + sources."hast-util-to-string-2.0.0" + sources."hast-util-whitespace-2.0.1" + sources."hastscript-7.2.0" + sources."hosted-git-info-5.2.1" sources."http-cache-semantics-4.1.1" + (sources."http2-wrapper-2.2.0" // { + dependencies = [ + sources."quick-lru-5.1.1" + ]; + }) sources."ignore-5.2.4" - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" + sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" + sources."indent-string-5.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" - sources."is-alphanumerical-1.0.4" + sources."ini-4.1.1" + sources."is-alphabetical-2.0.1" + sources."is-alphanumerical-2.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-ci-2.0.0" + sources."is-ci-3.0.1" sources."is-core-module-2.13.1" - sources."is-decimal-1.0.4" + sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-hexadecimal-1.0.4" - sources."is-installed-globally-0.3.2" - sources."is-npm-4.0.0" + sources."is-hexadecimal-2.0.1" + sources."is-installed-globally-0.4.0" + sources."is-npm-6.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-typedarray-1.0.0" - sources."is-whitespace-character-1.0.4" - sources."is-word-character-1.0.4" - sources."is-yarn-global-0.3.0" + sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-3.1.0" + sources."keyv-4.5.4" sources."kind-of-6.0.3" - sources."latest-version-5.1.0" - (sources."libnpmconfig-1.2.1" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."kleur-4.1.5" + sources."latest-version-7.0.0" sources."limit-spawn-0.0.3" sources."lines-and-columns-1.2.4" - sources."load-plugin-3.0.0" - sources."locate-path-5.0.0" - sources."lodash.difference-4.5.0" - sources."lodash.intersection-4.4.0" - sources."longest-streak-2.0.4" - sources."lowercase-keys-1.0.1" - (sources."make-dir-3.1.0" // { + sources."load-plugin-5.1.0" + sources."locate-path-7.2.0" + sources."longest-streak-3.1.0" + sources."lowercase-keys-3.0.0" + sources."lru-cache-7.18.3" + sources."map-obj-4.3.0" + sources."map-stream-0.1.0" + sources."markdown-table-3.0.3" + sources."mdast-comment-marker-2.1.2" + (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ - sources."semver-6.3.1" + sources."escape-string-regexp-5.0.0" ]; }) - sources."map-obj-4.3.0" - sources."map-stream-0.1.0" - sources."markdown-escapes-1.0.4" - sources."markdown-table-2.0.0" - sources."mdast-comment-marker-1.1.2" - sources."mdast-util-compact-2.0.1" - sources."mdast-util-to-nlcst-4.0.1" - sources."meow-7.1.1" - sources."mimic-response-1.0.1" + sources."mdast-util-from-markdown-1.3.1" + sources."mdast-util-frontmatter-1.0.1" + sources."mdast-util-gfm-2.0.2" + sources."mdast-util-gfm-autolink-literal-1.0.3" + sources."mdast-util-gfm-footnote-1.0.2" + sources."mdast-util-gfm-strikethrough-1.0.3" + sources."mdast-util-gfm-table-1.0.7" + sources."mdast-util-gfm-task-list-item-1.0.2" + sources."mdast-util-mdx-2.0.1" + sources."mdast-util-mdx-expression-1.3.2" + sources."mdast-util-mdx-jsx-2.1.4" + sources."mdast-util-mdxjs-esm-1.3.1" + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-nlcst-5.2.1" + sources."mdast-util-to-string-3.2.0" + sources."meow-11.0.0" + sources."micromark-3.2.0" + sources."micromark-core-commonmark-1.1.0" + sources."micromark-extension-frontmatter-1.1.1" + sources."micromark-extension-gfm-2.0.3" + sources."micromark-extension-gfm-autolink-literal-1.0.5" + sources."micromark-extension-gfm-footnote-1.1.2" + sources."micromark-extension-gfm-strikethrough-1.0.7" + sources."micromark-extension-gfm-table-1.0.7" + sources."micromark-extension-gfm-tagfilter-1.0.2" + sources."micromark-extension-gfm-task-list-item-1.0.5" + sources."micromark-extension-mdx-expression-1.0.8" + sources."micromark-extension-mdx-jsx-1.0.5" + sources."micromark-extension-mdx-md-1.0.1" + sources."micromark-extension-mdxjs-1.0.1" + sources."micromark-extension-mdxjs-esm-1.0.5" + sources."micromark-factory-destination-1.1.0" + sources."micromark-factory-label-1.1.0" + sources."micromark-factory-mdx-expression-1.0.9" + sources."micromark-factory-space-1.1.0" + sources."micromark-factory-title-1.1.0" + sources."micromark-factory-whitespace-1.1.0" + sources."micromark-util-character-1.2.0" + sources."micromark-util-chunked-1.1.0" + sources."micromark-util-classify-character-1.1.0" + sources."micromark-util-combine-extensions-1.1.0" + sources."micromark-util-decode-numeric-character-reference-1.1.0" + sources."micromark-util-decode-string-1.1.0" + sources."micromark-util-encode-1.1.0" + sources."micromark-util-events-to-acorn-1.2.3" + sources."micromark-util-html-tag-name-1.2.0" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-resolve-all-1.1.0" + sources."micromark-util-sanitize-uri-1.2.0" + sources."micromark-util-subtokenize-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."micromark-util-types-1.1.0" + sources."mimic-response-4.0.0" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."minimist-options-4.1.0" + sources."minipass-7.0.4" + sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.2" - sources."nlcst-normalize-2.1.5" - sources."nlcst-search-2.0.0" - sources."nlcst-to-string-2.0.4" - sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.1" - sources."object-keys-1.1.1" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" + sources."nopt-7.2.0" + sources."normalize-package-data-4.0.1" + sources."normalize-url-8.0.0" + sources."npm-normalize-package-bin-3.0.1" + sources."object-keys-0.4.0" sources."once-1.4.0" - sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { + sources."p-cancelable-3.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."package-json-8.1.1" + (sources."parse-english-5.0.0" // { dependencies = [ - sources."semver-6.3.1" + sources."nlcst-to-string-2.0.4" ]; }) - sources."parse-english-4.2.0" - sources."parse-entities-2.0.0" + sources."parse-entities-4.0.1" sources."parse-json-5.2.0" - sources."parse-latin-4.3.0" + (sources."parse-latin-5.0.1" // { + dependencies = [ + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" + ]; + }) sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" + sources."path-exists-5.0.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."pause-stream-0.0.11" sources."pluralize-8.0.0" - sources."prepend-http-2.0.0" + sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-5.6.0" + sources."property-information-6.4.0" + sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."pupa-2.1.1" - sources."quick-lru-4.0.1" - sources."quotation-1.1.3" - sources."rc-1.2.8" - (sources."read-pkg-5.2.0" // { + sources."pupa-3.1.0" + sources."quick-lru-6.1.2" + sources."quotation-2.0.2" + (sources."rc-1.2.8" // { dependencies = [ - sources."type-fest-0.6.0" + sources."ini-1.3.8" ]; }) - (sources."read-pkg-up-7.0.1" // { + (sources."read-package-json-fast-3.0.2" // { dependencies = [ - sources."type-fest-0.8.1" + sources."json-parse-even-better-errors-3.0.0" + ]; + }) + (sources."read-pkg-7.1.0" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" + sources."type-fest-2.19.0" + ]; + }) + (sources."read-pkg-up-9.1.0" // { + dependencies = [ + sources."type-fest-2.19.0" ]; }) sources."readable-stream-1.0.34" - sources."redent-3.0.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."rehype-parse-7.0.1" - sources."rehype-retext-2.0.4" - sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.7" - sources."remark-message-control-6.0.0" - sources."remark-parse-8.0.3" - sources."remark-retext-4.0.0" - sources."remark-stringify-8.1.1" - sources."repeat-string-1.6.1" - sources."resolve-1.22.8" - sources."resolve-from-5.0.0" - sources."responselike-1.0.2" - sources."retext-english-3.0.4" - sources."retext-equality-5.5.0" - sources."retext-profanities-6.1.0" + sources."redent-4.0.0" + sources."registry-auth-token-5.0.2" + sources."registry-url-6.0.1" + sources."rehype-parse-8.0.5" + sources."rehype-retext-3.0.2" + sources."remark-frontmatter-4.0.1" + sources."remark-gfm-3.0.1" + sources."remark-mdx-2.0.0" + sources."remark-message-control-7.1.1" + sources."remark-parse-10.0.2" + sources."remark-retext-5.0.1" + sources."resolve-alpn-1.2.1" + sources."responselike-3.0.0" + sources."retext-english-4.1.0" + sources."retext-equality-6.6.0" + sources."retext-profanities-7.2.2" + sources."sade-1.8.1" sources."safe-buffer-5.2.1" - sources."semver-5.7.2" - (sources."semver-diff-3.1.1" // { + (sources."semver-7.5.4" // { dependencies = [ - sources."semver-6.3.1" + sources."lru-cache-6.0.0" ]; }) - sources."signal-exit-3.0.7" + sources."semver-diff-4.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" sources."sliced-1.0.1" - sources."space-separated-tokens-1.1.5" + sources."space-separated-tokens-2.0.2" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) sources."spdx-correct-3.2.0" @@ -96070,95 +95088,137 @@ in (sources."split-transform-stream-0.1.1" // { dependencies = [ sources."bubble-stream-error-0.0.1" - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) - sources."sprintf-js-1.0.3" - sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-4.2.3" + 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-0.10.31" - sources."stringify-entities-3.1.0" - sources."strip-ansi-6.0.1" - sources."strip-indent-3.0.0" + sources."stringify-entities-4.0.3" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."term-size-2.2.1" - sources."textlint-rule-helper-2.3.0" + (sources."textlint-rule-helper-2.3.0" // { + dependencies = [ + sources."unist-util-is-4.1.0" + sources."unist-util-visit-2.0.3" + sources."unist-util-visit-parents-3.1.1" + ]; + }) sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.0.6" + sources."xtend-4.0.2" ]; }) - sources."to-readable-stream-1.0.0" - sources."to-vfile-6.1.0" - sources."trim-0.0.1" - sources."trim-newlines-3.0.1" - sources."trim-trailing-lines-1.1.4" - sources."trough-1.0.5" - sources."type-fest-0.13.1" + sources."to-vfile-7.2.4" + sources."trim-newlines-4.1.1" + sources."trough-2.1.0" + sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unherit-1.1.3" - (sources."unified-9.2.2" // { + sources."undici-types-5.26.5" + sources."unherit-3.0.1" + (sources."unified-10.1.2" // { + dependencies = [ + sources."is-plain-obj-4.1.0" + ]; + }) + sources."unified-diff-4.0.1" + (sources."unified-engine-10.1.0" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-4.1.0" + sources."lines-and-columns-2.0.4" + sources."parse-json-6.0.2" ]; }) - sources."unified-diff-3.1.0" - (sources."unified-engine-8.2.0" // { + (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."unist-util-visit-3.1.0" + sources."unist-util-visit-parents-4.1.1" ]; }) - sources."unified-message-control-3.0.3" - sources."unique-string-2.0.0" - sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.1.0" - sources."unist-util-modify-children-2.0.0" - sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-2.0.1" - sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-2.0.3" + sources."unique-string-3.0.0" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.1" + (sources."unist-util-modify-children-2.0.0" // { + dependencies = [ + sources."array-iterate-1.1.4" + ]; + }) + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-3.1.1" - (sources."update-notifier-4.1.3" // { + sources."unist-util-visit-parents-5.1.3" + (sources."update-notifier-6.0.2" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."chalk-5.3.0" ]; }) - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.1" - sources."vfile-find-up-5.0.1" - sources."vfile-location-3.2.0" - sources."vfile-message-2.0.4" - (sources."vfile-reporter-6.0.2" // { + sources."vfile-5.3.7" + sources."vfile-find-up-6.1.0" + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" + (sources."vfile-reporter-7.0.5" // { dependencies = [ - sources."supports-color-6.1.0" + sources."supports-color-9.4.0" + ]; + }) + sources."vfile-sort-3.0.1" + sources."vfile-statistics-2.0.1" + sources."walk-up-path-3.0.1" + sources."web-namespaces-2.0.1" + sources."which-2.0.2" + sources."widest-line-4.0.1" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."vfile-sort-2.2.2" - sources."vfile-statistics-1.1.4" - sources."web-namespaces-1.1.4" - sources."widest-line-3.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xtend-4.0.2" - sources."yargs-parser-18.1.3" + (sources."write-file-atomic-3.0.3" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) + sources."xdg-basedir-5.1.0" + sources."xtend-2.1.2" + sources."yallist-4.0.0" + sources."yaml-2.3.4" + sources."yargs-parser-21.1.1" + sources."yocto-queue-1.0.0" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -96226,8 +95286,8 @@ in sha512 = "gZMxUU+/O8QIchBQoo50QryknmMKahb2vBj89wVvk+Dhvp70nAJKSkpt2vjZVYBWCxpIKysQlwheBjrFZWpkfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -96272,8 +95332,8 @@ in sha512 = "VMht14U0+gxRhEnT3/Rfv7yUDF3YGhsSSODwXGnnicwe54Czs2CYALAZIlWA79R4LLqcYFc9pP1i8DeGWvaHeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -96319,7 +95379,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."boundary-1.0.1" sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" @@ -96333,7 +95393,7 @@ in sources."structured-source-3.0.2" (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-13.3.3" + sources."@textlint/ast-node-types-13.4.0" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -96385,8 +95445,8 @@ in sha512 = "vP99cbTyapn+Hviom2doO3pJtjlhKlZvlHTf21zoB22CxJx2w3S7Ie169neB5U4Xsei+NodHf5tnwT933mO19A=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" @@ -96409,14 +95469,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.0.tgz"; - sha512 = "tbNpzDNLTVsqtDIMXEZNX2i1dvOqryME8Hknopq6Ze3TAjij5N0wBtG63frZLxJ9auE9fZse15sTi4Qe3arNZA=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.1.tgz"; + sha512 = "wKiVhc2B9HP2MFU4x7ZDx+oM5u43ETpKWTLHKvdhPRZ0+davi4M8mFmkZVovDIMO7igsGjixikcvFmnCMg3kmQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" @@ -96524,8 +95584,8 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."adverb-where-0.2.6" sources."boundary-2.0.0" sources."commander-2.20.3" @@ -96572,11 +95632,11 @@ in sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.3" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/cors-2.8.16" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -97663,10 +96723,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -98132,10 +97192,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -99065,16 +98125,16 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" 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.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."arg-4.1.3" @@ -99121,10 +98181,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.0.0.tgz"; - sha512 = "u6GLfWtHzOfGNpn0XuUYFg8Jv3oXWKzY6o5/Lt6LbWE6Ux965z2lP+vM0AN8Z2EobnlrDzzdcKusUx46j2eP3A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.1.0.tgz"; + sha512 = "VbEw1U0jKKQ7pIYRtfQzBl7BroRBWSuS8x483jY0n4sQc0A8P7PgeSb3OycRbaj1rkfsTXZhsxKmsRYmoXAbdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -99187,13 +98247,13 @@ in sources."@npmcli/config-6.4.0" sources."@npmcli/map-workspaces-3.0.4" sources."@npmcli/name-from-folder-2.0.0" - sources."@types/concat-stream-2.0.1" - sources."@types/debug-4.1.10" - sources."@types/is-empty-1.2.2" - sources."@types/ms-0.7.33" - sources."@types/node-20.8.10" - sources."@types/supports-color-8.1.2" - sources."@types/unist-3.0.1" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/is-empty-1.2.3" + sources."@types/ms-0.7.34" + sources."@types/node-20.9.0" + sources."@types/supports-color-8.1.3" + sources."@types/unist-3.0.2" sources."@ungap/structured-clone-1.2.0" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" @@ -99234,7 +98294,7 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."load-plugin-5.1.0" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" @@ -99280,7 +98340,13 @@ in sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."undici-types-5.26.5" - sources."unified-engine-11.1.0" + (sources."unified-engine-11.1.1" // { + dependencies = [ + sources."@npmcli/config-8.0.1" + sources."import-meta-resolve-4.0.0" + sources."load-plugin-6.0.1" + ]; + }) sources."unist-util-inspect-8.0.0" sources."unist-util-lsp-2.1.0" sources."unist-util-stringify-position-4.0.0" @@ -99313,7 +98379,7 @@ in ]; }) sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -99329,14 +98395,14 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.25.0.tgz"; - sha512 = "2rVTQY8ryM8/Z9WZ5AxOvYwBjSkfohuJ6j5nwLd9wxMetKlyaOuyts3ezIrScda4dThjPvokPJx9843E2mQ04g=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.26.0.tgz"; + sha512 = "UsRZ91+0YKAHtp9mryqgiVbGdBpb5F20HhYXHNAJfDw/uCsYbbLixLGzgTqWIRBYXgr890XMbL4HLbQPqnZC9w=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.4" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -99443,7 +98509,7 @@ in }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -99452,30 +98518,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -99500,13 +98562,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.1.tgz"; - sha512 = "3iXmzdAVZCGHrvdh6hIM8OY55auXA1EIDzFLaYdq27e99Dr+WXTEa00ilqQUPdrpS0sE1ZqK4Ikhgg5x8SOtLw=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.2.tgz"; + sha512 = "lC+yx7bD8EyBu4CHNr7kLfPZ8+uU01xJZyOxNB1XSMdW0oNTKewLrA5be3W6mHgNDl60i4uZ5l463jfFGQ290A=="; }; dependencies = [ - sources."@types/estree-1.0.4" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -99555,7 +98617,7 @@ in }) sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -99564,30 +98626,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -99609,18 +98667,20 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "32.5.0"; + version = "32.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-32.5.0.tgz"; - sha512 = "Bx4v3yxEpyKhkyhmQNQyfbUHxC+C3Yug99Q14EZAvGMZiijggungC3ZFxpXWO0tCcmLJgknOWxsYE7+ctPi0zw=="; + url = "https://registry.npmjs.org/vercel/-/vercel-32.5.3.tgz"; + sha512 = "fK5n0qSmckJlzPgZ7yD3Q1+L13o2FeN9hsZbJcr/kIglA0zRj7OoSEK30LWlxJ44T/Uw0MOgVpK8vkAl+Aqpdw=="; }; 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/primitives-3.1.1" - sources."@edge-runtime/vm-3.1.1" + sources."@edge-runtime/ponyfill-2.4.1" + sources."@edge-runtime/primitives-4.0.5" + sources."@edge-runtime/vm-3.1.7" + sources."@fastify/busboy-2.0.0" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" @@ -99647,11 +98707,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.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -99662,13 +98722,13 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/node-14.18.33" - sources."@vercel/build-utils-7.2.2" - sources."@vercel/error-utils-2.0.1" + sources."@vercel/build-utils-7.2.3" + 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.8" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.9" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" @@ -99677,9 +98737,9 @@ in }) sources."@vercel/go-3.0.3" sources."@vercel/hydrogen-1.0.1" - sources."@vercel/next-4.0.11" + sources."@vercel/next-4.0.14" sources."@vercel/nft-0.24.2" - (sources."@vercel/node-3.0.7" // { + (sources."@vercel/node-3.0.9" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" @@ -99692,7 +98752,7 @@ in sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.0.10" + sources."@vercel/remix-builder-2.0.11" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -99701,7 +98761,7 @@ in ]; }) sources."@vercel/ruby-2.0.2" - sources."@vercel/static-build-2.0.9" + sources."@vercel/static-build-2.0.10" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" sources."acorn-8.11.2" @@ -99722,7 +98782,6 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-crc32-0.2.13" - sources."busboy-1.6.0" sources."bytes-3.1.0" sources."chokidar-3.3.1" sources."chownr-1.1.4" @@ -99739,7 +98798,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.2" sources."diff-4.0.2" - (sources."edge-runtime-2.5.1" // { + (sources."edge-runtime-2.5.7" // { dependencies = [ sources."async-listen-3.0.1" sources."signal-exit-4.0.2" @@ -99779,7 +98838,7 @@ in sources."execa-3.2.0" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -99861,7 +98920,6 @@ in sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" sources."promisepipe-3.0.0" sources."pump-3.0.0" @@ -99892,7 +98950,6 @@ in sources."once-1.3.3" ]; }) - sources."streamsearch-1.1.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -99913,7 +98970,7 @@ in sources."tslib-2.6.2" sources."typescript-4.9.5" sources."uid-promise-1.0.0" - sources."undici-5.23.0" + sources."undici-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -99997,8 +99054,8 @@ in }) sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.52.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.1" @@ -100032,7 +99089,7 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.52.0" + sources."eslint-8.53.0" sources."eslint-plugin-vue-9.18.1" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" @@ -100497,11 +99554,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100525,10 +99582,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -100599,11 +99656,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100630,13 +99687,13 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" 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.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."envinfo-7.11.0" sources."es-module-lexer-1.3.1" @@ -100744,29 +99801,29 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@types/body-parser-1.19.4" - sources."@types/bonjour-3.5.12" - sources."@types/connect-3.4.37" - sources."@types/connect-history-api-fallback-1.5.2" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/express-4.17.20" - sources."@types/express-serve-static-core-4.17.39" - sources."@types/http-errors-2.0.3" - sources."@types/http-proxy-1.17.13" - sources."@types/json-schema-7.0.14" - sources."@types/mime-1.3.4" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + 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.41" + 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.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" sources."@types/retry-0.12.0" - sources."@types/send-0.17.3" - sources."@types/serve-index-1.9.3" - sources."@types/serve-static-1.15.4" - sources."@types/sockjs-0.3.35" - sources."@types/ws-8.5.8" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100809,7 +99866,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.0.0" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -100838,7 +99895,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" @@ -101089,11 +100146,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -101119,11 +100176,11 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -101136,7 +100193,7 @@ in sources."estraverse-4.3.0" sources."events-3.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -101237,7 +100294,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -101628,10 +100685,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.7.tgz"; - sha512 = "JkAPKk8hk7IcOF2EYu5N/TsueSb0GOP+R1uXAw5gZaJkfJlLuhbGFf4vHWvdrmjbUDm3swwXAJY2e9v4ZETwjw=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.9.tgz"; + sha512 = "RQj9MouC+o746pXW7p9IvYg2iehYQsd1xxi42BCR5MvSEPf7TQNmmAuxDsB1pthkL40e+bXktitXUtRFeKg/9g=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -101702,8 +100759,8 @@ in sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" sources."@fastify/busboy-2.0.0" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."anymatch-3.1.3" @@ -101736,7 +100793,7 @@ in sources."miniflare-3.20231025.0" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" @@ -101756,13 +100813,13 @@ in sources."stoppable-1.1.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."undici-5.27.0" + sources."undici-5.27.2" sources."undici-types-5.26.5" sources."utf-8-validate-6.0.3" sources."workerd-1.20231025.0" sources."ws-8.14.2" sources."xxhash-wasm-1.0.2" - sources."youch-3.3.2" + sources."youch-3.3.3" sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index c9e25045426cc..7cf63e5c0b115 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -106,6 +106,6 @@ buildDunePackage { homepage = "https://github.com/RedPRL/cooltt"; description = "A cool implementation of normalization by evaluation (nbe) & elaboration for Cartesian cubical type theory"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix index 60ecb885d8069..8e475a7987ccf 100644 --- a/pkgs/development/ocaml-modules/cry/default.nix +++ b/pkgs/development/ocaml-modules/cry/default.nix @@ -2,19 +2,21 @@ buildDunePackage rec { pname = "cry"; - version = "0.6.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ="; + sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ="; }; postPatch = '' substituteInPlace src/dune --replace bytes "" ''; + minimalOCamlVersion = "4.12"; + meta = with lib; { homepage = "https://github.com/savonet/ocaml-cry"; description = "OCaml client for the various icecast & shoutcast source protocols"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 594053491300e..e8bb6128db62f 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.7"; - - duneVersion = "3"; + version = "1.1.8"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4="; + sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index f3364cb548a60..10e837dcd62c2 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; propagatedBuildInputs = [ ffmpeg-avutil diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 73b8ed0f6aecd..b902f72bc1ec0 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 1ff5a89ee307f..bce592a8a2c83 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index b2537bd25be3e..3d27ab803153c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -17,7 +17,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 32342860d13ea..524bc600093ef 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -13,7 +13,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index a271b984d14cb..6cd71ebd58eb5 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -9,7 +9,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index fb6fbda58d20c..a6012a44171d8 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a085795831b96..773b10ee168c7 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index d79416b7053ae..c30236e0e2c1e 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; + sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix index e3bf2fb5d6418..db03f7b079399 100644 --- a/pkgs/development/ocaml-modules/getopt/default.nix +++ b/pkgs/development/ocaml-modules/getopt/default.nix @@ -1,28 +1,22 @@ -{ lib, fetchzip, stdenv, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-getopt"; - version = "20120615"; +buildDunePackage rec { + pname = "getopt"; + version = "20230213"; - src = fetchzip { - url = "https://download.ocamlcore.org/ocaml-getopt/ocaml-getopt/${version}/ocaml-getopt-${version}.tar.gz"; - sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; - }; - - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; + minimalOCamlVersion = "4.07"; - strictDeps = true; + src = fetchFromGitHub { + owner = "scemama"; + repo = "ocaml-getopt"; + rev = version; + hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8="; + }; doCheck = true; - createFindlibDestdir = true; meta = { - inherit (ocaml.meta) platforms; - homepage = "https://github.com/gildor478/ocaml-getopt"; + homepage = "https://github.com/scemama/ocaml-getopt"; description = "Parsing of command line arguments (similar to GNU GetOpt) for OCaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix new file mode 100644 index 0000000000000..789825175e409 --- /dev/null +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "metadata"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-metadata"; + rev = "v${version}"; + sha256 = "sha256-sSekkyJ8D6mCCmxIyd+pBk/khaehA3BcpUQl2Gln+Ic="; + }; + + minimalOCamlVersion = "4.14"; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-metadata"; + description = "Library to read metadata from files in various formats. "; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 7a7e83d3c6568..b55faf222cffe 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -29,7 +29,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.5.6"; + version = "1.5.8"; minimalOCamlVersion = "4.10"; @@ -38,8 +38,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged - hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54="; + rev = "v${version}"; + hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix new file mode 100644 index 0000000000000..e03ac2c209eda --- /dev/null +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -0,0 +1,37 @@ +{ lib +, bigstringaf +, buildDunePackage +, fetchurl +, iomux +, ptime +, uri +}: + +buildDunePackage rec { + pname = "riot"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q="; + }; + + propagatedBuildInputs = [ + bigstringaf + iomux + ptime + uri + ]; + + doCheck = true; + + meta = { + description = "An actor-model multi-core scheduler for OCaml 5"; + homepage = "https://github.com/leostera/riot"; + changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 416438dafbd38..99b6fb245a264 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "yaml"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz"; - hash = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc="; + hash = "sha256-xQ0qyii5+WZ5K3HhYDNR5dJO2k39PkRT+9UDZqOggic="; }; minimalOCamlVersion = "4.13"; - duneVersion = "3"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes ]; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index aa8566ea60875..e0cc9fac177d7 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,14 +1,17 @@ -{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }: +{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +, junit_alcotest +}: buildDunePackage rec { pname = "yaml-sexp"; inherit (yaml) version src; - duneVersion = "3"; - propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ]; + doCheck = true; + checkInputs = [ junit_alcotest ]; + meta = yaml.meta // { description = "ocaml-yaml with sexp support"; }; diff --git a/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch b/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch new file mode 100644 index 0000000000000..54bc7f8dd3b9f --- /dev/null +++ b/pkgs/development/perl-modules/CSSDOM-replace-apostrophe.patch @@ -0,0 +1,1412 @@ +commit 7dda09313a63c4c64563f582844d7b04302d94bd +Author: Yves Orton <demerphq@gmail.com> +Date: Wed Feb 22 13:28:01 2023 +0100 + + Replace apostrophe with :: as package separator + + In 5.37.9 this is deprecated, and in 5.40 it will be forbidden + +diff --git a/lib/CSS/DOM/Parser.pm b/lib/CSS/DOM/Parser.pm +index 473992c..d688f19 100644 +--- a/lib/CSS/DOM/Parser.pm ++++ b/lib/CSS/DOM/Parser.pm +@@ -369,7 +369,7 @@ sub _parse_at_rule { for (shift) { for my $tokens (shift) { + + $selector =~ s/s\z// and pop @selector; + +- require CSS'DOM'Rule; ++ require CSS::DOM::Rule; + (my $rule = new CSS::DOM::Rule $_[0]||()) + ->_set_tokens( + $selector,\@selector +@@ -413,7 +413,7 @@ sub _parse_at_rule { for (shift) { for my $tokens (shift) { + my ($types,@tokens) = ("\@$1",$at,splice @$tokens,0,$+[0]); + $types =~ /"/ and return; # ignore rules w/invalid strings + $types =~ s/s\z// and pop @tokens; +- require CSS'DOM'Rule; ++ require CSS::DOM::Rule; + (my $rule = new CSS::DOM::Rule $_[0]||()) + ->_set_tokens( + $types, \@tokens +diff --git a/lib/CSS/DOM/PropertyParser.pm b/lib/CSS/DOM/PropertyParser.pm +index 258158f..76b0d99 100644 +--- a/lib/CSS/DOM/PropertyParser.pm ++++ b/lib/CSS/DOM/PropertyParser.pm +@@ -6,8 +6,8 @@ use warnings; no warnings qw 'utf8 parenthesis'; + use strict; + + use constant 1.03 (); # multiple +-use CSS::DOM'Constants ':primitive', ':value'; +-use CSS'DOM'Util<unescape unescape_str unescape_url>; ++use CSS::DOM::Constants ':primitive', ':value'; ++use CSS::DOM::Util<unescape unescape_str unescape_url>; + + use constant old_perl => $] < 5.01; + { no strict 'refs'; delete ${__PACKAGE__.'::'}{old_perl} } +@@ -19,7 +19,7 @@ use constant old_perl => $] < 5.01; + use constant naughty_perl => 0+$] eq 5.01; + { no strict 'refs'; delete ${__PACKAGE__.'::'}{naughty_perl} } + +-*s2c = *CSS'DOM'Constants'SuffixToConst; ++*s2c = *CSS::DOM::Constants::SuffixToConst; + our %s2c; + + our %compiled; # compiled formats +@@ -60,7 +60,7 @@ sub clone { + # exists &dclone or require Storable, "Storable"->import('dclone'); + # return dclone($_[0]); + require Clone; +- return Clone'clone($_[0]); ++ return Clone::clone($_[0]); + } + + # Declare the variables that the re-evals use. Some nasty hacker went and +@@ -202,7 +202,7 @@ sub _make_arg_list { + my($stypes,$stokens) = _space_out($types, $tokens); + my $css = join "", @$stokens; + if(@_ == 1) { # list property +- my $list = shift @'_; ++ my $list = shift @_; + my $sep = @$list <= 1 ? '' : do { + my $range_start = $$list[0][4]; + my $range_end = $$list[1][4] - length($$list[1][4]) - 1; +@@ -301,7 +301,7 @@ sub _make_arg_list { + + sub _space_out { + my($types,$tokens) = @_; +-Carp'cluck() if ref $tokens ne 'ARRAY'; ++Carp::cluck() if ref $tokens ne 'ARRAY'; + $tokens = [@$tokens]; + my @posses; + $types =~ s/(?<=[^(f])(?![),]|\z)/ +@@ -328,7 +328,7 @@ sub _prep_val { + } + else { + require CSS::DOM::Parser; +- ($types, $tokens) = CSS::DOM::Parser'tokenise($_[0]); ++ ($types, $tokens) = CSS::DOM::Parser::tokenise($_[0]); + } + + # strip out all whitespace tokens +diff --git a/lib/CSS/DOM/Rule.pm b/lib/CSS/DOM/Rule.pm +index 921efb0..666fb08 100644 +--- a/lib/CSS/DOM/Rule.pm ++++ b/lib/CSS/DOM/Rule.pm +@@ -46,7 +46,7 @@ sub _parse { # This method parses the code passed to it and checks to see + # the rule data from the new rule. + my $self = shift; + require CSS::DOM::Parser; +- my $new_rule = CSS::DOM::Parser'parse_statement(shift) ++ my $new_rule = CSS::DOM::Parser::parse_statement(shift) + || die CSS::DOM::Exception->new(SYNTAX_ERR, $@); + + ref $new_rule eq ref $self or die CSS::DOM::Exception->new( +diff --git a/lib/CSS/DOM/Rule/Import.pm b/lib/CSS/DOM/Rule/Import.pm +index 1afdcdc..75c8505 100644 +--- a/lib/CSS/DOM/Rule/Import.pm ++++ b/lib/CSS/DOM/Rule/Import.pm +@@ -45,7 +45,7 @@ sub cssText { + sub href { + my $self =shift; + $self->[hrfe] ||= do { +- require CSS'DOM'Parser; ++ require CSS::DOM::Parser; + if($self->[urlt][00] eq 'u') { + # ~~~ I probably ought to put things like this in a + # Parser::token_val function. +@@ -53,10 +53,10 @@ sub href { + $url =~ s/^url\([ \t\r\n\f]*//; + $url =~ s/[ \t\r\n\f]*\)\z//; + $url =~ s/^['"]// and chop $url; +- CSS'DOM'Parser'unescape($url); ++ CSS::DOM::Parser::unescape($url); + } + else { +- CSS'DOM'Parser'unescape( ++ CSS::DOM::Parser::unescape( + substr $$self[urlt][1], 1, -1 + ) + } +diff --git a/lib/CSS/DOM/Rule/Style.pm b/lib/CSS/DOM/Rule/Style.pm +index dfa7501..54da057 100644 +--- a/lib/CSS/DOM/Rule/Style.pm ++++ b/lib/CSS/DOM/Rule/Style.pm +@@ -93,8 +93,8 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + + # tokenise if necessary + unless(ref $self->[selc]) { +- require CSS'DOM'Parser; +- $self->[selc] = [ CSS'DOM'tokenise($self->[selc]) ]; ++ require CSS::DOM::Parser; ++ $self->[selc] = [ CSS::DOM::tokenise($self->[selc]) ]; + } + + # parse selector tokens if necessary +@@ -130,7 +130,7 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + + # ids: + if($types =~ s/^#//) { +- push @subsel, '#', CSS'DOM'Util'unescape( substr shift @tokens, 1 ), ++ push @subsel, '#', CSS::DOM::Util::unescape( substr shift @tokens, 1 ), + undef; + } + +@@ -138,12 +138,12 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ /^di/ && $tokens[0] eq '.') { + $types =~ s/^..//; shift @tokens; + push @subsel, '~', 'class', +- CSS'DOM'Util'unescape( shift @tokens ); ++ CSS::DOM::Util::unescape( shift @tokens ); + } + + # pseudo-elems and classes + elsif($types =~ s/^(::?)i//) { +- push @subsel, $1,lc CSS'DOM'Util'unescape($tokens[length $1]), undef; ++ push @subsel, $1,lc CSS::DOM::Util::unescape($tokens[length $1]), undef; + splice @tokens, 0, $+[0]; + } + +@@ -151,14 +151,14 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ s/^:fi\)//) { + push @subsel, + ':', +- lc CSS'DOM'Util'unescape(substr $tokens[1], 0, -1), +- lc CSS'DOM'Util'unescape($tokens[2]); ++ lc CSS::DOM::Util::unescape(substr $tokens[1], 0, -1), ++ lc CSS::DOM::Util::unescape($tokens[2]); + splice @tokens, 0, 4; + } + + # [attr] + elsif($types =~ s/^\[i]//) { +- push @subsel, '=', lc CSS'DOM'Util'unescape($tokens[1]), undef; ++ push @subsel, '=', lc CSS::DOM::Util::unescape($tokens[1]), undef; + splice @tokens, 0, 3; + } + +@@ -166,16 +166,16 @@ sub _selector_matches { # ~~~ Does this work with initial space in the selector? + elsif($types =~ /^\[id']/ && $tokens[2] eq '=') { + $types =~ s/^.{5}//; + push @subsel, '=', +- lc CSS'DOM'Util'unescape($tokens[1]), +- CSS'DOM'Util'unescape_str($tokens[3]); ++ lc CSS::DOM::Util::unescape($tokens[1]), ++ CSS::DOM::Util::unescape_str($tokens[3]); + splice @tokens, 0, 5; + } + + # [attr~='value'], [attr|='value'] + elsif($types =~ s/^\[i[~|]']//) { + push @subsel, $tokens[2], +- lc CSS'DOM'Util'unescape($tokens[1]), +- CSS'DOM'Util'unescape_str($tokens[3]); ++ lc CSS::DOM::Util::unescape($tokens[1]), ++ CSS::DOM::Util::unescape_str($tokens[3]); + splice @tokens, 0, 5; + } + +diff --git a/lib/CSS/DOM/Style.pm b/lib/CSS/DOM/Style.pm +index 47d1291..b42b8db 100644 +--- a/lib/CSS/DOM/Style.pm ++++ b/lib/CSS/DOM/Style.pm +@@ -171,9 +171,9 @@ sub setProperty { + # short-circuit for the common case + length $value or $self->removeProperty($name),return; + +- require CSS'DOM'Parser; +- my @tokens = eval { CSS'DOM'Parser'tokenise_value($value); } +- or die CSS::DOM'Exception->new( SYNTAX_ERR, $@); ++ require CSS::DOM::Parser; ++ my @tokens = eval { CSS::DOM::Parser::tokenise_value($value); } ++ or die CSS::DOM::Exception->new( SYNTAX_ERR, $@); + + # check for whitespace/comment assignment + $tokens[0] =~ /^s+\z/ and $self->removeProperty($name),return; +diff --git a/lib/CSS/DOM/Value.pm b/lib/CSS/DOM/Value.pm +index 45f89e9..83b04e7 100644 +--- a/lib/CSS/DOM/Value.pm ++++ b/lib/CSS/DOM/Value.pm +@@ -7,9 +7,9 @@ use strict; + + use Carp; + use CSS::DOM::Constants; +-use CSS'DOM'Exception 'NO_MODIFICATION_ALLOWED_ERR'; ++use CSS::DOM::Exception 'NO_MODIFICATION_ALLOWED_ERR'; + use Exporter 5.57 'import'; +-use Scalar'Util < weaken reftype >; ++use Scalar::Util < weaken reftype >; + + use constant 1.03 our $_const = { + type => 0, +@@ -46,11 +46,11 @@ sub cssText { + ? $self->[valu] : 'inherit' + if defined wantarray; + if(@_) { +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->[ownr]; +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "CSS::DOM::Value objects that do not know to which " + ."property they belong cannot be modified" +diff --git a/lib/CSS/DOM/Value/List.pm b/lib/CSS/DOM/Value/List.pm +index 85f5ef5..e681fa2 100644 +--- a/lib/CSS/DOM/Value/List.pm ++++ b/lib/CSS/DOM/Value/List.pm +@@ -2,8 +2,8 @@ package CSS::DOM::Value::List; + + $VERSION = '0.17'; + +-use CSS'DOM'Constants <CSS_VALUE_LIST NO_MODIFICATION_ALLOWED_ERR>; +-use Scalar'Util 'weaken'; ++use CSS::DOM::Constants <CSS_VALUE_LIST NO_MODIFICATION_ALLOWED_ERR>; ++use Scalar::Util 'weaken'; + + # Object of this class are hashes, with the following keys: + # c: CSS code +@@ -14,7 +14,7 @@ use Scalar'Util 'weaken'; + + sub DOES { + return 1 if $_[1] eq 'CSS::DOM::Value'; +- goto &UNIVERSAL'DOES if defined &UNIVERSAL'DOES; ++ goto &UNIVERSAL::DOES if defined &UNIVERSAL::DOES; + } + + use overload +@@ -37,14 +37,14 @@ sub cssText { + if(defined wantarray) {{ + if(!defined $$self{c} || grep ref ne 'ARRAY', @{$$self{v}}) { + @{$$self{v}} or $old = 'none', last; +- require CSS'DOM'Value'Primitive; ++ require CSS::DOM::Value::Primitive; + my @args; my $index = 0; + for(@{$$self{v}}) { + next unless ref eq 'ARRAY'; + @args or @args = ( + (owner => property => @$self{<o p>})[0,2,1,3], index => $index + ); +- $_ = new CSS'DOM'Value'Primitive @$_, @args; ++ $_ = new CSS::DOM::Value::Primitive @$_, @args; + } + no warnings 'uninitialized'; + $old = join length $$self{s} ? $$self{s} : ' ', +@@ -53,11 +53,11 @@ sub cssText { + else { $old = $$self{c} } + }} + if(@_) { # assignment +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->{o}; +- die new CSS'DOM'Exception ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "CSS::DOM::Value objects that do not know to which " + ."property they belong cannot be modified" +@@ -67,8 +67,8 @@ sub cssText { + my @arsg + = $owner->property_parser->match($prop, $_[0]) + ) { +- require CSS'DOM'Value; +- CSS'DOM'Value::_apply_args_to_self($self,$owner,$prop,@arsg); ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self($self,$owner,$prop,@arsg); + } + + if(my $mh = $owner->modification_handler) { +@@ -89,8 +89,8 @@ sub item { + defined or return; + ref eq 'ARRAY' or return exit die return $_; + +- require CSS'DOM'Value'Primitive; +- return $_ = new CSS'DOM'Value'Primitive ++ require CSS::DOM::Value::Primitive; ++ return $_ = new CSS::DOM::Value::Primitive + @$_, + (owner => property => @$self{<o p>})[0,2,1,3], + index => $index; +diff --git a/lib/CSS/DOM/Value/Primitive.pm b/lib/CSS/DOM/Value/Primitive.pm +index 2ce0e9d..2046ff4 100644 +--- a/lib/CSS/DOM/Value/Primitive.pm ++++ b/lib/CSS/DOM/Value/Primitive.pm +@@ -17,7 +17,7 @@ use Exporter 5.57 'import'; + + sub DOES { + return 1 if $_[1] eq 'CSS::DOM::Value'; +- goto &UNIVERSAL'DOES if defined &UNIVERSAL'DOES; ++ goto &UNIVERSAL::DOES if defined &UNIVERSAL::DOES; + } + + use constant 1.03 our $_const = { # Don’t conflict with the superclass! +@@ -203,8 +203,8 @@ sub cssText { + }} + } + if(@_) { +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + "Unowned value objects cannot be modified" + unless my $owner = $self->[ownr]; +@@ -213,15 +213,15 @@ sub cssText { + # deal with formats + if(my $format = $$self[form]) { + if(!our $parser) { +- require CSS'DOM'PropertyParser; ++ require CSS::DOM::PropertyParser; + add_property{ +- $parser = new CSS'DOM'PropertyParser ++ $parser = new CSS::DOM::PropertyParser + } _=>our $prop_spec = {}; + } + our $prop_spec->{format} = $format; + if(my @args = match { our $parser } _=> shift) { +- require CSS'DOM'Value; +- CSS'DOM'Value'_apply_args_to_self( ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self( + $self, $owner, $prop, + @args, format => $format, + ); +@@ -231,8 +231,8 @@ sub cssText { + # This is never reached, at least not when CSS::DOM’s mod- + # ules call the constructor: + elsif(!defined $prop) { +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception + NO_MODIFICATION_ALLOWED_ERR, + ref($self) . " objects that do not know to which " + ."property they belong cannot be modified" +@@ -263,8 +263,8 @@ sub cssText { + $index+1..$length-1 + ), + ); +- require CSS'DOM'Value; +- CSS'DOM'Value'_load_if_necessary($arsg[1]); ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_load_if_necessary($arsg[1]); + my $list = $arsg[1]->new( + owner => $owner, + property => $prop, +@@ -284,8 +284,8 @@ sub cssText { + my @arsg + = $owner->property_parser->match($prop, $_[0]) + ) { +- require CSS'DOM'Value; +- CSS'DOM'Value'_apply_args_to_self( ++ require CSS::DOM::Value; ++ CSS::DOM::Value::_apply_args_to_self( + $self, $owner, $prop, @arsg + ); + } +@@ -341,10 +341,10 @@ sub cssValueType { CSS::DOM::Value::CSS_PRIMITIVE_VALUE } + sub primitiveType { shift->[type] } + + sub setFloatValue { +- my ($self,$type,$val) = @'_; ++ my ($self,$type,$val) = @_; + +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Invalid value type" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Invalid value type" + if $type == CSS_UNKNOWN || $type == CSS_COUNTER + || $type == CSS_RECT || $type == CSS_RGBCOLOR || $type == CSS_DIMENSION; + +@@ -352,8 +352,8 @@ sub setFloatValue { + # using this API. + no warnings 'numeric'; + $self->cssText(my $css = _serialise($type, $val)); +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Invalid value: $css" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Invalid value: $css" + if $self->cssText ne $css; + _: + } +@@ -364,8 +364,8 @@ sub getFloatValue { + # There are more types that are numbers than are not, so we + # invert our list. + my $type = $self->[type]; +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Not a numeric value" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Not a numeric value" + if $type == CSS_UNKNOWN || $type == CSS_STRING || $type == CSS_URI + || $type == CSS_IDENT || $type == CSS_ATTR || $type == CSS_COUNTER + || $type == CSS_RECT || $type == CSS_RGBCOLOR; +@@ -380,8 +380,8 @@ sub getStringValue { + my $self = shift; + + my $type = $self->[type]; +- require CSS'DOM'Exception, +- die new CSS'DOM'Exception INVALID_ACCESS_ERR, "Not a string value" ++ require CSS::DOM::Exception, ++ die new CSS::DOM::Exception INVALID_ACCESS_ERR, "Not a string value" + unless $type == CSS_STRING || $type == CSS_URI + || $type == CSS_IDENT || $type == CSS_ATTR; + +diff --git a/t/CSS2Properties.t b/t/CSS2Properties.t +index 315321b..13fc438 100644 +--- a/t/CSS2Properties.t ++++ b/t/CSS2Properties.t +@@ -3,8 +3,8 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; +-sub tests'import { $tests += pop if @_ > 1 }; ++sub tests::VERSION { $tests += pop }; ++sub tests::import { $tests += pop if @_ > 1 }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSCharsetRule.t b/t/CSSCharsetRule.t +index 92a8e74..fc3dba5 100644 +--- a/t/CSSCharsetRule.t ++++ b/t/CSSCharsetRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -13,7 +13,7 @@ use_ok 'CSS::DOM::Rule::Charset',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@charset "utf-8";' + ) + )-> cssRules->[0]; +diff --git a/t/CSSFontFaceRule.t b/t/CSSFontFaceRule.t +index 9f4879e..abd5b6c 100644 +--- a/t/CSSFontFaceRule.t ++++ b/t/CSSFontFaceRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -13,7 +13,7 @@ use_ok 'CSS::DOM::Rule::FontFace',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@font-face { font-family: "foo";src:url(bar) }' + ) + )-> cssRules->[0]; +diff --git a/t/CSSImportRule.t b/t/CSSImportRule.t +index 6ec65ef..c8a6a51 100644 +--- a/t/CSSImportRule.t ++++ b/t/CSSImportRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -15,7 +15,7 @@ use_ok 'CSS::DOM::Rule::Import'; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@import "foo.css" tv, screen' + ) + )-> cssRules->[0]; +@@ -95,7 +95,7 @@ use tests 5; # styleSheet + 'foo.css' => '@import "bar.css"', + 'bar.css' => 'a { color: blue }', + ); +- is CSS'DOM'parse('@import "foo.css',url_fetcher=>sub{$urls{$_[0]}}) ++ is CSS::DOM::parse('@import "foo.css',url_fetcher=>sub{$urls{$_[0]}}) + ->cssRules->[0]->styleSheet + ->cssRules->[0]->styleSheet + ->cssRules->[0]->style->color, +diff --git a/t/CSSMediaRule.t b/t/CSSMediaRule.t +index fffa7fb..9d01698 100644 +--- a/t/CSSMediaRule.t ++++ b/t/CSSMediaRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -15,7 +15,7 @@ use_ok 'CSS::DOM::Rule::Media'; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( ++ my $ss = CSS::DOM::parse( + '@media print { body { background: none } }' + ) + )-> cssRules->[0]; +@@ -133,4 +133,4 @@ use tests 4; # deleteRule + cmp_ok $@, '==', CSS::DOM::Exception::INDEX_SIZE_ERR, + 'error raised by deleteRule'; + +-} +\ No newline at end of file ++} +diff --git a/t/CSSPageRule.t b/t/CSSPageRule.t +index 108923e..764e1a1 100644 +--- a/t/CSSPageRule.t ++++ b/t/CSSPageRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -14,7 +14,7 @@ use_ok 'CSS::DOM::Rule::Page',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse( '@page:first{ margin-top: 3in }') ++ my $ss = CSS::DOM::parse( '@page:first{ margin-top: 3in }') + )-> cssRules->[0]; + + use tests 1; # isa +diff --git a/t/CSSPrimitiveValue.t b/t/CSSPrimitiveValue.t +index 5b30046..ad378f7 100644 +--- a/t/CSSPrimitiveValue.t ++++ b/t/CSSPrimitiveValue.t +@@ -4,8 +4,8 @@ use strict; use warnings; + no warnings<utf8 parenthesis regexp once qw bareword syntax>; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; +-sub tests'import { $tests += pop if @_ > 1 }; ++sub tests::VERSION { $tests += pop }; ++sub tests::import { $tests += pop if @_ > 1 }; + use Test::More; + plan tests => $tests; + +@@ -441,9 +441,9 @@ for(CSS::DOM::Value::Primitive->new( + # ------------------------------------------ + # Tests for setFloatValue and setStringValue + +-use CSS'DOM'Style; ++use CSS::DOM::Style; + require CSS::DOM::PropertyParser; +-my $s = new CSS'DOM'Style ++my $s = new CSS::DOM::Style + property_parser => $CSS::DOM::PropertyParser::Default; + + for my $meth ('setFloatValue' ,'setStringValue'){ +diff --git a/t/CSSRule.t b/t/CSSRule.t +index b33007c..582eb04 100644 +--- a/t/CSSRule.t ++++ b/t/CSSRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -24,7 +24,7 @@ use tests 7; # constants + + + require CSS::DOM; +-my $ss = CSS::DOM'parse( 'a{text-decoration: none} p { margin: 0 }'); ++my $ss = CSS::DOM::parse( 'a{text-decoration: none} p { margin: 0 }'); + my $rule = cssRules $ss ->[0]; + + use tests 1; # isa +diff --git a/t/CSSRuleList.t b/t/CSSRuleList.t +index bc2bfaf..5cee6f6 100644 +--- a/t/CSSRuleList.t ++++ b/t/CSSRuleList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSStyleDeclaration-setProperty.t b/t/CSSStyleDeclaration-setProperty.t +index cceb993..d0615b7 100644 +--- a/t/CSSStyleDeclaration-setProperty.t ++++ b/t/CSSStyleDeclaration-setProperty.t +@@ -7,7 +7,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSStyleDeclaration.t b/t/CSSStyleDeclaration.t +index 57bfe98..7bcc370 100644 +--- a/t/CSSStyleDeclaration.t ++++ b/t/CSSStyleDeclaration.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis regexp once qw'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -26,7 +26,7 @@ use tests 3; # first make sure we can use it without loading CSS::DOM + + + require CSS::DOM; +-my $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 }'); ++my $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 }'); + my $rule = cssRules $ss ->[0]; + my $decl = $rule->style; + +@@ -105,7 +105,7 @@ like $decl->cssText, qr/color: blue !very\\ important/, + + use tests 4; # length + { +- my $decl = new CSS'DOM'Style; ++ my $decl = new CSS::DOM::Style; + is eval { $decl->length }, 0, # This used to die [RT #54810] + 'length when no properties have been added'; # (fixed in 0.09). + $decl = CSS::DOM::Style::parse( +diff --git a/t/CSSStyleRule.t b/t/CSSStyleRule.t +index 024012b..fb550da 100644 +--- a/t/CSSStyleRule.t ++++ b/t/CSSStyleRule.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -14,7 +14,7 @@ use_ok 'CSS::DOM::Rule::Style',; + + require CSS::DOM; + my $rule = ( +- my $ss = CSS::DOM'parse('a{text-decoration: none} p { margin: 0 }') ++ my $ss = CSS::DOM::parse('a{text-decoration: none} p { margin: 0 }') + )-> cssRules->[0]; + + use tests 1; # isa +diff --git a/t/CSSStyleSheet-insertRule.t b/t/CSSStyleSheet-insertRule.t +index 3302966..94b3ee7 100644 +--- a/t/CSSStyleSheet-insertRule.t ++++ b/t/CSSStyleSheet-insertRule.t +@@ -7,7 +7,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -19,4 +19,3 @@ ok eval{$ss->insertRule('a{ color: red }',0);1}, + 'insertRule on empty style sheet doesn\'t die'; + # At one point during development, it did die because it was call- + # ing methods on CSS::DOM::RuleParser which hadn’t been loaded. +- +diff --git a/t/CSSStyleSheet.t b/t/CSSStyleSheet.t +index ab82e6a..40b3edf 100644 +--- a/t/CSSStyleSheet.t ++++ b/t/CSSStyleSheet.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -30,7 +30,7 @@ use tests 3; # (_set_)ownerRule + + use tests 2; # cssRules + { +- $ss = CSS::DOM'parse( 'a{text-decoration: none} p { margin: 0 }'); ++ $ss = CSS::DOM::parse( 'a{text-decoration: none} p { margin: 0 }'); + is +()=$ss->cssRules, 2, 'cssRules in list context'; + isa_ok my $rules = cssRules $ss, 'CSS::DOM::RuleList', + 'cssRules in scalar context'; +@@ -38,7 +38,7 @@ use tests 2; # cssRules + + use tests 11; # insertRule + { +- $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 }'); ++ $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 }'); + + is $ss->insertRule('b { font-weight: bold }', 0), 0, + 'retval of insertRule'; +@@ -70,7 +70,7 @@ use tests 11; # insertRule + + use tests 4; # deleteRule + { +- $ss = CSS::DOM'parse ('a{text-decoration: none} p { margin: 0 } ++ $ss = CSS::DOM::parse ('a{text-decoration: none} p { margin: 0 } + i {}'); + is +()=$ss->deleteRule(1), 0, 'retval of deleteRule'; + is_deeply [map $_->selectorText, $ss->cssRules], [qw/ a i /], +@@ -82,4 +82,4 @@ use tests 4; # deleteRule + cmp_ok $@, '==', CSS::DOM::Exception::INDEX_SIZE_ERR, + 'error raised by deleteRule'; + +-} +\ No newline at end of file ++} +diff --git a/t/CSSValue-prim-cssText.t b/t/CSSValue-prim-cssText.t +index 09f657b..b19836a 100644 +--- a/t/CSSValue-prim-cssText.t ++++ b/t/CSSValue-prim-cssText.t +@@ -6,7 +6,7 @@ + use strict; use warnings; no warnings qw 'qw regexp once utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/CSSValue.t b/t/CSSValue.t +index 5fad855..f5a04d0 100644 +--- a/t/CSSValue.t ++++ b/t/CSSValue.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'qw regexp once utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -38,7 +38,7 @@ isa_ok +CSS::DOM::Value->new(type => &CSS_CUSTOM, value => "top left"), + + require CSS::DOM::Style; + require CSS::DOM::PropertyParser; +-my $s = new CSS'DOM'Style ++my $s = new CSS::DOM::Style + property_parser => my $spec = $CSS::DOM::PropertyParser::Default; + + # The default parser has no properties with a simple string, attr or +diff --git a/t/CSSValueList.t b/t/CSSValueList.t +index 1805209..25c1bec 100644 +--- a/t/CSSValueList.t ++++ b/t/CSSValueList.t +@@ -3,17 +3,17 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +-use CSS'DOM'Constants ':primitive'; +-use CSS'DOM'Value'List; ++use CSS::DOM::Constants ':primitive'; ++use CSS::DOM::Value::List; + + use tests 1; # DOES +-ok +CSS'DOM'Value'List->DOES('CSS::DOM::Value'), 'DOES'; ++ok +CSS::DOM::Value::List->DOES('CSS::DOM::Value'), 'DOES'; + +-my $v = new CSS'DOM'Value'List values => [ ++my $v = new CSS::DOM::Value::List values => [ + [ type => CSS_STRING, value => 'sphed' ], + [ type => CSS_STRING, value => 'flit' ], + ]; +diff --git a/t/MediaList.t b/t/MediaList.t +index 3092c62..0888d61 100644 +--- a/t/MediaList.t ++++ b/t/MediaList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/RGBColor.t b/t/RGBColor.t +index 3758529..12d2938 100644 +--- a/t/RGBColor.t ++++ b/t/RGBColor.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/Rect.t b/t/Rect.t +index e7f83a4..ea8f046 100644 +--- a/t/Rect.t ++++ b/t/Rect.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -25,4 +25,4 @@ use tests 4; + is $v->left->cssText, '4cm', 'left'; + } + +-# ~~~ test for modifications of the cssText property +\ No newline at end of file ++# ~~~ test for modifications of the cssText property +diff --git a/t/StyleSheet.t b/t/StyleSheet.t +index a4469fb..e84e7d4 100644 +--- a/t/StyleSheet.t ++++ b/t/StyleSheet.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -55,7 +55,7 @@ use tests 1; # (set_)href + + use tests 1; # title + { +- sub foo'attr { return shift->{+shift} } ++ sub foo::attr { return shift->{+shift} } + $ss->set_ownerNode(my $foo = bless {title => 'tilde'}, 'foo'); + is $ss->title, 'tilde', 'title'; + } +diff --git a/t/StyleSheetList.t b/t/StyleSheetList.t +index 8e8c7cf..745f894 100644 +--- a/t/StyleSheetList.t ++++ b/t/StyleSheetList.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/charset.t b/t/charset.t +index eed053e..1666157 100644 +--- a/t/charset.t ++++ b/t/charset.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom-interface.t b/t/css-dom-interface.t +index 41bca29..76e5f2f 100644 +--- a/t/css-dom-interface.t ++++ b/t/css-dom-interface.t +@@ -6,7 +6,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom-style.t b/t/css-dom-style.t +index f852f6f..9a6582f 100644 +--- a/t/css-dom-style.t ++++ b/t/css-dom-style.t +@@ -6,13 +6,13 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + + use tests 4; # modification_handler + require CSS::DOM::Style; +-my $style = CSS::DOM::Style'parse('margin-top: 2px'); ++my $style = CSS::DOM::Style::parse('margin-top: 2px'); + $style->modification_handler(sub { ++$}; ${{} .= shift}); + $style->cssText('margin-bottom: 600%'); + is $}, 1, 'cssText triggers mod hander'; +@@ -25,4 +25,3 @@ is $}, 3, 'AUTOLOAD triggers the handler'; + # ~~~ We also needs tests for modification_handler triggered by: + # • removeProperty + # • modifications to CSSValue objects and their sub-objects (RGBColor etc +- +diff --git a/t/css-dom-util.t b/t/css-dom-util.t +index 5dbef09..554cd1b 100644 +--- a/t/css-dom-util.t ++++ b/t/css-dom-util.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +diff --git a/t/css-dom.t b/t/css-dom.t +index e36a046..d43d458 100644 +--- a/t/css-dom.t ++++ b/t/css-dom.t +@@ -3,7 +3,7 @@ + use strict; use warnings; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -28,7 +28,7 @@ use tests 1; # compute_style + local $SIG{__WARN__} = sub { $w .= shift }; + require CSS::DOM::Style; + my $elem = bless{ +- style => CSS'DOM'Style'parse('color:red'), tagName => 'p', ++ style => CSS::DOM::Style::parse('color:red'), tagName => 'p', + }, MyElem=>; + CSS::DOM::compute_style(element => $elem); + is $w, undef, 'no warnings for style belonging to element itself'; +diff --git a/t/parser-rules.t b/t/parser-rules.t +index 16cb536..7387caf 100644 +--- a/t/parser-rules.t ++++ b/t/parser-rules.t +@@ -8,7 +8,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -35,7 +35,7 @@ use tests 2; # miscellaneous CSS::DOM::parse stuff + + use tests 7; # <!-- --> + { +- my $sheet = CSS'DOM'parse ' ++ my $sheet = CSS::DOM::parse ' + <!-- /* --> /* /**/ + @at-rule {/*<!--*/ } <!-- + --> +@@ -46,9 +46,9 @@ use tests 7; # <!-- --> + '@at-rule {/*<!--*/ }' . "\n" . + "{ style: rule }\n", + '<!-- -->'; +- CSS'DOM'parse 'a { --> }'; ++ CSS::DOM::parse 'a { --> }'; + ok $@, 'invalid -->'; +- CSS'DOM'parse 'a { <!-- }'; ++ CSS::DOM::parse 'a { <!-- }'; + ok $@, 'invalid <!--'; + ok !eval{$sheet->insertRule('--> a { }');1}, + 'invalid --> before statement'; +@@ -62,7 +62,7 @@ use tests 7; # <!-- --> + + use tests 5; # single statement parser + { +- my $sheet = new CSS'DOM; ++ my $sheet = new CSS::DOM; + $sheet->insertRule('phoo { bar : baz} ',0); + isa_ok cssRules$sheet->[0], 'CSS::DOM::Rule::Style', + 'ruleset created by insertRule'; +@@ -79,36 +79,36 @@ use tests 5; # single statement parser + + use tests 9; # styledecl parser + { +- my $style = CSS'DOM'Style'parse ' foo : bar '; ++ my $style = CSS::DOM::Style::parse ' foo : bar '; + is $style->cssText, 'foo: bar', 'style parser'; +- CSS'DOM'Style'parse 'foo: bar}'; ++ CSS::DOM::Style::parse 'foo: bar}'; + ok $@, 'style parser chokes on }'; +- is CSS'DOM'Style'parse ' ; ;;;;;foo : bar ;;;; ; ',->cssText, ++ is CSS::DOM::Style::parse ' ; ;;;;;foo : bar ;;;; ; ',->cssText, + 'foo: bar', 'style wit extra semicolons'; +- is CSS'DOM'Style'parse 'foo:bar',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar',->cssText, + 'foo: bar', 'style with no space'; +- is CSS'DOM'Style'parse 'foo:bar;;;baz:bonk;;',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar;;;baz:bonk;;',->cssText, + 'foo: bar; baz: bonk', + 'style with no space & extra semicolons'; +- is CSS'DOM'Style'parse 'foo:bar;;;!baz:bonk;;',->cssText, ++ is CSS::DOM::Style::parse 'foo:bar;;;!baz:bonk;;',->cssText, + 'foo: bar', + 'style with delimiter+ident for property name'; +- is CSS'DOM'Style'parse '\70\41 dding:0;;;;;',->cssText, ++ is CSS::DOM::Style::parse '\70\41 dding:0;;;;;',->cssText, + 'padding: 0', + 'style with escaped property name'; + +- is CSS'DOM'Style'parse '\a\z\A\Z\)\a a :bar', ++ is CSS::DOM::Style::parse '\a\z\A\Z\)\a a :bar', + ->getPropertyValue("\nz\nZ)\na"), 'bar', + 'style with both kinds of ident escapes'; + + { package Phoo; use overload '""'=>sub{'foo:bar'}} +- is CSS'DOM'Style'parse(bless [], 'Phoo')->cssText, 'foo: bar', ++ is CSS::DOM::Style::parse(bless [], 'Phoo')->cssText, 'foo: bar', + '::Style::parse\'s force stringification'; + } + + use tests 121; # @media + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@media print{a{color:blue}}',0); + isa_ok $rule=pop@{$sheet->cssRules}, 'CSS::DOM::Rule::Media', +@@ -464,7 +464,7 @@ use tests 121; # @media + is $rule->cssText, "\@meDIa { }\n", + 'serialised empty unclosed fake @meDIa rule w/ws'; + +- $sheet = CSS'DOM'parse ' ++ $sheet = CSS::DOM::parse ' + @media print { a { color: blue } "stuff"} + td { padding: 0 } + '; +@@ -496,7 +496,7 @@ use tests 121; # @media + + use tests 1; # bracket closure + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@unknown {(rect([',0); + is +($rule=pop@{$sheet->cssRules})->cssText, +@@ -506,7 +506,7 @@ use tests 1; # bracket closure + + use tests 14; # @page + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@page{color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, PAGE_RULE, +@@ -553,7 +553,7 @@ use tests 14; # @page + + use tests 6; # unrecognised at-rules + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@unknown \ / \ / :-P {...}',0); + is +($rule=pop@{$sheet->cssRules})->type, UNKNOWN_RULE, +@@ -579,7 +579,7 @@ use tests 6; # unrecognised at-rules + + use tests 6; # ruselet pasrer + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('a{text-decoration:none;color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, STYLE_RULE, +@@ -605,7 +605,7 @@ use tests 6; # ruselet pasrer + + use tests 1; # invaldi strings + { +- my $sheet = CSS'DOM'parse q* ++ my $sheet = CSS::DOM::parse q* + p { + color: green; + font-family: 'Courier New Times +@@ -634,51 +634,51 @@ use tests 1; # invaldi strings + + use tests 10; # invalid closing brackets + { +- is CSS'DOM'parse q" @eotetet ]" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet ]" =>-> cssRules->length,0, + 'invalid closing bracket in unknown rule'; + ok $@, '$@ is set by invalid closing bracket in unknown rule'; +- is CSS'DOM'parse q" @media { ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" @media { ]" =>-> cssRules->length, 0, + 'invalid closing bracket in media rule'; + ok $@, '$@ is set by invalid closing bracket in media rule'; +- is CSS'DOM'parse q" @page { ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" @page { ]" =>-> cssRules->length, 0, + 'invalid closing bracket in page rule'; + ok $@, '$@ is set by invalid closing bracket in page rule'; +- is CSS'DOM'parse q" page ( ]" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" page ( ]" =>-> cssRules->length, 0, + 'invalid closing bracket in selector'; + ok $@, '$@ is set by invalid closing bracket in selector'; +- is CSS'DOM'parse q" a { (}" =>-> cssRules->length, 0, ++ is CSS::DOM::parse q" a { (}" =>-> cssRules->length, 0, + 'invalid closing bracket in style declaration'; + ok $@, '$@ is set by invalid closing bracket in selector'; + } + + use tests 14; # invalid [\@;] + { +- is CSS'DOM'parse q" @eotetet @aa ]" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet @aa ]" =>-> cssRules->length,0, + 'invalid @ in unknown rule'; + ok $@, '$@ is set by invalid @ in unknown rule'; +- is CSS'DOM'parse q" @eotetet aa (;" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @eotetet aa (;" =>-> cssRules->length,0, + 'invalid ; in unknown rule'; + ok $@, '$@ is set by invalid ; in unknown rule'; +- is CSS'DOM'parse q" @media {(; { " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @media {(; { " =>-> cssRules->length,0, + 'invalid ; in media rule'; + ok $@, '$@ is set by invalid ; in media rule'; +- is CSS'DOM'parse q" @page { (;fooo" =>-> cssRules->length,0, ++ is CSS::DOM::parse q" @page { (;fooo" =>-> cssRules->length,0, + 'invalid ; in page rule'; + ok $@, '$@ is set by invalid ; in page rule'; +- is CSS'DOM'parse q" page @oo " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" page @oo " =>-> cssRules->length,0, + 'invalid @ in selector'; + ok $@, '$@ is set by invalid @ in selector'; +- is CSS'DOM'parse q" page ;( " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" page ;( " =>-> cssRules->length,0, + 'invalid ; in selector'; + ok $@, '$@ is set by invalid ; in selector'; +- is CSS'DOM'parse q" a { ( ;( " =>-> cssRules->length,0, ++ is CSS::DOM::parse q" a { ( ;( " =>-> cssRules->length,0, + 'invalid ; in style declaration'; + ok $@, '$@ is set by invalid ; in style declaration'; + } + + use tests 14; # @import + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@import"foo.css"print,screen;',0); + is +($rule=pop@{$sheet->cssRules})->type, IMPORT_RULE, +@@ -722,7 +722,7 @@ use tests 14; # @import + + use tests 8; # @font-face + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@font-face{color:blue}',0); + is +($rule=pop@{$sheet->cssRules})->type, FONT_FACE_RULE, +@@ -751,7 +751,7 @@ use tests 8; # @font-face + + use tests 13; # @charset + { +- my $sheet = new CSS'DOM; my $rule; ++ my $sheet = new CSS::DOM; my $rule; + + $sheet->insertRule('@charset "utf-8";',0); + is +($rule=pop@{$sheet->cssRules})->type, CHARSET_RULE, +@@ -799,4 +799,3 @@ use tests 13; # @charset + is +($rule=pop@{$sheet->cssRules})->type, UNKNOWN_RULE, + '@charset w/space b4 ; is an unknown rule'; + } +- +diff --git a/t/parser-tokens.t b/t/parser-tokens.t +index 9c0fae3..d6a42b7 100644 +--- a/t/parser-tokens.t ++++ b/t/parser-tokens.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -37,7 +37,7 @@ for('_', 'a'..'z', 'A'.."Z", map(chr,0x80..0x100) ,"\x{2003}","\x{3000}"){ + { + my $style = CSS::DOM::Style::parse("--a: 65"); + is $style->cssText, '', 'identifier can\'t begin with --'; +- $style = CSS'DOM'Style'parse"-0b:-0b"; ++ $style = CSS::DOM::Style::parse"-0b:-0b"; + is $style->cssText, '', 'nor with -0'; + } + +@@ -49,7 +49,7 @@ use tests 8; # strings + . q/\'\"/; + my $expect = + qq/ \x{10ffff}f-_abcABC}}}}}}}}\xff\x{2003}\x{100}\t'"/; +- my $rule = new CSS::DOM::Rule'Import; ++ my $rule = new CSS::DOM::Rule::Import; + + $rule->cssText('@import ' . "'$nasty_escaped_string'"); + is $rule->href, $expect, "'...'"; +@@ -80,7 +80,7 @@ use tests 8; # strings + + use tests 23; # urls + { +- my $rule = new CSS'DOM'Rule::Import; ++ my $rule = new CSS::DOM::Rule::Import; + + $rule->cssText('@import url(!$#%&][\\\}|{*~foo/bar.gif)'); + is $rule->href, '!$#%&][\}|{*~foo/bar.gif', 'unquoted url'; +@@ -118,7 +118,7 @@ use tests 23; # urls + is $rule->href, "\x{2000}\x{2000}\n 0 )\tz", + 'double-quoted url with escapes'; + +- my $style = new CSS'DOM'Style; ++ my $style = new CSS::DOM::Style; + + $style->name('url(foo'); + is $style->name, 'url(foo)', 'unquoted, unterminated url'; +@@ -179,7 +179,7 @@ use tests 3; # spaces and comments + "name:valu /*eeeee " + ); + is $style->name, 'valu', 'another ws /**/ test'; +- $style = CSS'DOM'Style'parse( "name: /*\n*/valu"); ++ $style = CSS::DOM::Style::parse( "name: /*\n*/valu"); + is $style->name, 'valu', 'multiline comments'; + } + +@@ -187,27 +187,27 @@ use tests 3; # spaces and comments + + use tests 6; # <!-- --> + { +- my $sheet = CSS'DOM'parse ' <!--{ name: value }--> @media print{}'; ++ my $sheet = CSS::DOM::parse ' <!--{ name: value }--> @media print{}'; + is join('',map cssText$_,cssRules$sheet), + "{ name: value }\n\@media print {\n}\n", + 'ignored <!-- -->'; +- is CSS'DOM'parse"{}{name: <!-- value; n:v}" =>-> ++ is CSS::DOM::parse"{}{name: <!-- value; n:v}" =>-> + cssRules->length, + 1, + 'invalid <!--'; + ok $@, '$@ after invalid <!--'; +- is CSS'DOM'parse"{}{name: --> value; n:v}" =>-> ++ is CSS::DOM::parse"{}{name: --> value; n:v}" =>-> + cssRules->length, + 1, + 'invalid -->'; + ok $@, '$@ after invalid -->'; +- is CSS'DOM'Style'parse"name:'<!--value-->",->name, ++ is CSS::DOM::Style::parse"name:'<!--value-->",->name, + "'<!--value-->'", '<!-- --> in a string'; + } + + use tests 1; # miscellaneous tokens + { +- my $sheet = CSS'DOM'parse '@foo ()[~=:,./+-]{[("\"'; ++ my $sheet = CSS::DOM::parse '@foo ()[~=:,./+-]{[("\"'; + is $sheet->cssRules->[0]->cssText, + '@foo ()[~=:,./+-]{[("\"")]}'. "\n", + 'miscellaneous tokens' +diff --git a/t/property-parser.t b/t/property-parser.t +index 6423b39..f785054 100644 +--- a/t/property-parser.t ++++ b/t/property-parser.t +@@ -3,7 +3,7 @@ + use strict; use warnings; no warnings qw 'utf8 parenthesis regexp once qw'; + our $tests; + BEGIN { ++$INC{'tests.pm'} } +-sub tests'VERSION { $tests += pop }; ++sub tests::VERSION { $tests += pop }; + use Test::More; + plan tests => $tests; + +@@ -18,11 +18,11 @@ isa_ok my $parser = CSS::DOM::PropertyParser->new, + + use tests 4; # clone + my $clone = (my $css21 = $CSS::DOM::PropertyParser::CSS21)->clone; +-isn't $clone, $css21, 'clone at the first level'; +-isn't $clone->get_property('background-position'), ++isnt $clone, $css21, 'clone at the first level'; ++isnt $clone->get_property('background-position'), + $css21->get_property('background-position'), + 'clone clones individual property specs'; +-isn't ++isnt + $clone->get_property('border-color')->{properties} + {'border-top-color'}, + $css21->get_property('border-color')->{properties} +@@ -1314,17 +1314,17 @@ use tests 2; # parsing colours + { # Tests for problems with colours in cygwin’s perl (broken in 0.08; fixed + # in 0.09) and for bugs temporarily introduced while those problems were + # being addressed. +- my $p = new CSS'DOM'PropertyParser; ++ my $p = new CSS::DOM::PropertyParser; + $p->add_property( + 'colours' => { + format => '<colour>+', + }, + ); +- my $s = CSS'DOM'Style'parse( ++ my $s = CSS::DOM::Style::parse( + "colours: rgb(0,0,0) rgb(1,1,1)", + property_parser => $p + ); +- use CSS'DOM'Constants 'CSS_CUSTOM'; ++ use CSS::DOM::Constants 'CSS_CUSTOM'; + is $s->getPropertyCSSValue('colours')->cssValueType, CSS_CUSTOM, + 'quantified <colour>s'; + $p->add_property( +@@ -1346,18 +1346,18 @@ use tests 1; # backtracking with list properties + # local ${$whatever}[0] localises one element. But it actually + # replaces the array temporarily with a new one, which cannot + # work with references. +- my $p = new CSS'DOM'PropertyParser; ++ my $p = new CSS::DOM::PropertyParser; + $p->add_property( + 'foo' => { + format => '[(foo)|(foo),]+', # [(foo),?]+ does not trigger the bug + list => 1, + }, + ); +- my $s = CSS'DOM'Style'parse( ++ my $s = CSS::DOM::Style::parse( + "foo: foo, foo", + property_parser => $p + ); +- use CSS'DOM'Constants 'CSS_VALUE_LIST'; ++ use CSS::DOM::Constants 'CSS_VALUE_LIST'; + is_deeply [map cssText $_, @{$s->getPropertyCSSValue('foo')}],[('foo')x2], + 'backtracking does not preserve existing captures'; + } diff --git a/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch new file mode 100644 index 0000000000000..1ac68ee19d01c --- /dev/null +++ b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch @@ -0,0 +1,86 @@ +diff -ur a/gdk.typemap b/gdk.typemap +--- a/gdk.typemap 2017-05-21 15:02:54.000000000 -0400 ++++ b/gdk.typemap 2023-11-03 13:17:43.717890172 -0400 +@@ -23,6 +23,7 @@ + TYPEMAP + + # can be either a pointer or an integer, this handles both cases ++uintptr_t T_UV + GdkNativeWindow T_UV + + # GdkBitmap doesn't get its own type id, but needs to be treated separately. +diff -ur a/xs/GdkDnd.xs b/xs/GdkDnd.xs +--- a/xs/GdkDnd.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkDnd.xs 2023-11-03 13:23:22.478329089 -0400 +@@ -142,12 +142,12 @@ + void + gdk_drag_get_protocol_for_display (class, display, xid) + GdkDisplay *display +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol_for_display (display, xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol_for_display (display, INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (ret + ? newSVGdkDragProtocol (protocol) +@@ -184,12 +184,12 @@ + =cut + void + gdk_drag_get_protocol (class, xid) +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol (xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol (INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (newSVGdkDragProtocol (protocol))); + +diff -ur a/xs/GdkSelection.xs b/xs/GdkSelection.xs +--- a/xs/GdkSelection.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkSelection.xs 2023-11-03 13:26:58.976888906 -0400 +@@ -147,7 +147,7 @@ + ## void gdk_selection_send_notify (guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time_) + void + gdk_selection_send_notify (class, requestor, selection, target, property, time_) +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +@@ -161,7 +161,7 @@ + void + gdk_selection_send_notify_for_display (class, display, requestor, selection, target, property, time_) + GdkDisplay *display +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +diff -ur a/xs/GtkWindow.xs b/xs/GtkWindow.xs +--- a/xs/GtkWindow.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GtkWindow.xs 2023-11-03 13:32:53.673168678 -0400 +@@ -581,13 +581,13 @@ + void + gtk_window_remove_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ## void gtk_window_add_embedded_xid (GtkWindow *window, guint xid) + void + gtk_window_add_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ##void gtk_window_reshow_with_initial_size (GtkWindow *window) + void diff --git a/pkgs/development/perl-modules/Hailo-fix-test-gld.patch b/pkgs/development/perl-modules/Hailo-fix-test-gld.patch new file mode 100644 index 0000000000000..24e45ac0c1ff1 --- /dev/null +++ b/pkgs/development/perl-modules/Hailo-fix-test-gld.patch @@ -0,0 +1,28 @@ +commit ce474dbca0c95c06a85a3a329fcdbcc97b8ad317 +Author: Stig Palmquist <git@stig.io> +Date: 2023-11-21 13:27:46 +0100 + + Fix t/shell.t compat with Getopt-Long-Descriptive 0.106 + +diff --git a/t/command/shell.t b/t/command/shell.t +index ebd67d8..a09afd2 100644 +--- a/t/command/shell.t ++++ b/t/command/shell.t +@@ -28,7 +28,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" ); + cmp_ok($return, '==', 1, 'Exit status is correct'); + like($stderr, qr/^$/s, 'no stderr'); + like($stdout, qr{usage: hailo}, 'Got usage header'); +- like($stdout, qr{progress\s+Display progress}, 'Got --progress'); ++ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress'); + like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note'); + unlike($stdout, qr{examples:}, "no examples on normal output"); + } +@@ -75,7 +75,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" ); + like($stderr, qr/^$/s, 'no stderr'); + like($stdout, qr/Unknown option: blah-blah-blah/, 'Unknown option'); + like($stdout, qr{usage: hailo}, 'Got usage header'); +- like($stdout, qr{progress\s+Display progress}, 'Got --progress'); ++ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress'); + like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note'); + unlike($stdout, qr{examples:}, "no examples on error"); + diff --git a/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch new file mode 100644 index 0000000000000..65c6d238bdb32 --- /dev/null +++ b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index eaf47e0..32766d7 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -146,7 +146,7 @@ extern "C" + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $f (); +-char (*f) (); ++char f; + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus diff --git a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch new file mode 100644 index 0000000000000..6ca6e83094621 --- /dev/null +++ b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch @@ -0,0 +1,143 @@ +From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Sat, 13 Mar 2021 17:46:57 +0000 +Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106 + +GLD is now outputting text with wrapping depending on the terminal +width. This update is enough to get the tests to pass when running +within "expect", which provides a PTY. It's almost certainly not +enough for general use. +--- + t/104_override_usage.t | 8 ++++++++ + t/107_no_auto_help.t | 2 +- + t/109_help_flag.t | 2 +- + t/110_sort_usage_by_attr_order.t | 12 ++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index bc45029..6641540 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,9 +61,17 @@ use Test::Exception; + \t--foo INT A foo + } + : ++ $Getopt::Long::Descriptive::VERSION < 0.106 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo ++} ++ : ++ qq{usage: 104_override_usage.t [-?] [long options...] ++\t--[no-]help (or -?) Prints ++\t this usage information. ++\t aka --usage ++\t--foo INT A foo + } + + ]; +diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t +index 27f87f5..103df43 100644 +--- a/t/107_no_auto_help.t ++++ b/t/107_no_auto_help.t +@@ -60,7 +60,7 @@ END { + warning_like { + throws_ok { Class->new_with_options } + #usage: 107_no_auto_help.t [-?] [long options...] +- qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms, ++ qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms, + 'usage information looks good'; + } + qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/, +diff --git a/t/109_help_flag.t b/t/109_help_flag.t +index 8c658e2..58dbca6 100644 +--- a/t/109_help_flag.t ++++ b/t/109_help_flag.t +@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] ) + local @ARGV = @$args; + + throws_ok { MyClass->new_with_options() } +- qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms, ++ qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms, + 'Help request detected; usage information properly printed'; + } + +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index e7dd177..7ec0c99 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } ++if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++{ ++$expected = <<'USAGE'; ++usage: 110_sort_usage_by_attr_order.t [-?] [long options...] ++ --[no-]help (or -?) Prints ++ this usage information. ++ aka --usage ++ --foo STR Documentation for "foo" ++ --bar STR Documentation for "bar" ++ --baz STR Documentation for "baz" ++USAGE ++} + $expected =~ s/^[ ]{4}/\t/xmsg; + is($obj->usage->text, $expected, 'Usage text has nicely sorted options'); + + +From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Mon, 15 Mar 2021 10:43:14 +0000 +Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107 + +GLD's use of Term::ReadKey has been reverted, so this update should now +work reliably. Use with GLD 0.106 is not supported. +--- + t/104_override_usage.t | 6 +++--- + t/110_sort_usage_by_attr_order.t | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index 6641540..f7c6a31 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,15 +61,15 @@ use Test::Exception; + \t--foo INT A foo + } + : +- $Getopt::Long::Descriptive::VERSION < 0.106 ? ++ # Note: Getopt::Long::Descriptive 0.106 not supported ++ $Getopt::Long::Descriptive::VERSION < 0.107 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo + } + : + qq{usage: 104_override_usage.t [-?] [long options...] +-\t--[no-]help (or -?) Prints +-\t this usage information. ++\t--[no-]help (or -?) Prints this usage information. + \t aka --usage + \t--foo INT A foo + } +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index 7ec0c99..16cdaa1 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } +-if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++# Note: Getopt::Long::Descriptive 0.106 not supported ++if ( $Getopt::Long::Descriptive::VERSION >= 0.107 ) + { + $expected = <<'USAGE'; + usage: 110_sort_usage_by_attr_order.t [-?] [long options...] +- --[no-]help (or -?) Prints +- this usage information. ++ --[no-]help (or -?) Prints this usage information. + aka --usage + --foo STR Documentation for "foo" + --bar STR Documentation for "bar" diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/pkgs/development/perl-modules/Paranoid-blessed-path.patch index 5e80025011000..99bd69730741a 100644 --- a/pkgs/development/perl-modules/Paranoid-blessed-path.patch +++ b/pkgs/development/perl-modules/Paranoid-blessed-path.patch @@ -1,23 +1,22 @@ -diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm ---- Paranoid-2.05/lib/Paranoid.pm 2017-02-06 05:48:57.000000000 -0500 -+++ /tmp/Paranoid-2.05/lib/Paranoid.pm 2018-05-10 06:40:35.286313299 -0400 -@@ -61,7 +61,7 @@ +diff '--color=auto' -ur Paranoid-2.10/lib/Paranoid.pm Paranoid-2.10-patched/lib/Paranoid.pm +--- Paranoid-2.10/lib/Paranoid.pm 2022-03-08 10:01:04.000000000 +0100 ++++ Paranoid-2.10-patched/lib/Paranoid.pm 2023-10-20 16:57:54.025754755 +0200 +@@ -47,7 +47,7 @@ + %EXPORT_TAGS = ( all => [@EXPORT_OK], ); - my $path = shift; + use constant PTRUE_ZERO => '0 but true'; +-use constant DEFAULT_PATH => '/bin:/sbin:/usr/bin:/usr/sbin'; ++use constant DEFAULT_PATH => '__BLESSED_PATH__'; -- $path = '/bin:/usr/bin' unless defined $path; -+ $path = '__BLESSED_PATH__' unless defined $path; - - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; - $ENV{PATH} = $path; -Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ -diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t ---- Paranoid-2.05/t/01_init_core.t 2016-07-12 04:49:33.000000000 -0400 -+++ /tmp/Paranoid-2.05/t/01_init_core.t 2018-05-10 06:43:41.323183381 -0400 -@@ -35,5 +35,5 @@ + ##################################################################### + # +diff '--color=auto' -ur Paranoid-2.10/t/01_init_core.t Paranoid-2.10-patched/t/01_init_core.t +--- Paranoid-2.10/t/01_init_core.t 2022-01-24 10:30:20.000000000 +0100 ++++ Paranoid-2.10-patched/t/01_init_core.t 2023-10-20 16:58:16.856288407 +0200 +@@ -35,5 +35,4 @@ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' ); is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' ); ok( psecureEnv(), 'psecureEnv 2' ); --is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' ); +-is( $ENV{PATH}, '/bin:/sbin:/usr/bin:/usr/sbin', 'Validated PATH' ); +- +is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' ); - diff --git a/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/pkgs/development/perl-modules/XML-LibXML-clang16.patch new file mode 100644 index 0000000000000..9a19e32bc401f --- /dev/null +++ b/pkgs/development/perl-modules/XML-LibXML-clang16.patch @@ -0,0 +1,47 @@ +From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 18:50:10 -0800 +Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers + +This is now detected with latest clang16+ + +Fixes +error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..ec2b5ea 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 110094ad8a494..4da9f7a982128 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index e9b501c29e265..3b6156d3a7c7d 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,31 +1,14 @@ -From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001 -From: Tyson Whitehead <twhitehead@gmail.com> -Date: Fri, 29 Jun 2018 15:47:00 -0400 -Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order) - ---- - lib/LWP/Protocol/https.pm | 8 ++++++++ - 1 file changed, 8 insertions(+) - diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm -index f7230e2..c78b9ce 100644 +index 645e828..7098f64 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -23,6 +23,14 @@ sub _extra_sock_opts - $ssl_opts{SSL_verify_mode} = 0; +@@ -29,6 +29,9 @@ sub _extra_sock_opts + } } if ($ssl_opts{SSL_verify_mode}) { -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" -+ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; -+ } - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; --- -2.14.0 - ++ if ($ENV{NIX_SSL_CERT_FILE}) { ++ $ssl_opts{SSL_ca_file} //= $ENV{NIX_SSL_CERT_FILE}; ++ } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + if ($Net::HTTPS::SSL_SOCKET_CLASS eq 'IO::Socket::SSL' + && defined &IO::Socket::SSL::default_ca diff --git a/pkgs/development/perl-modules/mhonarc.patch b/pkgs/development/perl-modules/mhonarc.patch deleted file mode 100644 index 12b8cc2931b6f..0000000000000 --- a/pkgs/development/perl-modules/mhonarc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/mhamain.pl b/lib/mhamain.pl -index 80980a2..c1259ce 100644 ---- a/lib/mhamain.pl -+++ b/lib/mhamain.pl -@@ -1562,7 +1562,7 @@ sub signal_catch { - ## - sub defineIndex2MsgId { - no warnings qw(deprecated); -- if (!defined(%Index2MsgId)) { -+ unless (%Index2MsgId) { - foreach (keys %MsgId) { - $Index2MsgId{$MsgId{$_}} = $_; - } -diff --git a/lib/mhopt.pl b/lib/mhopt.pl -index 02fb05e..939109b 100644 ---- a/lib/mhopt.pl -+++ b/lib/mhopt.pl -@@ -865,7 +865,7 @@ sub update_data_1_to_2 { - sub update_data_2_1_to_later { - no warnings qw(deprecated); - # we can preserve filter arguments -- if (defined(%main::MIMEFiltersArgs)) { -+ if (%main::MIMEFiltersArgs) { - warn qq/ preserving MIMEARGS...\n/; - %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; - $IsDefault{'MIMEARGS'} = 0; diff --git a/pkgs/development/pharo/default.nix b/pkgs/development/pharo/default.nix index 2cf98d4936987..3c17b2bd79333 100644 --- a/pkgs/development/pharo/default.nix +++ b/pkgs/development/pharo/default.nix @@ -23,8 +23,8 @@ let pharo-sources = fetchurl { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.5-2757766-Linux-x86_64-c-src.zip"; - hash = "sha256-i6WwhdVdyzmqGlx1Fn12mCq5+HnRORT65HEiJo0joCE="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; + hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; }; library_path = makeLibraryPath [ libgit2 @@ -35,7 +35,7 @@ let in stdenv.mkDerivation { pname = "pharo"; - version = "10.0.5"; + version = "10.0.8"; src = pharo-sources; buildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation { cmakeFlags = [ # Necessary to perform the bootstrapping without already having Pharo available. "-DGENERATED_SOURCE_DIR=." + "-DALWAYS_INTERACTIVE=ON" + "-DBUILD_IS_RELEASE=ON" "-DGENERATE_SOURCES=OFF" # Prevents CMake from trying to download stuff. "-DBUILD_BUNDLE=OFF" diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 369b6220adc5c..25ce4df5403f0 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-zTtMNBZcWjEQB70/6i4pvYEepDVCItJgkwrQ2xrXDAU="; + hash = "sha256-/pUo3Lure5N6vsh8o8cQDqlWj8vgOC0ctenO/93K3zQ="; }; - vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM="; + vendorHash = "sha256-l/paOQmJs8/7YN/XsY6wklojLE3z3GIV3jrgZvyQp/8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index a9b92d997559f..7e9d3164ccfe0 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -47,9 +47,8 @@ buildPecl rec { curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix new file mode 100644 index 0000000000000..3c501a029b189 --- /dev/null +++ b/pkgs/development/python-modules/abjad/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ply +, roman +, uqbar +, pythonOlder +, pytestCheckHook +, lilypond +}: + +buildPythonPackage rec { + pname = "abjad"; + version = "3.19"; + format = "setuptools"; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-I9t3ORUKFFlMfXJsAzXhCzl1B4a9/ZNmvSX2/R44TPs="; + }; + + propagatedBuildInputs = [ + ply + roman + uqbar + ]; + + buildInputs = [ + lilypond + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace abjad/io.py \ + --replace 'lilypond_path = self.get_lilypond_path()' \ + 'lilypond_path = "${lilypond}/bin/lilypond"' + # general invocations of binary for IO purposes + + substituteInPlace abjad/configuration.py \ + --replace '["lilypond"' '["${lilypond}/bin/lilypond"' + # get_lilypond_version_string + ''; + + pythonImportsCheck = [ "abjad" ]; + + meta = { + description = "GNU LilyPond wrapper for Python"; + longDescription = '' + Abjad helps composers build up complex pieces of music notation in + iterative and incremental ways. Use Abjad to create a symbolic + representation of all the notes, rests, chords, tuplets, beams and slurs + in any score. Because Abjad extends the Python programming language, you + can use Abjad to make systematic changes to music as you work. Because + Abjad wraps the LilyPond music notation package, you can use Abjad to + control the typographic detail of symbols on the page. + ''; + license = lib.licenses.mit; + homepage = "https://abjad.github.io/"; + changelog = "https://abjad.github.io/appendices/changes.html"; + maintainers = [ lib.maintainers.davisrichard437 ]; + }; +} diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 7e83d5a6b9a65..8aa2719385adb 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-elpVclH/sVQHEp3kTiwbDproJcB85F7m5sEjXwSEtNk="; + hash = "sha256-7uCR/xUARUakODeLVdI13D9ZksvN9c63o3Q0MlJp8cs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d38f67d8c4d78..174fd9c22376f 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , numpy @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.6"; + version = "0.2.6-unstable-2023-08-20"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; + src = fetchFromGitHub { + owner = "python-acoustics"; + repo = "python-acoustics"; + rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38"; + hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -47,11 +49,6 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; - disabledTestPaths = [ - # ValueError: Unknown window type: "hanning" - "tests/standards/test_iso_1996_2_2007.py" - ]; - pythonImportsCheck = [ "acoustics" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 4426f930b0d80..87e1ef293071f 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.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-ppkfnPJEvCImTA0+NjYD8r6SHcx9eBN9GBvo0IZYcjY="; + hash = "sha256-8fvVK/mH+pgPaaxNKvKOw1qU0ElWAmNVP6YAqvBTwio="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index e7ed02bbe0430..97966e6bb33e6 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.53.0"; + version = "3.54.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-P6oR9Aszj2yj2w+2hAjCMDwngJ+uuUNLpgZooYImzyk="; + hash = "sha256-P+f7eBqD0/KIEry/807dQQCvtokB2cYu4i0H6CTYIWg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 9d1e0ee96bab8..ef44979c4394c 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , packaging , setuptools @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + patches = [ + # Removes `register` storage class specifier, which is not allowed in C++17. + (fetchpatch { + url = "https://github.com/pytroll/aggdraw/commit/157ed49803567e8c3eeb7dfeff4c116db35747f7.patch"; + hash = "sha256-QSzpO90u5oSBWUzehRFbXgZ1ApEfLlfp11MUx6w11aI="; + }) + ]; + nativeBuildInputs = [ packaging setuptools diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index e433aa425994a..d669fa983847d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIYGWPvQ2n+NgZHw2pGEvgWAtbpb/rdyb6/K4JClRxM="; + hash = "sha256-Bff44LSWdoXrijTAjnlsaN5iqDbHjfmYqe0FR4dmZxU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9de5593a25626..5f226d26018e5 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -5,6 +5,8 @@ , buildPythonPackage , dill , fetchFromGitHub +, flask +, flask-cors , moto , pytest-asyncio , pytestCheckHook @@ -41,6 +43,8 @@ buildPythonPackage rec { nativeCheckInputs = [ dill + flask + flask-cors moto pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 9af84e2ff91a5..b22090a7593da 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.4.0"; + version = "18.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jSPoVMtGRtqpDFagjvLTxps5plcN92Mp9vjtQlmqyGg="; + hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f01b17639e8b2..ebbcf6ea82a41 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -31,25 +31,23 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.5"; + version = "3.8.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw="; }; patches = [ (fetchpatch { # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should likely be dropped post-3.8.5 + # Merged upstream, should be dropped once updated to 3.9.0 url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; }) - # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly - ./setuptools-67.5.0-compatibility.diff ]; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff b/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff deleted file mode 100644 index 2f75b6b4c1363..0000000000000 --- a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 6944b7e2..dfa65d69 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -128,6 +128,7 @@ filterwarnings = - ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning:: - ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core -+ ignore:pkg_resources is deprecated as an API:DeprecationWarning - junit_suite_name = aiohttp_test_suite - norecursedirs = dist docs build .tox .eggs - minversion = 3.8.2 -diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py -index 22e5ea47..a655fd1d 100644 ---- a/tests/test_circular_imports.py -+++ b/tests/test_circular_imports.py -@@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None: - "-W", - "ignore:Creating a LegacyVersion has been deprecated and will " - "be removed in the next major release:DeprecationWarning:", -+ # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing -+ # `gunicorn.util`. -+ "-W", "ignore:pkg_resources is deprecated as an API:" -+ "DeprecationWarning", - "-c", f"import {import_path!s}", - # fmt: on - ) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 77016c323d988..671cce69c6fd3 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.23"; + version = "17.3.25"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q="; + hash = "sha256-EPEfBK/1nbwcajqyv5lFX+02WMvbyFnij2w5J91+UK8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index e993813081a85..5775aece8060b 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -1,15 +1,16 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp , prettytable , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.17"; - format = "setuptools"; + version = "0.0.22"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-HJbLsl1NHZxfH17mIi0T6h5ZSfKaw4VYbNgN6vmN7l4="; + hash = "sha256-d4pyt9+sBPNo/PL05HQ4sjyjubMtTZI9WUGRU1B/dH0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp prettytable @@ -29,7 +34,8 @@ buildPythonPackage rec { "aiosomecomfort" ]; - doCheck = false; # tests only run on windows, due to WindowsSelectorEventLoopPolicy + # Tests only run on Windows, due to WindowsSelectorEventLoopPolicy + doCheck = false; meta = { description = "AsyicIO client for US models of Honeywell Thermostats"; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e3d0f02711427..1c26f847f6225 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-B3oYh0okbIeEvBjBHvY29QTqPyR2TTzLmz6fMsIRcs0="; + hash = "sha256-EslJnwgZUUN+EtyjGi/7a4Upr2/vbfNXpkc7I+/ZrU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 71bd13c7ab492..5c08a0f5bf078 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 = "8.4.0"; + version = "8.6.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-8zxJJpBZL60SaE6Yl/beLaFcn24ey3kTdwOgZHCvLOY="; + hash = "sha256-lfTlkydNWdU/NvYiB1NbfScq3CcBrHoO169qbYFjemA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 8b72b5e8e9960..463518ef2f98f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.1"; - format = "pyproject"; + version = "5.5.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-URDVNuUrxWoQjeNRPrSJz8aiEozn5BzRTvhqc4bihA0="; + hash = "sha256-6kfkHLW5PftzrhKjywc670HpKCrrU0POEiJ3u2doBTk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix new file mode 100644 index 0000000000000..105f6a71c9153 --- /dev/null +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numba +, numpy +, pytestCheckHook +, pythonOlder +, torchvision +, scikit-learn +, scipy +, setuptools +, tqdm +}: + +buildPythonPackage rec { + pname = "apricot-select"; + version = "0.6.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jmschrei"; + repo = "apricot"; + rev = "refs/tags/${version}"; + hash = "sha256-v9BHFxmlbwXVipPze/nV35YijdFBuka3gAl85AlsffQ="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + numba + numpy + scipy + tqdm + ]; + + nativeCheckInputs = [ + pytestCheckHook + torchvision + scikit-learn + ]; + + pythonImportsCheck = [ + "apricot" + ]; + + disabledTestPaths = [ + # Tests require nose + "tests/test_optimizers/test_knapsack_facility_location.py" + "tests/test_optimizers/test_knapsack_feature_based.py" + ]; + + meta = with lib; { + description = "Module for submodular optimization for the purpose of selecting subsets of massive data sets"; + homepage = "https://github.com/jmschrei/apricot"; + changelog = "https://github.com/jmschrei/apricot/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2e5ebe9e8e035..c8383ecc9af2c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g1qlcaSByXhF+6ffxwbV/0tXFdmLySH3TcDuok4y6xw="; + hash = "sha256-uTkPDhk4Ugyb9HV/0PMwWpuNajpzfTn1dg7gsQnc/zg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5eec27d6782f6..765a7848ac56a 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.2"; - format = "pyproject"; + version = "3.1.6"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vKXHmCcZZTjVBwQZWtyRjJT4tTuIiK5Qos9yJT/mpag="; + hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,9 +35,10 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; description = "Bash tab completion for argparse"; + downloadPage = "https://github.com/kislyuk/argcomplete"; homepage = "https://kislyuk.github.io/argcomplete/"; - changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; }; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 6f6ba426687ee..26a527eb4f8fd 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.18.0"; + version = "1.19.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2VWzmNMdd4WXSBrMSmclpjSZ9jDKNG7GbndUh8zLmgQ="; + hash = "sha256-Idl5Tm1XWgBLVgHPbXiyt9MW4J5wZdPb2J7iIDBnorg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index c17bae7c80f13..a4904cdb5e922 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; + hash = "sha256-eDrnDDiijkr5377BVWVAc5QEQCCDBoFynuT4MncCx9g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index a73403518b43d..e18375c1f5d23 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -44,6 +44,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test fails with frequency 1/200 + # https://github.com/alandtse/auth_capture_proxy/issues/25 + "test_return_timer_countdown_refresh_html" + ]; + + pythonImportsCheck = [ + "authcaptureproxy" + ]; + meta = with lib; { changelog = "https://github.com/alandtse/auth_capture_proxy/releases/tag/v${version}"; description = "A proxy to capture authentication information from a webpage"; diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 00e01ba80bf1d..2c3bd96fcf22e 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 = "25"; + version = "26"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fhq6XUt5CYz/l+Lf9WcCnt9rs3byMQIQs7hFexr2tjM="; + hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 5a7b1af3e8f17..32a8baa44864a 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -2,7 +2,6 @@ , boto3 , buildPythonPackage , fetchFromGitHub -, fetchpatch , jsonschema , parameterized , pydantic @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.74.0"; + version = "1.78.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,16 +25,9 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; + hash = "sha256-hSXJBEntj3k3Kml+Yuvn19X7YXL+Y1hXBkb8iZ7DxR4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/aws/serverless-application-model/commit/e41b0f02204635a655100b68dd38220af32a2728.patch"; - hash = "sha256-V6KXdXQUr9fvLzxI6sUMrSRnGX5SrAaDygcaQ87FaQ8="; - }) - ]; - postPatch = '' substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" @@ -87,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/awslabs/serverless-application-model"; + homepage = "https://github.com/aws/serverless-application-model"; changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index bf6d34adce01b..ba589b8aa5e61 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -2,27 +2,24 @@ , buildPythonPackage , fetchPypi , azure-core -, uamqp , pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.11.4"; + version = "5.11.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-aLiaNRUEDxF2+bSWxMdtOBwQd3mu13V8u7mj2r4wqCM="; + hash = "sha256-HDdOmQezNIPVCLTHst8p+crGM15dpaGNIYU0+UL01Uw="; }; propagatedBuildInputs = [ azure-core - uamqp typing-extensions ]; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 2f7d1486c1026..9b954760fe1ca 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -1,43 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.2.3"; + version = "10.3.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU="; + hash = "sha256-GDtBZM8YaLjqfv6qmO2tfSpOFKm9l3woGLErdRUM0qI="; }; propagatedBuildInputs = [ - msrest - msrestazure azure-common azure-mgmt-core + isodate ]; pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Key Vault Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-keyvault_${version}/sdk/keyvault/azure-mgmt-keyvault/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 56a38ca05d957..0008035e91e0f 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -1,31 +1,28 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "7.1.0"; + version = "7.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-WxbN5+MNwgRmuRH/vEmlcljH7ylYRyxNz2Ev8aAS8Vw="; + hash = "sha256-78/m9/Ug7Qq8/oZRfhyM8CpxL3N6PbDbfLRsbWR5ge0="; }; propagatedBuildInputs = [ - msrest - msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg + isodate ]; # has no tests @@ -34,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Web Apps Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-web_${version}/sdk/appservice/azure-mgmt-web/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix index dccdda1d27a90..7058a1bddbea2 100644 --- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix +++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -10,16 +10,14 @@ buildPythonPackage rec { pname = "azure-monitor-ingestion"; - version = "1.0.2"; + version = "1.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; - pyproject = true; - src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-xNpYsD1bMIM0Bxy8KtR4rYy4tzfddtoPnEzHfO44At8="; + hash = "sha256-idAEqP+HaZs/0fzyBaqO8enTTySg88w3TSIUceiYdDs="; }; nativeBuildInputs = [ @@ -40,11 +38,11 @@ buildPythonPackage rec { # requires checkout from mono-repo and a mock account doCheck = false; - meta = { + meta = with lib; { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-ingestion_${version}/sdk/monitor/azure-monitor-ingestion/CHANGELOG.md"; description = "Send custom logs to Azure Monitor using the Logs Ingestion API"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-ingestion"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index aba7d2a29df4d..562340f93e4d6 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.3"; + version = "7.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lNZfL9yV56kSxT/qz4iH+w6QWGEmwBU+Ivrg+2UNH8o="; + hash = "sha256-970pd5G2pXfONqOeoKuxCqD4dba7DTFSLtntK7AojUw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index e6f41525795b9..70f1b5589d91c 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.7.3"; + version = "12.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDVzLTLT9mQ3eWYZM4CzDkv99rR2dHhDVExaXyE1VYk="; + hash = "sha256-mHwAjOv6d+Xh6mwKhVK6w3Rsh3HgijntkvEmRqOrYRk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 2caf5996c30c0..1782dd56e4854 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -1,34 +1,33 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-core , azure-mgmt-core -, msrest +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder }: buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-58k8F/aUBBNJwGBiPZojkSzEXZ3Kd6uEwr0cZbFaM9k="; + hash = "sha256-qgiHMzW7T5NuQl0jwZheMXp7wHhNOHyH24J6wfc4VqQ="; }; propagatedBuildInputs = [ azure-common azure-core azure-mgmt-core - msrest + isodate ]; - # zero tests run + # Tests are only available in mono-repo doCheck = false; pythonImportsCheck = [ @@ -38,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Synapse Artifacts Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-synapse-artifacts_${version}/sdk/synapse/azure-synapse-artifacts/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index 4f1d0cef7fd0e..df28d568b0103 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -1,23 +1,40 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, pyquaternion +, matplotlib , numpy +, pendulum +, pillow +, poetry-core +, pyquaternion }: buildPythonPackage rec { pname = "bbox"; version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; + src = fetchFromGitHub { + owner = "varunagrawal"; + repo = pname; + # matches 0.9.4 on PyPi + tests + rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565"; + hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; }; propagatedBuildInputs = [ pyquaternion numpy ]; + buildInputs = [ poetry-core ]; + + nativeCheckInputs = [ + matplotlib + pendulum + pillow + pytestCheckHook + ]; pythonImportsCheck = [ "bbox" ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index 9a02610c02a02..5be65f31f6010 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.51"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Fb/suuiC6tmY3ZMAc3I3oU5A39jJc+XH3ntMkgQKAQ8="; + hash = "sha256-cqQ4zuztfS5MiY4hj1WipKunqIfB1kpM+RODcZPERrY="; }; # Nose is required during build process, so can not use `nativeCheckInputs`. diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 470eaf376a771..af622dfd76246 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.14.2"; + version = "0.14.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-69H0hB+yVmyzJ5A2Cb7ZcaaoRzMt618U+TUHYQ03/cY="; + hash = "sha256-I/MKjdEu69uis5f/Xuk4H6ynC71IQmfASLr07PdEBXE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 55f709c0e3dfc..e69b31b118f64 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.2"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+QsvRLWyM2TV+63iw0ZS4Vsfz+gTxG+CjgCPaKcJFg8="; + hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index d83eb87baff1a..e16a6d7a38cde 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.17.0"; + version = "8.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; + hash = "sha256-11up3e2FwX6IWiCaAOuOJI7kB2IUny8qeTYMqFdGfaw="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 53cd8b17d9cf2..91e443af460f7 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -1,32 +1,42 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , cython , hypothesis , numpy -, pytest +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "blis"; - version = "0.7.9"; - format = "setuptools"; + version = "0.7.11"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ke9MJQB3hakP/C8Ks9O9O3XNLXhWqaSCt9DayNURoJ0="; + src = fetchFromGitHub { + owner = "explosion"; + repo = "cython-blis"; + rev = "refs/tags/v${version}"; + hash = "sha256-p8pzGZc5OiiGTvXULDgzsBC3jIhovTKUq3RtPnQ/+to="; }; postPatch = '' # See https://github.com/numpy/numpy/issues/21079 + # has no functional difference as the name is only used in log output substituteInPlace blis/benchmark.py \ - --replace "numpy.__config__.blas_ilp64_opt_info" "numpy.__config__.blas_opt_info" + --replace 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' + ''; + + preCheck = '' + # remove src module, so tests use the installed module instead + rm -rf ./blis ''; nativeBuildInputs = [ + setuptools cython ]; @@ -36,7 +46,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest + pytestCheckHook ]; pythonImportsCheck = [ @@ -53,6 +63,6 @@ buildPythonPackage rec { description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 5cd247cf28724..2b3b27108d1b6 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , build , coloredlogs , packaging +, pip , toml , twine , wheel @@ -13,21 +15,22 @@ buildPythonPackage rec { pname = "bork"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "duckinator"; repo = pname; - rev = "v${version}"; - hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + rev = "refs/tags/v${version}"; + hash = "sha256-y/p2uuU+QKgJSdJmMt3oebm/zcuatYWTW8Jl79YxA3g="; }; propagatedBuildInputs = [ build coloredlogs packaging + pip toml twine wheel @@ -39,6 +42,13 @@ buildPythonPackage rec { "bork.cli" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ + "-m 'not network'" + ]; + meta = with lib; { description = "Python build and release management tool"; homepage = "https://github.com/duckinator/bork"; diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index d3f2548f7a9ef..0b831b58f8e17 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.75"; + version = "0.2.77"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-T3QTNnnkquv0IurwNtblX9CF/gLeMONEFfbJV/n/Wj4="; + hash = "sha256-VakHBxTd6Nug/022HYc986LDIsVnTcsMtxBV7zJf+PY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e6ac07612c407..779871db10edb 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.57"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; + hash = "sha256-+kuILCUK10tvpfTEAHZGvKKmpw6Pgn+v2kQkwCkPMKg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 3dac327a48bef..ddb9d35d05fd8 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.48"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.57"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-btFvZqpu1gcP7SbWl2TLFMd1nkzAscGRKDzEiwXWXek="; + hash = "sha256-MBQ2F0Y1vsc5siW4QPw2XKAOXBpj5bKhnuZ50gTgG3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 81068d4c07962..121777da32d8d 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -21,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; + patches = [ + (fetchpatch { + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 + name = "breathe-sphinx7.2-support.patch"; + url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; + hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; + }) + ]; + propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index 2b3bcbff5076a..a85e26b485f49 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -22,12 +22,6 @@ buildPythonPackage rec { hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; - patches = [ - # Fix deprecated numpy types - # https://sources.debian.org/data/main/b/brian/2.5.1-3/debian/patches/numpy1.24.patch - ./numpy1.24.patch - ]; - propagatedBuildInputs = [ cython jinja2 diff --git a/pkgs/development/python-modules/brian2/numpy1.24.patch b/pkgs/development/python-modules/brian2/numpy1.24.patch deleted file mode 100644 index 01af8f77c0ed4..0000000000000 --- a/pkgs/development/python-modules/brian2/numpy1.24.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove deprecated use of np.float -Author: Marcel Stimberg <marcel.stimberg@inserm.fr> -Bug-Debian: https://bugs.debian.org/1027193 -Applied-Upstream: 61ef84b316a3d0a892298adf51abd8ac50900758 -Last-Update: 2023-01-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- brian.orig/brian2/units/fundamentalunits.py -+++ brian/brian2/units/fundamentalunits.py -@@ -1597,7 +1597,7 @@ - unitless = np.array(self / best_unit, copy=False) - threshold = np.get_printoptions()['threshold'] // 100 - if unitless.ndim == 0: -- sympy_quantity = np.float(unitless) -+ sympy_quantity = float(unitless) - elif unitless.ndim == 1: - array_str = np.array2string(unitless, separator=" & ", threshold=threshold, - max_line_width=sys.maxsize) diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 2b3af3e5702d7..f06975bbfc17a 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "canals"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deepset-ai"; repo = "canals"; rev = "refs/tags/v${version}"; - hash = "sha256-5pRrpi1qxkFgGqcw7Nfc5rnOTra27H31DLKCglkPf6s="; + hash = "sha256-zTC9zaY2WQ4Sx/1YeEaw23UH0hoP/ktMwzH8x/rER00="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 3cb260dd8d1bb..cfe955ca9d962 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -1,32 +1,39 @@ { lib -, buildPythonPackage -, fetchPypi -, setuptools-scm , argparse-addons , bitstruct +, buildPythonPackage , can , crccheck , diskcache +, fetchPypi , matplotlib , parameterized , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm , textparser }: buildPythonPackage rec { pname = "cantools"; - version = "38.0.2"; - format = "setuptools"; + version = "39.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k7/m9L1lLzaXY+qRYrAnpi9CSoQA8kI9QRN5GM5oxo4="; + hash = "sha256-44zzlyOIQ2qo4Zq5hb+xnCy0ANm6iCpcBww0l2KWdMs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools_scm>=8" "setuptools_scm" + ''; + nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -50,8 +57,9 @@ buildPythonPackage rec { ]; meta = with lib; { + description = "Tools to work with CAN bus"; homepage = "https://github.com/cantools/cantools"; - description = "CAN bus tools."; + changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gray-heron ]; }; 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 c48c8090dd461..fdbec4f6fe4ad 100644 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -1,7 +1,8 @@ -diff -r bac92fcfe4d7 c/_cffi_backend.c ---- a/c/_cffi_backend.c Mon Jul 18 15:58:34 2022 +0200 -+++ b/c/_cffi_backend.c Sat Aug 20 12:38:31 2022 -0700 -@@ -96,7 +96,7 @@ +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 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 @@ -10,7 +11,7 @@ diff -r bac92fcfe4d7 c/_cffi_backend.c # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 -@@ -6413,7 +6413,7 @@ +@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 0d93941b974d5..7b2547afff1d1 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, setuptools , pytestCheckHook , libffi , pkg-config @@ -13,11 +13,12 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.15.1"; + version = "1.16.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; + hash = "sha256-vLPvQ+WGZbvaL7GYaY/K5ndkg+DEpjGqVkeAbCXgLMA="; }; patches = [ @@ -32,38 +33,12 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff - (fetchpatch { - # Drop py.code usage from tests, no longer depend on the deprecated py package - url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; - }) - (fetchpatch { - # Replace py.test usage with pytest - url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; - }) ] ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") [ # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests # to run and pass when cffi is built with newer versions of clang: # - testing/cffi1/test_verify1.py::test_enum_usage # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument ./clang-pointer-substraction-warning.diff - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # Fix test that failed because python seems to have changed the exception format in the - # final release. This patch should be included in the next version and can be removed when - # it is released. - (fetchpatch { - url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; - hash = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; - }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -74,11 +49,18 @@ if isPyPy then null else buildPythonPackage rec { --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - buildInputs = [ libffi ]; + nativeBuildInputs = [ + pkg-config + setuptools + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libffi + ]; - propagatedBuildInputs = [ pycparser ]; + propagatedBuildInputs = [ + pycparser + ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang @@ -86,18 +68,16 @@ if isPyPy then null else buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isMusl; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - # AssertionError: cannot seem to get an int[10] not completely cleared - # https://foss.heptapod.net/pypy/cffi/-/issues/556 - "test_ffi_new_allocator_1" + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar lnl7 ]; + changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}"; + description = "Foreign Function Interface for Python calling C code"; + downloadPage = "https://github.com/python-cffi/cffi"; homepage = "https://cffi.readthedocs.org/"; license = licenses.mit; - description = "Foreign Function Interface for Python calling C code"; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 90cf6a4be7f7e..95d29a4401bcd 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , flit-core @@ -34,6 +35,11 @@ buildPythonPackage rec { pyyaml ]; + # On darwin: Too many open files + preCheck = lib.optionalString stdenv.isDarwin '' + ulimit -n 1024 + ''; + disabledTests = [ # these tests raise circus.tests.support.TimeoutException "test_reload1" diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c185d1148bdb3..52a3bf6482d09 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-BwhM5J+20ZvP0d+9TAqy0AgRuPU6XoLKgM88WJdf3Qg="; + hash = "sha256-YLa70xxLDyOOKQg/PzFO90JzS5SyvgcJ2+Nltz0q6T8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index efc5c6168195d..6b56defb4cb46 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.76"; + version = "9.2.77"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-01Y4UKTkaO6bYtVTvv4KFzkEdj4qKiWKaC80/iKa/Eg="; + hash = "sha256-YPxdKwR+pq0S1B9GltE8r3bFWDPpCU8OQ05w+kp4lAs="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-uMT9LvDkXl3SueR80pgGJRkWbymDRmGEn8HV93K/VNc="; + hash = "sha256-tdfV+DoDcRO+8TjiBc0u1huA+etF4MY5uYj670lqudY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index d47e15b4c7e55..f51df558c0ae0 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -6,25 +6,24 @@ , pythonOlder , openssl , perl -, pkgs }: buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.19"; + version = "0.3.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - hash = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; + hash = "sha256-DJviuIBJg+MF0NvmdeWK31nV+q4UZCRdmdbEAJqwXXg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; + hash = "sha256-bgXUSm3M8J7E2ohPjPIimHJvz1ivWrsliKZlgchOdhQ="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 91484fe6a7f75..f2d2cc7ca9766 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.10.30.13"; + version = "2023.11.13.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-Kb6iVLV///X0UKby/7/wfbSGUFLw6HQX3SUwPX79QD0="; + hash = "sha256-+hX1msvm4hRl3luhMWgXcmpV2DmGI1oCknSP4QEWtxM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix index 01936cefd2c3f..e2383dddf4de9 100644 --- a/pkgs/development/python-modules/colorzero/default.nix +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pkginfo -, sphinxHook -, sphinx-rtd-theme , pytestCheckHook }: @@ -25,15 +23,8 @@ buildPythonPackage rec { --replace "--cov" "" ''; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ pkginfo - sphinx-rtd-theme - sphinxHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index a7e0b754273f3..dceb2e74ca86b 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/rhinstaller/dasbus"; description = "DBus library in Python3"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index fcf2e03ad5962..63a13d779913a 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... + "test_foldby_tree_reduction" + "test_to_bag" ] ++ [ # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 "test_concat_categorical" diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 2ec4ca43032b3..311e4a0090b06 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { ]; meta = with lib; { + broken = true; # https://github.com/DataDog/datadogpy/issues/800 description = "The Datadog Python library"; homepage = "https://github.com/DataDog/datadogpy"; changelog = "https://github.com/DataDog/datadogpy/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 930dd5618ccf3..93c738314fbcc 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -7,6 +7,7 @@ , click , colorama , dbt-extractor +, dbt-semantic-interfaces , hologram , idna , isodate @@ -60,6 +61,7 @@ buildPythonPackage rec { click colorama dbt-extractor + dbt-semantic-interfaces hologram idna isodate diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix new file mode 100644 index 0000000000000..694b2c7f73729 --- /dev/null +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, click +, dateutils +, hatchling +, importlib-metadata +, jinja2 +, jsonschema +, more-itertools +, pydantic +, pyyaml +, typing-extensions +, hypothesis +}: + +buildPythonPackage rec { + pname = "dbt-semantic-interfaces"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbt-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-pnhmfj349uMjSsmdr53dY1Xur6huRKHiXWI7DXYK1gE="; + }; + + propagatedBuildInputs = [ + click + dateutils + importlib-metadata + jinja2 + jsonschema + more-itertools + pydantic + pyyaml + typing-extensions + ]; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + ]; + + pythonImportsCheck = [ + "dbt_semantic_interfaces" + ]; + + meta = with lib; { + changelog = "https://github.com/dbt-labs/dbt-semantic-interfaces/releases/tag/v${version}"; + description = "shared interfaces used by dbt-core and MetricFlow projects"; + homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; + license = licenses.asl20; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 0333bb37ce3ba..13704b20939a8 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -77,13 +77,17 @@ buildPythonPackage rec { "test_scheme_contract_is_satisfied_when_setting_arg" "test_scheme_contract_is_satisfied_within_chain" "test_scheme_errors_rewrite_message" - # broken since pytest > 7.1.3 - "test_exception_hook" + # assert errors + "test_doctest" + "test_no_violations" ]; disabledTestPaths = [ # needs internet access "tests/test_runtime/test_offline.py" + # depends on typeguard <4.0.0 for tests, but >=4.0.0 seems fine for runtime + # https://github.com/life4/deal/blob/9be70fa1c5a0635880619b2cea83a9f6631eb236/pyproject.toml#L40 + "tests/test_testing.py" ]; pythonImportsCheck = [ "deal" ]; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 4f0d493c0f80c..ad69642a4f7bb 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, matplotlib, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, numpy +, pytestCheckHook +}: buildPythonPackage rec { pname = "deap"; @@ -9,19 +15,13 @@ buildPythonPackage rec { hash = "sha256-zAHemJLfp9G8mAPasoiS/q0XfwGCyB20c2CiQOrXeP8="; }; - propagatedBuildInputs = [ numpy matplotlib ]; - - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests --verbosity=3 - ''; + propagatedBuildInputs = [ matplotlib numpy ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - description = "DEAP is a novel evolutionary computation framework for rapid prototyping and testing of ideas."; + description = "A novel evolutionary computation framework for rapid prototyping and testing of ideas"; homepage = "https://github.com/DEAP/deap"; - license = licenses.lgpl3; - maintainers = with maintainers; [ psyanticy ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ getpsyched psyanticy ]; }; - } - diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 9fa9457b28484..0a22c7b8b7baf 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-3Zyjo7yoSLtAnC5lOLzjWsqMRoJxsrw2LKjQ2Qy38sg="; + hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 55ce876fe2164..e7f17cb0286c2 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-AcDlyLKrRyt1mhh7nb9Oln/cjVKw8s1g78J8sgE2p2g="; + hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 9671bb33c8ab3..94881ca3ca42a 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0="; + hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index c7192854fcf8d..173170396f726 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-CMUXMSkrutziAIYjUFbLEpsYpCZUiPmV16puXneGeHE="; + hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index ca91e77a6672c..cf31574e6fdbd 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools ]; - postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' find $out -name '*.exe' -delete ''; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 01e1593a82cea..5832d9a069338 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchNpmDeps , buildPythonPackage +, nix-update-script # build-system , gettext @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; + hash = "sha256-E5gM/5MIB65gdyv/I+Kuw8rbjPvtUnbCPXpasaIDzyo="; }; postPatch = '' @@ -39,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E="; + hash = "sha256-4ZVb+V/oYfflIZdme6hbpoSBFVV7lk5wLfEzzBqZv/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -67,6 +68,9 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; + # needed for npmDeps update + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 7796c31ebd0e1..077ea73bd8b9e 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.22"; + version = "3.2.23"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-g7bWawbkhIB9d4Jj/cf5GG1NwYYvz6ZQeDBEasawYLo="; + hash = "sha256-gpaPNkDinvSnc68sKESPX3oI0AHGrAWzLQKu7mUJUIs="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 582a2fab79c25..69c438739f23f 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.6"; + version = "4.2.7"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-CPQfRotjM1rqDZBMVyngJQMA9qGQe/KTplSZSWzbxo8="; + hash = "sha256-jg8cLCeGtcDjn+GvziTJJgQPrUfI6orTCq8RiN8p/EE="; }; patches = [ diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 8b7300d786f5f..84da4beadd794 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.14.2"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bogdanp"; repo = "dramatiq"; - rev = "v${version}"; - hash = "sha256-yv6HUJI7wsAQdBJ5QNv7qXhtzPvCsrF1389kyemAV7Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-uhradhLIyfHf1meAr7ChuGnvm62mX/lkQQ2Pe7hBWtY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 05f9f0c9a4062..129ec14cd0a79 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , freezegun , mock -, nose2 +, pytestCheckHook +, pythonOlder , pytz , setuptools , six @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "duo-client"; version = "5.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "duosecurity"; @@ -26,15 +30,18 @@ buildPythonPackage rec { --replace "flake8" "" ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ setuptools + ]; + + propagatedBuildInputs = [ six ]; nativeCheckInputs = [ freezegun mock - nose2 + pytestCheckHook pytz ]; @@ -42,6 +49,12 @@ buildPythonPackage rec { "duo_client" ]; + disabledTests = [ + # Tests require network access + "test_server_hostname" + "test_server_hostname_with_port" + ]; + meta = with lib; { description = "Python library for interacting with the Duo Auth, Admin, and Accounts APIs"; homepage = "https://github.com/duosecurity/duo_client_python"; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 3d09f182bf7d6..0a21a0b84fc8c 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.21.0"; + version = "2.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-q9wVPT8mUZyX0I4GdC6qtsCTFH80HsUrrtR2oAby8VE="; + hash = "sha256-7T6aR1qCJm7m0AmASyJZpZtc+yXqULKc9mMcY2WYT6I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index ccaf67aadd276..57487bbb7ad48 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.28.0"; + version = "3.30.1"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oCNszhLGNXNGiQtp91wT4GfuNzDhbZrVR55K41Ykhdg="; + hash = "sha256-UFAqcO6SG/1ufzylrNuOpJaH2hlIo0ZkSLEfxi8OqLw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 406ccadea8940..628afaaac4ddc 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z1Nxdz4/45uSypufuwDGiCeUwl+izRGIDA2s9F+jT1Q="; + hash = "sha256-esvDCAsGoaB4t4hiTmoQa69Sgg5crqJyiom/iXxpZow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index d79bdf125c634..8b6092e13c40d 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "0.3.1"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-n+dF2bR4BUpQAI+M8gPvFVZ+c5cDdAVoENSGpZtbv+M="; + hash = "sha256-HdCrbEk1b+FZzDoMoLcNaPFEHQfDoQsePKmESM9Qhds="; }; postPatch = '' diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index 6b3c04c726f9c..cfcd2ed77ad71 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Very simple, very easy GUI programming in Python"; homepage = "https://github.com/robertlugg/easygui"; license = licenses.bsd3; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix new file mode 100644 index 0000000000000..af3a3d43a6d7b --- /dev/null +++ b/pkgs/development/python-modules/echo/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, libxcrypt +, numpy +, qt6 +, qtpy +, pyqt6 +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "echo"; + version = "0.8.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; + }; + + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + + buildInputs = lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; + + propagatedBuildInputs = [ + qt6.qtconnectivity + qt6.qtbase + qt6.qttools + pyqt6 + numpy + qtpy + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "echo" ]; + + meta = with lib; { + homepage = "https://github.com/glue-viz/echo"; + description = "Callback Properties in Python"; + license = licenses.mit; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 9455cdc1b81df..0005a4cb2e630 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jsrJr/iuezh9/KL0PykWB1XKev4Wr5QeDh0ZWNMZSp8="; + hash = "sha256-foq1CwIe86d+s7PlhLlGpnJCwrpOyr+uf5/RMLASSJU="; }; postPatch = '' @@ -52,6 +52,21 @@ buildPythonPackage rec { "edalize" ]; + disabledTests = [ + # disable failures related to pandas 2.1.0 apply(...,errors="ignore") + # behavior change. upstream pins pandas to 2.0.3 as of 2023-10-10 + # https://github.com/olofk/edalize/commit/2a3db6658752f97c61048664b478ebfe65a909f8 + "test_picorv32_artix7_summary" + "test_picorv32_artix7_resources" + "test_picorv32_artix7_timing" + "test_picorv32_kusp_summary" + "test_picorv32_kusp_resources" + "test_picorv32_kusp_timing" + "test_linux_on_litex_vexriscv_arty_a7_summary" + "test_linux_on_litex_vexriscv_arty_a7_resources" + "test_linux_on_litex_vexriscv_arty_a7_timing" + ]; + disabledTestPaths = [ "tests/test_questa_formal.py" "tests/test_slang.py" diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 73d377e78b15e..9a5e3b53d94c0 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.4"; + version = "0.19.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw="; + hash = "sha256-Gxza9bVLVVHejKNI9CQZQxfJuT71LBsxDQ8e4xAozS0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index e51d120e50331..0b0acc5dab06a 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "energyzero"; - version = "0.5.0"; + version = "1.0.0"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-UFmchPFAO5azvLKgbKLbPooGhQ4SZHzrCe6jBo0X3bw="; + hash = "sha256-EsZYEc4Hf99PoP5X9LEgcGftI7597P4l1LTepTabGqU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d8342f054bc2a..974bb21392be6 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-iYVAbUIZG90kgWger+M+DZmS/kQ3nEPXQFU+90lHgK0="; + hash = "sha256-qFTKiY/t2LCCWJBOSfaX0hYQInrpXgfhTc+J4iuyVbM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/euclid3/default.nix b/pkgs/development/python-modules/euclid3/default.nix new file mode 100644 index 0000000000000..3d723eca56584 --- /dev/null +++ b/pkgs/development/python-modules/euclid3/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: +buildPythonPackage rec { + pname = "euclid3"; + version = "0.01"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JbgnpXrb/Zo/qGJeQ6vD6Qf2HeYiND5+U4SC75tG/Qs="; + }; + + pythonImportsCheck = [ + "euclid3" + ]; + + meta = with lib; { + description = "2D and 3D vector, matrix, quaternion and geometry module."; + homepage = "http://code.google.com/p/pyeuclid/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix new file mode 100644 index 0000000000000..fd00ff5df8e20 --- /dev/null +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, python +, pythonOlder +, setuptools +, setuptools-scm +, numpy +, wheel +, hypothesis +, pytest-cov +}: + +buildPythonPackage rec { + pname = "fast-histogram"; + version = "0.12"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-cov + ]; + + pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonImportsCheck = [ "fast_histogram" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/fast-histogram"; + description = "Fast 1D and 2D histogram functions in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 553f313bd0b64..428cf9f8d91d1 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -80,7 +80,8 @@ buildPythonPackage rec { python-jose trio sqlalchemy - ] ++ passthru.optional-dependencies.all; + ] ++ passthru.optional-dependencies.all + ++ python-jose.optional-dependencies.cryptography; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 685c4e8094593..c4d686c014782 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -107,6 +107,8 @@ buildPythonPackage rec { "flask_admin/tests/sqla/test_translation.py" # RuntimeError: Working outside of application context. "flask_admin/tests/sqla/test_multi_pk.py" + # Broken test + "flask_admin/tests/fileadmin/test_fileadmin.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 4ea6857cbd33e..abc90cdbb0e39 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, flask, six, packaging }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, flask +, packaging +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { - pname = "Flask-Cors"; - version = "3.0.10"; + pname = "flask-cors"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; + src = fetchFromGitHub { + owner = "corydolphin"; + repo = "flask-cors"; + rev = "refs/tags/${version}"; + hash = "sha256-o//ulROKKBv/CBJIGPBFP/+T0TpMHUVjr23Y5g1V05g="; }; - nativeCheckInputs = [ nose packaging ]; - propagatedBuildInputs = [ flask six ]; + nativeBuildInputs = [ + setuptools + ]; - # Exclude test_acl_uncaught_exception_500 test case because is not compatible - # with Flask>=1.1.0. See: https://github.com/corydolphin/flask-cors/issues/253 - checkPhase = '' - nosetests --exclude test_acl_uncaught_exception_500 - ''; + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + packaging + ]; meta = with lib; { description = "A Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; + changelog = "https://github.com/corydolphin/flask-cors/releases/tag/v${version}"; license = with licenses; [ mit ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 32a275177c2c3..dad4b6ddb8716 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flask-mongoengine"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-08-16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,10 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; + rev = "d4526139cb1e2e94111ab7de96bb629d574c1690"; + hash = "sha256-oMQU9Z8boc0q+0KzIQAZ8qSyxiITDY0M9FCg75S9MEY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "1.0.0"; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix index 08f59292a206e..72248cf8dbaa2 100644 --- a/pkgs/development/python-modules/floret/default.nix +++ b/pkgs/development/python-modules/floret/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "floret"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "floret"; rev = "refs/tags/v${version}"; - hash = "sha256-cOVyvRwprR7SvZjH4rtDK8uifv6+JGyRR7XYzOP5NLk="; + hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 1562600a231f4..2c8de577dc279 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.12"; + version = "3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; + hash = "sha256-Yg42nA0dRjHormpmpbOuZYuvBpNz9XEpf84XI2iJpYY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 5aa3fbcc165b3..ff74cbd6c9b0a 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "furo"; - version = "2023.7.26"; + version = "2023.9.10"; format = "wheel"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-HHk2kp7FfF3ezHyF8H+oss5Ta1yJE3dkzKUIvpDhHv0="; + hash = "sha256-UTCSU4U33FxZZpHaBuPDcHFOyZvEOGgO3B3r/7c+W/w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix index fb5f098f0d9f2..0f9742c343810 100644 --- a/pkgs/development/python-modules/geomet/default.nix +++ b/pkgs/development/python-modules/geomet/default.nix @@ -2,14 +2,15 @@ , buildPythonPackage , fetchFromGitHub , click +, setuptools , six , pythonOlder }: buildPythonPackage rec { pname = "geomet"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "geomet"; repo = "geomet"; rev = "refs/tags/${version}"; - hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw="; + hash = "sha256-YfI29925nffzRBMJb6Gm3muvlpwP3zSw2YJ2vWcf+Bo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ click six diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e176a614e8d65..e075700ce1f52 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8="; + hash = "sha256-mQ13fjhtFXvUnBok5bDz+zkbgfXEUmwiv77rBpYS5oo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index b0f54b53dc620..fc8d2edac2be4 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.3"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A="; + hash = "sha256-DUTZLLWO4xUeUlxHGGVr/MD5uKqRxUf+p0crYsELgzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 47289fff59667..f497821e07d63 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { homepage = "https://github.com/globus/globus-sdk-python"; changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix new file mode 100644 index 0000000000000..2d0e927c1acc4 --- /dev/null +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -0,0 +1,87 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, dill +, astropy +, numpy +, pandas +, qt6 +, pyqt6 +, pyqt-builder +, qtconsole +, setuptools +, setuptools-scm +, scipy +, ipython +, ipykernel +, h5py +, matplotlib +, xlrd +, mpl-scatter-density +, pvextractor +, openpyxl +, echo +, pytest +, pytest-flakes +, pytest-cov +}: + +buildPythonPackage rec { + pname = "glueviz"; + version = "1.16.0"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = "glue"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jjDa0DxB5AJm+x8P7FiH2kqhhc/bbzjzvdC9INs69Ro="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + propagatedBuildInputs = [ + astropy + dill + setuptools + scipy + numpy + matplotlib + pandas + pyqt6 + qtconsole + ipython + ipykernel + h5py + xlrd + mpl-scatter-density + pvextractor + openpyxl + echo + ]; + + dontConfigure = true; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ pytest pytest-flakes pytest-cov ]; + + pythonImportsCheck = [ "glue" ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://glueviz.org"; + description = "Linked Data Visualizations Across Multiple Files"; + license = licenses.bsd3; # https://github.com/glue-viz/glue/blob/main/LICENSE + maintainers = with maintainers; [ ifurther ]; + }; +} 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 59fbcd9002ce9..f778b745cb4c1 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE="; + hash = "sha256-NITSosBPrfpIC+FqVU0B5H5MT0taEjzTcl6GW03X8yU="; }; propagatedBuildInputs = [ @@ -24,7 +24,9 @@ buildPythonPackage rec { grpc-google-iam-v1 ] ++ google-api-core.optional-dependencies.grpc; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.artifactregistry" @@ -34,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Artifact Registry API client library"; - homepage = "https://github.com/googleapis/google-cloud-python"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-artifact-registry-v${version}/packages/google-cloud-artifact-registry/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index b12ee489cc29f..b45492a171f84 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -12,20 +12,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.11.3"; - format = "setuptools"; + version = "2.11.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VcqQn7w2sTpDHKfniwkwsEXDa8YIV+G1jlbPOu8NVl0="; + hash = "sha256-oUMXQWkwHMFI26hpe36mAyoh+bQogtyoDgTaBRactUU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus @@ -58,14 +63,11 @@ buildPythonPackage rec { rm -r google ''; - disabledTestPaths = [ - # requires credentials - "tests/system/gapic/v1beta1/test_system_tables_client_v1.py" - ]; - disabledTests = [ - # requires credentials + # Test requires credentials "test_prediction_client_client_info" + # Test requires project ID + "test_list_models" ]; pythonImportsCheck = [ @@ -76,8 +78,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud AutoML API client library"; - homepage = "https://github.com/googleapis/python-automl"; - changelog = "https://github.com/googleapis/python-automl/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-automl"; + changelog = "https://github.com/googleapis/google-cloud-python/tree/google-cloud-automl-v${version}/packages/google-cloud-automl"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2aa7834ace8ac..2e91f2704c77c 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; + hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 9d5f406429f40..6ea7744cab6dc 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Python interface to libgphoto2"; homepage = "https://github.com/jim-easterbrook/python-gphoto2"; license = licenses.gpl3; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 3c5049a8a619c..8b885133cf2af 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -1,32 +1,56 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy + +# build-system +, setuptools + +# tests , objgraph , psutil -, pytestCheckHook +, python +, unittestCheckHook }: - -buildPythonPackage rec { +let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "2.0.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-58jcE699sJe+1koFHS3Unp8K9JXCaZXACp7oQmkNNMA="; + hash = "sha256-gWvZSIqUy6eNk+GrtYAA6CZvqcwqqczdbrBpasskAFs="; }; + nativeBuildInputs = [ + setuptools + ]; + + # tests in passthru, infinite recursion via objgraph/graphviz + doCheck = false; + nativeCheckInputs = [ objgraph psutil - pytestCheckHook + unittestCheckHook ]; - doCheck = false; # installed tests need to be executed, not sure how to accomplish that + preCheck = '' + pushd ${placeholder "out"}/${python.sitePackages} + ''; + + unittestFlagsArray = [ + "greenlet.tests" + ]; + + postCheck = '' + popd + ''; + + passthru.tests.pytest = greenlet.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { + changelog = "https://github.com/python-greenlet/greenlet/blob/${version}/CHANGES.rst"; homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = with licenses; [ @@ -34,4 +58,5 @@ buildPythonPackage rec { mit ]; }; -} +}; +in greenlet diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 314a2249cdbd1..63d985326efcf 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.9"; + version = "0.38.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5j6boIy2LnB3Y0ZzheTdflON8KaQkeQS5vkaPIsETGk="; + hash = "sha256-GhohFO5tHb9ByISPUf4U2MrDATE4WjuekcC9QZaP2Ls="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index ce1a78f02cfd0..4c028e4ec71c1 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.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-B9WGI/J77PGGyGLLrn39elS9Y/SzdZTHfIuPyTPxHC8="; + hash = "sha256-4CIcpupsITlhQXmAi4+LMjA30LG977D8TN2agUmZVx4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index c03c1faa9d4f2..e7d6fd550958a 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C0LnDAQFpmqC2emGf6JV/lnmGJZKYJmyBWjDHdkJl2Y="; + hash = "sha256-+TucM+CiYWLvhDG/z/zD4fshfM2Ne1swYbbp+BPmmLU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 904c0b24a0abb..bb3024d440767 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ABZMp+VTsyf2HE50cnHf9wdCOeGlAqpbuMWlbsWE/qY="; + hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 285f3477deaaf..cd0b0abcb1210 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-b02AzrWR4xyk3O7HR9vlYTLhOSoKm7HI/gAdG1ysiYo="; + hash = "sha256-qkAY8thmKsTZgwRF09JToRs+CW6K/iCGVUcTeqEWDpM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 013662314b72b..7b052fa429c2f 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -39,7 +39,7 @@ buildPythonPackage { postPatch = '' substituteInPlace setup.py \ --replace 'add_include_dirs = [".", "libgumath", "ndtypes/python/ndtypes", "xnd/python/xnd"] + INCLUDES' \ - 'add_include_dirs = [".", "${libndtypes}/include", "${libxnd}/include", "${libgumath}/include"]' \ + 'add_include_dirs = [".", "${libndtypes.dev}/include", "${libxnd}/include", "${libgumath}/include"]' \ --replace 'add_library_dirs = ["libgumath", "ndtypes/libndtypes", "xnd/libxnd"] + LIBS' \ 'add_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' \ --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 47096022d1f43..7cb78248c172a 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.10.0"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+D9gl2Q1NybL8Na9qDZpDZOBStzJcfE6IUKFwjzr1J0="; + hash = "sha256-ZwImkTYYSscmGJYCpMWmZjToi41XjT4Znpo8j66BKIs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 653bf6a4b1e35..620883eb6cd15 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.11.0"; + version = "2023.11.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QslmtmS7zrc0Vbq4XEzbx1XaeL0SuhNjyT3OPlCCf04="; + hash = "sha256-C8KznmR3+G38MLQj6Sek7qW9R9yJr8gfcjgNjDyXG7I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 336f8ed962c31..1e460fa3c7fae 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.31.0"; + version = "1.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; + hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 75d8a4a990cef..89f01e29d46d7 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index 92966821d4bb4..cea6592b42b80 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hledger-utils"; - version = "1.13.2"; + version = "1.14.0"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nobodyinperson"; repo = "hledger-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; + hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix new file mode 100644 index 0000000000000..5c099d91d436f --- /dev/null +++ b/pkgs/development/python-modules/httpx-auth/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, wheel +, httpx +, pyjwt +, pytest-httpx +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "httpx-auth"; + version = "0.18.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Colin-b"; + repo = "httpx_auth"; + rev = "refs/tags/v${version}"; + hash = "sha256-kK31jpS9Ax5kNkvUSbWWIC6CKdZKVJ28kLS0iuntWqg="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pyjwt + pytest-httpx + pytestCheckHook + ]; + + pythonImportsCheck = [ "httpx_auth" ]; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Authentication classes to be used with httpx"; + homepage = "https://github.com/Colin-b/httpx_auth"; + changelog = "https://github.com/Colin-b/httpx_auth/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} 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 e8671529be3f3..9aac09e8bff30 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -7,20 +7,25 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.17.2"; - format = "setuptools"; + version = "3.18.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lIpUG/Z8pVdQnSBvWyaAxfBxhyQQDBKRSi/zr3qtSV0="; + hash = "sha256-vytpQHYZcMFLU/yPwTWvVnxYuXCdsyFL5AOjg91Ryrs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyjwt python-dateutil @@ -51,6 +56,8 @@ buildPythonPackage rec { disabledTestPaths = [ "test/test_container_token_manager.py" + # Tests require credentials + "test_integration/" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix index 251f13727895b..ffc0335761b37 100644 --- a/pkgs/development/python-modules/iceportal/default.nix +++ b/pkgs/development/python-modules/iceportal/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "iceportal"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-iceportal"; rev = "refs/tags/${version}"; - hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c="; + hash = "sha256-s+jEpxKsa3eIV4a/Ltso51jqZC4jzsvPLTjDFMV9FIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 77565311efbfe..76e1814dddddb 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -50,6 +50,13 @@ buildPythonPackage rec { # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" + # those tests seems to simply re-run some typeguard tests + "tests/test_typeguard.py" + ]; + + pytestFlagsArray = [ + # RuntimeWarning: coroutine '*' was never awaited + "-W" "ignore::RuntimeWarning" ]; pythonImportsCheck = [ "icontract" ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index d53408aa1aca2..d754f90318cfb 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.31"; + version = "2.5.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rov80COnU8e6NXwHkafGGbJyhDTMLUSwxkmjmlw8QYU="; + hash = "sha256-fKcxK11IxC0wmpPdyGzYQViSW2rx1v9Bvc+uBvGT8kE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 083170fd438b7..7a5aaaf81e68e 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -3,48 +3,104 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, isPyPy , substituteAll -, imageio-ffmpeg + +# build-system +, setuptools + +# native dependencies +, libGL + +# dependencies , numpy , pillow + +# optional-dependencies +, astropy +, av +, imageio-ffmpeg +, pillow-heif , psutil -, pytestCheckHook , tifffile + +# tests +, pytestCheckHook , fsspec -, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.31.3"; - format = "setuptools"; + version = "2.32.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dMaoMtgbetWoqAl23qWO4DPT4rmaVJkMvXibTLCzFGE="; + hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ + # pillow 10.1.0 compat + (fetchpatch { + name = "imageio-pillow-10.1.0-compat.patch"; + url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch"; + hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA="; + }) + ] ++ lib.optionals (!stdenv.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - imageio-ffmpeg numpy pillow ]; + passthru.optional-dependencies = { + bsdf = []; + dicom = []; + feisem = []; + ffmpeg = [ + imageio-ffmpeg + psutil + ]; + fits = lib.optionals (!isPyPy) [ + astropy + ]; + freeimage = []; + lytro = []; + numpy = []; + pillow = []; + simpleitk = []; + spe = []; + swf = []; + tifffile = [ + tifffile + ]; + pyav = [ + av + ]; + heif = [ + pillow-heif + ]; + }; + nativeCheckInputs = [ fsspec psutil pytestCheckHook - tifffile - ]; + ] + ++ fsspec.optional-dependencies.github + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "-m 'not needs_internet'" diff --git a/pkgs/development/python-modules/imgtool/default.nix b/pkgs/development/python-modules/imgtool/default.nix new file mode 100644 index 0000000000000..54bd8026d9a66 --- /dev/null +++ b/pkgs/development/python-modules/imgtool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, cbor2 +, click +, cryptography +, intelhex +, pyyaml +}: + +buildPythonPackage rec { + pname = "imgtool"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-elQSVeae7B8Sqjjc4fHU/iDYISZ3xoqbbsY0ypGgZhI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cbor2 + click + cryptography + intelhex + pyyaml + ]; + + pythonImportsCheck = [ + "imgtool" + ]; + + meta = with lib; { + description = "MCUboot's image signing and key management"; + homepage = "https://github.com/mcu-tools/mcuboot"; + license = licenses.asl20; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index d9293e0734801..203aa49db8fb6 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -27,7 +27,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.19"; + version = "0.4.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-l5uLPqhg/hqtO9oJSaioow5cH/0jKHDVziGezkfnVcc="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -108,6 +108,10 @@ buildPythonPackage rec { "test_device_put" "test_make_array_from_callback" "test_make_array_from_single_device_arrays" + + # Fails on some hardware due to some numerical error + # See https://github.com/google/jax/issues/18535 + "testQdwhWithOnRankDeficientInput5" ]; disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index ba3a6adffb748..4030bd5e4041d 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.19"; + version = "0.4.20"; inherit (python) pythonVersion; @@ -60,65 +60,65 @@ let "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp39"; - hash = "sha256-8bTrWutuK0qVnbkcwMfgBf414YdaLc3GK5IsCm/JNPE="; + hash = "sha256-eIE+rz5x5BEkO85zncIWE8p/wDPxV8bnVJdHiknS998="; }; "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp39"; - hash = "sha256-Tmv2iOqlNbZqw/rYjef6GmM0N18EA5JTt6T3lQe+4Rs="; + hash = "sha256-dxInv8/aQiHsN7DpScuZao2ZyHDjF0AaTqUDA0qqg/M="; }; "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp39"; - hash = "sha256-mDT1INLqPdCkxtMMFR0qHLOIZdWEy8Iuzw1/vOoECsA="; + hash = "sha256-wva6LkSokEHN+WQLCancVC7YBIxfImPsQpB1LzFcyqM="; }; "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ksnY+CPEstact5lKjbSg+ZSPJtSt0Y0NFWEFufBCByk="; + hash = "sha256-Yo2TYnkIelyy4vb5+nC/yY8SjV34i/jJvCe/VRQppmo="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-O7dHvdKLKfNELGfF4TKy7N5EX6Ca7Zu8OtLXWvFykR8="; + hash = "sha256-ufA/ACE4s4R/Fiq5SN7T44SVEN1Z5OfkJ/98lKxRFmo="; }; "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp310"; - hash = "sha256-gqKMUZSXrt8sQtTAoQbzAfCzO8gM9Y1/tZpuJVWyN0Y="; + hash = "sha256-hBSrYQyOGMn0BexRWQKYnJdEYYlzHUWuWGHmjVT10TE="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-m+NDzwXMNboNjDl2nLY+vqAoN2dQJZVWb1UQDpqqDPw="; + hash = "sha256-5N0nghTBrsa7d8kt8hZC2ghqlxCNC7U8ApD0PG7DHn8="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-zCOAjaWWCQT9Jnm1jjc1Rh5gemqy7ACtTKLM0MqSJzM="; + hash = "sha256-j13Br64cKe0hFh/cMBbOMuTXqauAvSKE+KzEmN7U6RA="; }; "3.11-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp311"; - hash = "sha256-gOLIxkk+2hew2GqWu1WgMVEx1YEutx7Zod7QbwsuUVQ="; + hash = "sha256-nTnyawU4Ngq9VTE6oDuEfR6iJPRy+E/VLt98cU6eW4M="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-BZTmkgNuV4nWtfbY4t/19aP43szZQEdgpFXh5qwGRXk="; + hash = "sha256-qPMoa7cso7DRBWuCJQoiOEzLPL3m76MPZZMYmZUj400="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-aAMTrLXU9EYwPv+kdeyI88/D7b4NANB39Fn8vuXUqFA="; + hash = "sha256-VqTC5egDHaDIvwVa3sAc9Sdtd0CwEFcXjDU/i54h844="; }; "3.12-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp312"; - hash = "sha256-KHzlIfa9KtYcHX+i/F/SKaYTpD4/XjHVu5j3BdRTUmc="; + hash = "sha256-1F98Je2rMJJKrksI/EVAsX9n+dOpmDehUeAaMq/BY7o="; }; }; @@ -128,19 +128,19 @@ let gpuSrcs = { "3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-WB5Vbr/XeYKXCP/3DIXF20jR6/1xE3huX1h5ow8ETl0="; + hash = "sha256-VM2HuyMnG+hzrsTQEB5KJpqpBXyyp+eV1LVxmY1ZCGU="; }; "3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-zfN0n31+5GohwBkeQrqHus4qOyhM/GEdqG6KUupCZ4o="; + hash = "sha256-TLq3z3T2fjTcO3ESahboKG33mrOpjtj9C92f4d4nJKo="; }; "3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-Q8ZtF2GCrG30GFbCeCZTWPmW2TBybeXzh2u+NRiYpx4="; + hash = "sha256-CUXwyJq0HOo2j3Sw+NguBCnFkDuJpc3wfZUc90yyhOY="; }; "3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-lphkSDOJ9SwbO0hp/xC1bYn5fWgth9A9Iwsc9zV0buI="; + hash = "sha256-bAR8FLtiqufU+rL2a1q9c61CjH1eXxGTNGnDUkHlDBA="; }; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index f1cda9c58eae0..c70ab0ac2b327 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.19"; + version = "0.4.20"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -95,7 +95,6 @@ let "absl_py" "astor_archive" "astunparse_archive" - "boringssl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -137,8 +136,8 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.targetPlatform.linuxArch; + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else stdenv.hostPlatform.linuxArch; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -151,7 +150,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-l5uLPqhg/hqtO9oJSaioow5cH/0jKHDVziGezkfnVcc="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -220,7 +219,7 @@ let build --python_path="${python}/bin/python" build --distinct_host_configuration=false build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) '' + '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' build --config=avx_posix '' + lib.optionalString mklSupport '' build --config=mkl_open_source_only @@ -264,10 +263,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-Hw4uFvltH7nlNN3qAEcQ+IR2FAOjRkvwyWA3rCPi7Vo="; + x86_64-linux = "sha256-QczClHxHElLZCqIZlHc3z3DXJ7rZQJaMs2XIb+lxarI="; } else { - x86_64-linux = "sha256-LEugnFwTV3EyeTZWgMvXzHbgeDPdmuT3daXCXJRMYVY="; - aarch64-linux = "sha256-59rv/3RjD8pnveBDZ33xZoNQxLmnhMocsKMgVfYoO70="; + x86_64-linux = "sha256-mqiJe4u0NYh1PKCbQfbo0U2e9/kYiBqj98d+BPHFSxQ="; + aarch64-linux = "sha256-EuLqamVBJ+qoVMCFIYUT846AghltZolfLGdtO9UeXSM="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; @@ -293,25 +292,19 @@ let --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ --replace "/usr/bin/libtool" "${cctools}/bin/libtool" - '' + (if stdenv.cc.isGNU then '' - sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); + ''; }; inherit meta; }; platformTag = - if stdenv.targetPlatform.isLinux then + if stdenv.hostPlatform.isLinux then "manylinux2014_${arch}" else if stdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" else if stdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.targetPlatform}"; + else throw "Unsupported target platform: ${stdenv.hostPlatform}"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 5f802767c83ad..eb90d3c907ed3 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,16 +3,22 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, parso + +# tests , attrs -, django_3 , pytestCheckHook -, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,15 +26,20 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; + hash = "sha256-MD7lIKwAwULZp7yLE6jiao2PU6h6RIl0SQ/6b4Lq+9I="; fetchSubmodules = true; }; - propagatedBuildInputs = [ parso ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + parso + ]; nativeCheckInputs = [ attrs - django_3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 4d0831ff97958..7283eaed4434a 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 06f5cc6bbd9a4..6261303981217 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -205,7 +205,6 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 7c0522c754016..fc534f9e67f61 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -1,34 +1,41 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , git , jupyter-server -, jupyter-packaging +, hatch-jupyter-builder +, hatch-nodejs-version +, hatchling , jupyterlab , nbdime , nbformat , pexpect , pytest-asyncio +, pytest-jupyter , pytest-tornasync , pytestCheckHook , pythonOlder +, traitlets }: buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.42.0"; + version = "0.50.0rc0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - hash = "sha256-GFnox6KnwKWFqsUWY0QYzMShXlH9KFSY3rRJA4RAiCk="; + hash = "sha256-euo8j7jt6oUJfZMF3VnbuM4uhibv+eijiXPO4UwZCiU="; }; nativeBuildInputs = [ - jupyter-packaging + hatch-jupyter-builder + hatch-nodejs-version + hatchling + jupyterlab ]; propagatedBuildInputs = [ @@ -37,17 +44,20 @@ buildPythonPackage rec { git nbformat pexpect + traitlets ]; nativeCheckInputs = [ jupyterlab pytest-asyncio + pytest-jupyter pytest-tornasync pytestCheckHook ]; - # All Tests on darwin fail or are skipped due to sandbox - doCheck = !stdenv.isDarwin; + preCheck = '' + export HOME=$TMPDIR + ''; disabledTestPaths = [ "jupyterlab_git/tests/test_handlers.py" @@ -67,6 +77,8 @@ buildPythonPackage rec { "jupyterlab_git" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Jupyter lab extension for version control with Git"; homepage = "https://github.com/jupyterlab/jupyterlab-git"; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index f2fb806f47501..cdab3aac8ff4c 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-FJHfgmz8UXjIDz6J3W37po5ITvM024EHDrXLgJSzEWc="; + hash = "sha256-C7LieGRNEd6mJywXl0o9u5aIqUnzu2CutbeRMpxE+tw="; }; propagatedBuildInputs = [ @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Messaging library for Python"; homepage = "https://github.com/celery/kombu"; - changelog = "https://github.com/celery/kombu/releases/tag/v${version}"; + changelog = "https://github.com/celery/kombu/blob/v${version}/Changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index eb99c9b2b89d7..555cc9e4795e1 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { description = "Python toolkit for working with and comparing the standardized codes for languages"; homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/latexify-py/default.nix b/pkgs/development/python-modules/latexify-py/default.nix index cecba90e33ea5..f56055e55fd78 100644 --- a/pkgs/development/python-modules/latexify-py/default.nix +++ b/pkgs/development/python-modules/latexify-py/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "latexify-py"; - version = "0.3.1"; - format = "pyproject"; + version = "0.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "google"; repo = "latexify_py"; rev = "refs/tags/v${version}"; - hash = "sha256-uWSLs7Dem+cj93RWIincCXzPkjZUwQskpDac/L+fgjQ="; + hash = "sha256-sxXfm4zJJT+94jcSsYH7Ky3XwFOniSNxvcVUAsgz8u0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix new file mode 100644 index 0000000000000..24d0e287ea030 --- /dev/null +++ b/pkgs/development/python-modules/libclang/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, llvmPackages +, setuptools +, writeText +}: + +let + libclang = llvmPackages.libclang; + + pyproject_toml = writeText "pyproject.toml" '' + [build-system] + requires = ["setuptools>=42", "wheel"] + build-backend = "setuptools.build_meta" + ''; + + setup_cfg = writeText "setup.cfg" '' + [metadata] + name = clang + version = ${libclang.version} + + [options] + packages = clang + ''; +in buildPythonPackage { + pname = "libclang"; + format = "pyproject"; + + inherit (libclang) version src; + + buildInputs = [ setuptools ]; + + postUnpack = '' + # set source root to python bindings + if [ -e "$sourceRoot/clang/bindings/python" ]; then + # LLVM 13+ puts clang sources in subdirectory instead of plain tarball + sourceRoot="$sourceRoot/clang/bindings/python" + else + sourceRoot="$sourceRoot/bindings/python" + fi + ''; + + postPatch = '' + # link in our own build info to build as a python package + ln -s ${pyproject_toml} ./pyproject.toml + ln -s ${setup_cfg} ./setup.cfg + + # set passed libclang for runtime + echo 'Config.set_library_path("${lib.getLib libclang}/lib")' >>./clang/cindex.py + ''; + + meta = libclang.meta // { + description = "Python bindings for the C language family frontend for LLVM"; + maintainers = with lib.maintainers; [ lilyinstarlight ]; + }; +} diff --git a/pkgs/development/python-modules/libpcap/default.nix b/pkgs/development/python-modules/libpcap/default.nix index 1dbc2de90dfbc..d094e7715fcaf 100644 --- a/pkgs/development/python-modules/libpcap/default.nix +++ b/pkgs/development/python-modules/libpcap/default.nix @@ -7,7 +7,6 @@ , pkgsLibpcap , pkg-about , setuptools -, tox }: buildPythonPackage rec { @@ -25,10 +24,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - tox ]; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml cat <<EOF >src/libpcap/libpcap.cfg [libpcap] LIBPCAP = ${pkgsLibpcap}/lib/libpcap${stdenv.hostPlatform.extensions.sharedLibrary} diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index e03e005ad7b23..65d5f064ce575 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; + hash = "sha256-lp/+ArgoMIa7Q2ufWghr8OYUMlFcj8123Et73ORNI5U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix new file mode 100644 index 0000000000000..59c02c4660935 --- /dev/null +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "linknlink"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "xuanxuan000"; + repo = "python-linknlink"; + rev = "refs/tags/${version}"; + hash = "sha256-pr0FwNweg7hFcvaOHQyXjIzH1L6Q4q/1llwfdl9k0Sk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + pythonImportsCheck = [ + "linknlink" + ]; + + # Module has no test + doCheck = false; + + meta = with lib; { + description = "Module and CLI for controlling Linklink devices locally"; + homepage = "https://github.com/xuanxuan000/python-linknlink"; + changelog = ""; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch new file mode 100644 index 0000000000000..cef7fba13343e --- /dev/null +++ b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch @@ -0,0 +1,34 @@ +diff --git a/llm/cli.py b/llm/cli.py +index af37feb..18b078a 100644 +--- a/llm/cli.py ++++ b/llm/cli.py +@@ -1014,18 +1014,7 @@ def templates_path(): + ) + def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + """Install packages from PyPI into the same environment as LLM""" +- args = ["pip", "install"] +- if upgrade: +- args += ["--upgrade"] +- if editable: +- args += ["--editable", editable] +- if force_reinstall: +- args += ["--force-reinstall"] +- if no_cache_dir: +- args += ["--no-cache-dir"] +- args += list(packages) +- sys.argv = args +- run_module("pip", run_name="__main__") ++ click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.") + + + @cli.command() +@@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation") + def uninstall(packages, yes): + """Uninstall Python packages from the LLM environment""" +- sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else []) +- run_module("pip", run_name="__main__") ++ click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.") + + + @cli.command() diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix new file mode 100644 index 0000000000000..318f673533089 --- /dev/null +++ b/pkgs/development/python-modules/llm/default.nix @@ -0,0 +1,107 @@ +{ + buildPythonApplication, + buildPythonPackage, + fetchFromGitHub, + lib, + makeWrapper, + pytestCheckHook, + python3, + pythonOlder, + ruff, + setuptools, +}: let + llm = buildPythonPackage rec { + pname = "llm"; + version = "0.12"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-aCqdw2co/cXrBwVY/k/aSLl3C22nlH5LvU2yir1/NnQ="; + }; + + patches = [ + ./001-disable-install-uninstall-commands.patch + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click-default-group + numpy + openai + pluggy + pydantic + python-ulid + pyyaml + setuptools # for pkg_resources + sqlite-migrate + sqlite-utils + ]; + + nativeCheckInputs = with python3.pkgs; [ + cogapp + numpy + pytestCheckHook + requests-mock + ]; + + doCheck = true; + + pytestFlagsArray = [ + "-svv" + "tests/" + ]; + + pythonImportsCheck = [ + "llm" + ]; + + passthru = {inherit withPlugins;}; + + meta = with lib; { + homepage = "https://github.com/simonw/llm"; + description = "Access large language models from the command-line"; + changelog = "https://github.com/simonw/llm/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "llm"; + maintainers = with maintainers; [aldoborrero]; + }; + }; + + withPlugins = plugins: buildPythonApplication { + inherit (llm) pname version; + format = "other"; + + disabled = pythonOlder "3.8"; + + dontUnpack = true; + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + makeWrapper ${llm}/bin/llm $out/bin/llm \ + --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + ln -sfv ${llm}/lib $out/lib + ''; + + propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; + + passthru = llm.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + + inherit (llm) meta; + }; +in + llm diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index fa711c1b4cc67..2f234cc635425 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; + # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c++14"; + }; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 587dc99080a94..8b069fd235a39 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { homepage = "https://github.com/kmike/marisa-trie"; changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e95cbe3c4c101..e0e41bf3d0a0e 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { patches = [ # Fixes a bug with markdown>2.4 + # https://github.com/wnielson/markdown-macros/pull/1 (fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + name = "wnielson-markdown-macros-pull-1.patch"; + url = "https://github.com/wnielson/markdown-macros/commit/e38cba9acb6789cc128f6fe9ca427ba71815a20f.patch"; sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; }) ]; diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index dc786ac6d7d68..a34f98cdae39f 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , envisage , fetchPypi +, fetchpatch , numpy , packaging , pyface @@ -26,6 +27,24 @@ buildPythonPackage rec { hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; + patches = [ + # Adds compatibility with Python 3.11. + # https://github.com/enthought/mayavi/pull/1199 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch"; + hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0="; + includes = [ "tvtk/src/*" ]; + }) + # Fixes an incompatible function pointer conversion error + # https://github.com/enthought/mayavi/pull/1266 + (fetchpatch { + name = "incompatible-pointer-conversion.patch"; + url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch"; + hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo="; + }) + ]; + postPatch = '' # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 800fc6227b018..18aeac19b3caa 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.2.0"; + version = "8.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc="; + hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/pkgs/development/python-modules/mdformat-frontmatter/default.nix index b073bb83a595c..333cb56511302 100644 --- a/pkgs/development/python-modules/mdformat-frontmatter/default.nix +++ b/pkgs/development/python-modules/mdformat-frontmatter/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "mdformat-frontmatter"; - version = "2.0.1"; - format = "pyproject"; + version = "2.0.8"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "butler54"; - repo = pname; + repo = "mdformat-frontmatter"; rev = "refs/tags/v${version}"; - hash = "sha256-PhT5whtvvcYSs5gHQEsIvV1evhx7jR+3DWFMHrF0uMw="; + hash = "sha256-2heQw8LL/ILY36oItBeQq33qjVBGT51qGG4CcCEDutA="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "mdformat plugin to ensure frontmatter is respected"; homepage = "https://github.com/butler54/mdformat-frontmatter"; + changelog = "https://github.com/butler54/mdformat-frontmatter/blob/v{version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero polarmutex ]; }; diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index e8efd7bac91c0..8b5db005eddfa 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "1.0.4"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mGWeG8clWJ7obsvO+gYaVzfAyDOh9HNdyWW5KgOgfmM="; + hash = "sha256-l4B/DR0pKZG62+sBG+fiux/XeF3ewxb2TYa+Zs1O3kU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix new file mode 100644 index 0000000000000..ad20cdbf06711 --- /dev/null +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, llvmPackages +, zlib +, cython +, oldest-supported-numpy +, setuptools +, wheel +, astunparse +, numpy +, pyparsing +, scipy +, gsd +, networkx +, pandas +, pytest-xdist +, pytestCheckHook +, tables +}: + +buildPythonPackage rec { + pname = "mdtraj"; + version = "1.9.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mdtraj"; + repo = "mdtraj"; + rev = "refs/tags/${version}"; + hash = "sha256-2Jg6DyVJlRBLD/6hMtcsrAdxKF5RkpUuhAQm/lqVGeE="; + }; + + patches = [ + (fetchpatch { + name = "gsd_3-compatibility.patch"; + url = "https://github.com/mdtraj/mdtraj/commit/81209d00817ab07cfc4668bf5ec88088d16904c0.patch"; + hash = "sha256-ttNmij7csxF0Z5wPPwhGumRX055W2IgFjRAe6nI6GNY="; + }) + ]; + + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + wheel + ]; + + buildInputs = [ + zlib + ] ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + + propagatedBuildInputs = [ + astunparse + numpy + pyparsing + scipy + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-incompatible-function-pointer-types"; + + nativeCheckInputs = [ + gsd + networkx + pandas + pytest-xdist + pytestCheckHook + tables + ]; + + preCheck = '' + cd tests + export PATH=$out/bin:$PATH + ''; + + disabledTests = [ + # require network access + "test_pdb_from_url" + "test_1vii_url_and_gz" + + # fail due to data race + "test_read_atomindices_1" + "test_read_atomindices_2" + + # flaky test + "test_distances_t" + ]; + + pythonImportsCheck = [ "mdtraj" ]; + + meta = with lib; { + description = "An open library for the analysis of molecular dynamics trajectories"; + homepage = "https://github.com/mdtraj/mdtraj"; + changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${src.rev}"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 878f85600dd1d..e347aa107d7c7 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { homepage = "https://github.com/SamuraiT/mecab-python3"; changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index c97624c73c8a2..0720a290cb9cd 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.38.0"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0="; + hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 65702b23c7ad9..84fe78a594750 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./libportmidi-cdll.patch; - libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mitmproxy-macos/default.nix b/pkgs/development/python-modules/mitmproxy-macos/default.nix new file mode 100644 index 0000000000000..0ce125e691e1b --- /dev/null +++ b/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +}: + +buildPythonPackage rec { + pname = "mitmproxy-macos"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "mitmproxy_rs"; + rev = version; + hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI="; + }; + + sourceRoot = "${src.name}/mitmproxy-macos"; + pythonImportsCheck = [ "mitmproxy_macos" ]; + nativeBuildInputs = [ + hatchling + ]; + + meta = with lib; { + description = "The MacOS Rust bits in mitmproxy"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ boltzmannrain ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock index a09043a1cb2b2..3c0c5cc67535c 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock +++ b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock @@ -93,10 +93,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[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.37", +] + +[[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -390,11 +412,12 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console-api" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ - "prost 0.11.9", + "futures-core", + "prost", "prost-types", "tonic", "tracing-core", @@ -402,14 +425,14 @@ dependencies = [ [[package]] name = "console-subscriber" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb" +checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" dependencies = [ "console-api", "crossbeam-channel", "crossbeam-utils", - "futures", + "futures-task", "hdrhistogram", "humantime", "prost-types", @@ -770,9 +793,9 @@ 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", "futures-sink", @@ -780,9 +803,9 @@ dependencies = [ [[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" @@ -797,15 +820,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[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", @@ -814,21 +837,21 @@ dependencies = [ [[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-channel", "futures-core", @@ -1232,7 +1255,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd" [[package]] name = "macos-certificate-truster" -version = "0.3.11" +version = "0.4.1" dependencies = [ "apple-security-framework", ] @@ -1308,7 +1331,7 @@ dependencies = [ [[package]] name = "mitm-wg-test-client" -version = "0.3.11" +version = "0.4.1" dependencies = [ "anyhow", "boringtun", @@ -1319,7 +1342,7 @@ dependencies = [ [[package]] name = "mitmproxy" -version = "0.3.11" +version = "0.4.1" dependencies = [ "anyhow", "apple-security-framework", @@ -1334,7 +1357,7 @@ dependencies = [ "nix 0.27.1", "once_cell", "pretty-hex", - "prost 0.12.1", + "prost", "rand", "rand_core", "smoltcp", @@ -1346,7 +1369,7 @@ dependencies = [ [[package]] name = "mitmproxy_rs" -version = "0.3.11" +version = "0.4.1" dependencies = [ "anyhow", "boringtun", @@ -1630,35 +1653,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", - "prost-derive 0.12.1", -] - -[[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", + "prost-derive", ] [[package]] @@ -1676,11 +1676,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ - "prost 0.11.9", + "prost", ] [[package]] @@ -1736,9 +1736,9 @@ dependencies = [ [[package]] name = "pyo3-log" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605" +checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" dependencies = [ "arc-swap", "log", @@ -2205,9 +2205,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2256,9 +2256,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", @@ -2279,16 +2279,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ + "async-stream", "async-trait", "axum", "base64 0.21.4", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -2296,7 +2295,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.11.9", + "prost", "tokio", "tokio-stream", "tower", @@ -2622,7 +2621,7 @@ dependencies = [ [[package]] name = "windows-redirector" -version = "0.3.11" +version = "0.4.1" dependencies = [ "anyhow", "env_logger", @@ -2631,7 +2630,7 @@ dependencies = [ "log", "lru_time_cache", "mitmproxy", - "prost 0.12.1", + "prost", "tokio", "windivert", "winres", diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix index 15850ab7cd784..33b0d7acee18c 100644 --- a/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -4,18 +4,20 @@ , fetchFromGitHub , rustPlatform , darwin +, libiconv +, mitmproxy-macos }: buildPythonPackage rec { pname = "mitmproxy-rs"; - version = "0.3.11"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy_rs"; rev = version; - hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw="; + hash = "sha256-Vc7ez/W40CefO2ZLAHot14p478pDPtQor865675vCtI="; }; cargoDeps = rustPlatform.importCargoLock { @@ -34,13 +36,15 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + libiconv + mitmproxy-macos ]; pythonImportsCheck = [ "mitmproxy_rs" ]; meta = with lib; { description = "The Rust bits in mitmproxy"; - homepage = " https://github.com/mitmproxy/mitmproxy_rs"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs"; changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/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 1c57361a64068..e8c941fb950a2 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , pythonOlder @@ -15,6 +16,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-macos , mitmproxy-rs , msgpack , passlib @@ -42,19 +44,19 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.1.1"; - disabled = pythonOlder "3.9"; + version = "10.1.5"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-/ouMj7UVowvzwjOuusgVfXjvjNPKpuJUuoJf6Sl9P44="; + hash = "sha256-WtZ5KPkTjYMCjrghVcihxuQ2cS88OOCbMYHfqzeo4qQ="; }; propagatedBuildInputs = [ - setuptools aioquic asgiref blinker @@ -71,16 +73,19 @@ buildPythonPackage rec { msgpack passlib protobuf - pyopenssl publicsuffix2 + pyopenssl pyparsing pyperclip ruamel-yaml + setuptools sortedcontainers tornado urwid wsproto zstandard + ] ++ lib.optionals stdenv.isDarwin [ + mitmproxy-macos ]; nativeCheckInputs = [ @@ -109,10 +114,12 @@ buildPythonPackage rec { "test_flowview" # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrip_big_integer" - "test_wireguard" "test_commands_exist" "test_statusbar" + # AssertionError: Playbook mismatch! + "test_untrusted_cert" + "test_mitmproxy_ca_is_untrusted" ]; disabledTestPaths = [ @@ -127,6 +134,7 @@ buildPythonPackage rec { meta = with lib; { description = "Man-in-the-middle proxy"; homepage = "https://mitmproxy.org/"; + changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kamilchm SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 49125a286e90b..41789a796dd1f 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,37 +1,51 @@ { lib -, aiohttp -, asgiref , buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv + +# build-system +, hatchling + +# dependencies , decorator +, httptools +, python-magic +, urllib3 + +# optional-dependencies +, xxhash +, pook + +# tests +, aiohttp +, asgiref , fastapi -, fetchPypi , gevent -, httptools , httpx -, isPy3k -, pook -, pytest-mock +, pytest-asyncio , pytestCheckHook -, python-magic -, pythonOlder , redis +, redis-server , requests , sure -, urllib3 + }: buildPythonPackage rec { pname = "mocket"; - version = "3.11.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sEPLUN9nod4AKYcoCNQZ4FBblUCLCPV1dFOrNC6xDWo="; + hash = "sha256-brvBWwTWT2F/usVBRr7wz9L0kct4X1Fddl4mu5LUENA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator httptools @@ -43,52 +57,58 @@ buildPythonPackage rec { pook = [ pook ]; + speedups = [ + xxhash + ]; }; nativeCheckInputs = [ - aiohttp asgiref fastapi gevent httpx - pytest-mock + pytest-asyncio pytestCheckHook redis requests sure - ] ++ passthru.optional-dependencies.pook; + ] ++ lib.optionals (pythonOlder "3.12") [ + aiohttp + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Skip http tests - SKIP_TRUE_HTTP = true; + preCheck = lib.optionalString stdenv.isLinux '' + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; - disabledTestPaths = [ - # Requires a live Redis instance - "tests/main/test_redis.py" - ]; + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; + + # Skip http tests, they require network access + env.SKIP_TRUE_HTTP = true; + + _darwinAllowLocalNetworking = true; disabledTests = [ # tests that require network access (like DNS lookups) - "test_truesendall" - "test_truesendall_with_chunk_recording" - "test_truesendall_with_gzip_recording" - "test_truesendall_with_recording" - "test_wrongpath_truesendall" "test_truesendall_with_dump_from_recording" - "test_truesendall_with_recording_https" - "test_truesendall_after_mocket_session" - "test_real_request_session" "test_asyncio_record_replay" "test_gethostbyname" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/main/test_redis.py" + ]; + pythonImportsCheck = [ "mocket" ]; meta = with lib; { + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; - changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 318bd9a00bbda..a5bb698aa1af3 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.4.1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM="; + hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "mopeka_iot_ble" ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 73e95a6e1eadd..2dc5bd55ee731 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,54 +1,55 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder -# build +# build-system , setuptools -# runtime -, aws-xray-sdk +# dependencies , boto3 , botocore -, cfn-lint , cryptography +, jinja2 +, python-dateutil +, requests +, responses +, werkzeug +, xmltodict + +# optional-dependencies +, aws-xray-sdk +, cfn-lint , docker +, ecdsa , flask , flask-cors , graphql-core -, idna -, jinja2 , jsondiff +, multipart , openapi-spec-validator +, py-partiql-parser , pyparsing -, python-dateutil , python-jose , pyyaml -, requests -, responses , sshpubkeys -, werkzeug -, xmltodict # tests , freezegun -, py-partiql-parser , pytestCheckHook , pytest-xdist -, sure }: buildPythonPackage rec { pname = "moto"; - version = "4.2.2"; - format = "pyproject"; + version = "4.2.6"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7jTEw/U5ANlTGAlGkgyduhJ6SD4u1A5tv5PUri52Dnw="; + hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk="; }; nativeBuildInputs = [ @@ -56,114 +57,91 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aws-xray-sdk boto3 botocore - cfn-lint cryptography - docker - flask - flask-cors - graphql-core - idna - jinja2 - jsondiff - openapi-spec-validator - pyparsing - python-dateutil - python-jose - pyyaml requests - responses - sshpubkeys - werkzeug xmltodict + werkzeug + python-dateutil + responses + jinja2 ]; + passthru.optional-dependencies = { + # non-exhaustive list of extras, that was cobbled together for testing + all = [ + aws-xray-sdk + cfn-lint + docker + ecdsa + flask + flask-cors + graphql-core + jsondiff + multipart + openapi-spec-validator + py-partiql-parser + pyparsing + python-jose + pyyaml + setuptools + sshpubkeys + ] ++ python-jose.optional-dependencies.cryptography; + }; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ freezegun - py-partiql-parser pytestCheckHook - sure - ]; + pytest-xdist + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ - # Disable tests that try to access the network - "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" - "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" - "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" - "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" - "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" - "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" - "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" - "--deselect=tests/test_iotdata/test_iotdata.py::test_update" - "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" - "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" - "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests" + "-m" "'not network and not requires_docker'" + + # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers" - "--deselect=tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body" - "--deselect=tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" - # Disable tests that require docker daemon - "--deselect=tests/test_core/test_docker.py::test_docker_is_running_and_available" - "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" - "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" - "--deselect=tests/test_sqs/test_sqs_integration.py" - - # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) - "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + # Fails at resolving google.com + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - # AssertionError: CloudWatch log event was not found. - "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + # Download recordings returns faulty JSON + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" - # KeyError: 'global' - "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" - "--deselect=tests/test_iotdata/test_server.py::test_publish" + # Connection Reset by Peer, when connecting to localhost:5678 + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" - # Blocks test execution - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "--deselect=tests/test_utilities/test_threaded_server.py::test_threaded_moto_server__different_port" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable" + # Requires docker, but isn't marked + # https://github.com/getmoto/moto/pull/6938 + "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # AssertionError: expected `{0}` to be greater than `{1}` + # Racy, expects two timestamp two differ + # https://github.com/getmoto/moto/issues/6946 "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe" ]; disabledTestPaths = [ - # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 - "tests/test_sts/test_sts.py" + # Requires pytest-ordering, which is unmaintained + # https://github.com/getmoto/moto/issues/6937 # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_dynamodb/test_dynamodb_statements.py" + "tests/test_lakeformation/test_resource_tags_integration.py" "tests/test_redshiftdata/test_redshiftdata.py" + "tests/test_s3/test_s3_file_handles.py" + "tests/test_s3/test_s3.py" + "tests/test_s3/test_s3_select.py" + # Tries to access the network - "tests/test_appsync/test_appsync_schema.py" - "tests/test_awslambda/test_lambda_eventsourcemapping.py" - "tests/test_awslambda/test_lambda_invoke.py" "tests/test_batch/test_batch_jobs.py" - "tests/test_kinesis/test_kinesis.py" - "tests/test_kinesis/test_kinesis_stream_consumers.py" - ]; - disabledTests = [ - # only appears in aarch64 currently, but best to be safe - "test_state_machine_list_executions_with_filter" - # tests fail with 404 after Werkzeug 2.2 upgrade, see https://github.com/spulec/moto/issues/5341#issuecomment-1206995825 - "test_appsync_list_tags_for_resource" - "test_s3_server_post_to_bucket_redirect" + # Threading tests regularly blocks test execution + "tests/test_utilities/test_threaded_server.py" + "tests/test_s3/test_s3_bucket_policy.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix new file mode 100644 index 0000000000000..f0523c3594dcd --- /dev/null +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools +, fast-histogram +, matplotlib +, numpy +, wheel +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "mpl-scatter-density"; + version = "0.7"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MMxM+iv5p9ZLcBpqa3tBBPbsMM/PTg6BXaDpGgSw+DE="; + }; + + patches = [ + # https://github.com/astrofrog/mpl-scatter-density/pull/37 + (fetchpatch { + name = "distutils-removal.patch"; + url = "https://github.com/ifurther/mpl-scatter-density/commit/6feedabe1e82da67d8eec46a80eb370d9f334251.patch"; + sha256 = "sha256-JqWlSm8mIwqjRPa+kMEaKipJyzGEO+gJK+Q045N1MXA="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ matplotlib numpy fast-histogram ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + ]; + + disabledTests = [ + # AssertionError: (240, 240) != (216, 216) + # Erroneous pinning of figure DPI, sensitive to runtime environment + "test_default_dpi" + ]; + + pythonImportsCheck = [ "mpl_scatter_density" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/mpl-scatter-density"; + description = "Fast scatter density plots for Matplotlib"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index c956bb90aa8f8..3763e25660a53 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace mpv.py \ --replace "sofile = ctypes.util.find_library('mpv')" \ - 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; # tests impure, will error if it can't load libmpv.so diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 008ce7f2711e4..2ec32c255dfa2 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , oldest-supported-numpy , setuptools-scm , wheel @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; }; + patches = [ + # upstream patch fixes 2 failing unittests. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; + hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; + includes = [ "tests/test_ancestry.py" ]; + }) + ]; + nativeBuildInputs = [ gsl oldest-supported-numpy diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 1fcd7123ea75f..2e92fade6d430 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -41,6 +41,5 @@ buildPythonPackage rec { description = "Python library to perform OAuth handshakes with a MediaWiki installation"; homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index ba963ff0d5ddb..575c438eb5514 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { patches = [ # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. # This makes the installation with nixpkgs fail. I suspect, that's - # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # because stdenv.hostPlatform.darwinSdkVersion is (currently) set to # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 0e6b2204ddbb5..e485b768a7507 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pythonOlder , docutils @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; + patches = [ + (fetchpatch { + name = "myst-parser-sphinx7.2-compat.patch"; + url = "https://github.com/executablebooks/MyST-Parser/commit/4f670fc04c438b57a9d4014be74e9a62cc0deba4.patch"; + hash = "sha256-FCvFSsD7qQwqWjSW7R4Gx+E2jaGkifSZqaRbAglt9Yw="; + }) + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 75fc5373b4c5a..8bfe1347e6df3 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -12,12 +12,14 @@ buildPythonPackage { disabled = isPy27; inherit (libndtypes) version src meta; + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ numpy ]; postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libndtypes"]' \ - 'include_dirs = ["${libndtypes}/include"]' \ + 'include_dirs = ["${libndtypes.dev}/include"]' \ --replace 'library_dirs = ["libndtypes"]' \ 'library_dirs = ["${libndtypes}/lib"]' \ --replace 'runtime_library_dirs = ["$ORIGIN"]' \ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 9f00a33fdf6bd..f181a7d4c4fed 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -50,12 +51,16 @@ buildPythonPackage rec { NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR = netcdf; - CURL_DIR = curl.dev; - JPEG_DIR = libjpeg.dev; + env = { + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev hdf5; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + }; pythonImportsCheck = [ "netCDF4" ]; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 1612bfac0d96f..ac6da73af2abc 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -9,22 +9,27 @@ , pytest-error-for-skips , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nettigo-air-monitor"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aqipy-atmotech diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix index e3283a4eb9e2f..769750163663d 100644 --- a/pkgs/development/python-modules/newversion/default.nix +++ b/pkgs/development/python-modules/newversion/default.nix @@ -1,45 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , packaging , poetry-core , pytestCheckHook , pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "newversion"; - version = "1.8.2"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; - repo = pname; - rev = version; - hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; + repo = "newversion"; + rev = "refs/tags/${version}"; + hash = "sha256-v9hfk2/hBkWtOobQdaYXNOZTTcEqnMV6JYqtjjoidOs="; }; - patches = [ - # https://github.com/vemel/newversion/pull/9 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; - hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ @@ -53,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 440 version manager"; homepage = "https://github.com/vemel/newversion"; + changelog = "https://github.com/vemel/newversion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix index 280f36cc2e693..f9966b246602d 100644 --- a/pkgs/development/python-modules/nose3/default.nix +++ b/pkgs/development/python-modules/nose3/default.nix @@ -5,6 +5,7 @@ , isPyPy , isPy311 , python +, pythonAtLeast , stdenv }: @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "nose3"; version = "1.3.8"; + # https://github.com/jayvdb/nose3/issues/5 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 7252ce45b7113..263aebada6a55 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.6.0"; + version = "22.6.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ih6Uz7dTVMNCBsLcDsslyIzttg+IDBW3B+Ixpp7sz1Y="; + hash = "sha256-V70cFSfQ9SuLhCSUa8DuYA7qaabwiK9IbIkYcQMgVUk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 51a043b8d7f31..cbf8fa40d78ca 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -28,9 +28,9 @@ 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.0rc2"; + version = "0.58.1"; pname = "numba"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; @@ -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-ktFBjzd2vEahdr86lhVLVFEadCIhPP3hRF/EuZhHCC4="; + hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; }; 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 d2d85bddf3b6c..82ceee47d066d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,17 +2,28 @@ , stdenv , fetchPypi , python +, pythonAtLeast +, pythonOlder , buildPythonPackage +, writeTextFile + +# build-system +, cython_3 , gfortran +, meson-python +, pkg-config +, xcbuild + +# native dependencies +, blas +, lapack + +# tests , hypothesis +, pytest-xdist , pytestCheckHook +, setuptools , typing-extensions -, blas -, lapack -, writeTextFile -, cython -, pythonAtLeast -, pythonOlder }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -41,14 +52,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.2"; - format = "setuptools"; - disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + version = "1.26.1"; + pyproject = true; + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-/WCOGcjXxVAh3/1Dv+VJL6uMwQXMiYb4E/jDwEizh2A="; + hash = "sha256-yMbHLUqfgx8yjvsTEmQqHK+vqoiYHZq3Y2jVDQfZPL4="; }; patches = [ @@ -70,10 +81,23 @@ in buildPythonPackage rec { # error: option --single-version-externally-managed not recognized # TypeError: dist must be a Distribution instance rm numpy/core/tests/test_cython.py + + patchShebangs numpy/_build_utils/*.py ''; - nativeBuildInputs = [ gfortran cython ]; - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ + cython_3 + gfortran + meson-python + pkg-config + ] ++ lib.optionals (stdenv.isDarwin) [ + xcbuild.xcrun + ]; + + buildInputs = [ + blas + lapack + ]; # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; @@ -83,7 +107,6 @@ in buildPythonPackage rec { # see https://github.com/xianyi/OpenBLAS/issues/2993 preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; @@ -94,8 +117,10 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ + pytest-xdist pytestCheckHook hypothesis + setuptools typing-extensions ]; @@ -138,9 +163,10 @@ in buildPythonPackage rec { # Disable test # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; + env.NOSE_EXCLUDE = "test_large_file_support"; meta = { + changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index b2a8329538eba..7b1a3c60d628a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -67,6 +67,5 @@ 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; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 0a603b0b91c8d..7b948c4ffdf3d 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.13"; + version = "0.14"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-9ihqjnGdBPasiRD2pZeaiibwzFQKI9t+s/zMzvyLLHQ="; + hash = "sha256-P+uCoC2u5lR4oTtloNFd4N+CjssUa5PbzbnhEulaRoc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index 6d44c1a9ad3a8..479f2c8396486 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , fsspec , oci , pythonOlder @@ -8,18 +9,22 @@ buildPythonPackage rec { pname = "ocifs"; - version = "1.2.1"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "oracle"; - repo = pname; + repo = "ocifs"; rev = "refs/tags/${version}"; - hash = "sha256-HY2LTm3JckAzNMVuAJNs/0LixBwiG/QKa7ILquY0Q+c="; + hash = "sha256-ugNITi2tSf3lhbASgr6ErmFDYinQjnhmtRjV3YL7F9U="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ fsspec oci @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; + changelog = "https://github.com/oracle/ocifs/releases/tag/${version}"; license = with licenses; [ upl ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 05b71d2b45208..c6e16c25d52c2 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.3.1"; + version = "15.4.0"; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-Yngx9hH/4yftClNqM/yyrOCPH0+4Bl9GIEGjawLdy0s="; + hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 6e6a1f8d79a02..a1db7c690bcfa 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index e28d23e9..183cd918 100644 +index 92b73a0a..9f04555c 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -67,7 +67,7 @@ log.addFilter(DuplicateFilter(log)) +@@ -58,7 +58,7 @@ log.addFilter(DuplicateFilter(log)) # Ghostscript executable - gswin32c is not supported @@ -12,7 +12,7 @@ index e28d23e9..183cd918 100644 def version() -> Version: diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 28d3dd1c..477a7d6c 100644 +index 5a34a95a..5ee1b333 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py @@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run @@ -26,27 +26,27 @@ index 28d3dd1c..477a7d6c 100644 def available(): @@ -27,7 +27,7 @@ def available(): - def convert_group(*, cwd, infiles, out_prefix, threshold): + def convert_group(cwd, infiles, out_prefix, threshold): args = [ - 'jbig2', + '@jbig2@', '-b', out_prefix, '--symbol-mode', # symbol mode (lossy) -@@ -50,7 +50,7 @@ def convert_group_mp(args): +@@ -44,7 +44,7 @@ def convert_group(cwd, infiles, out_prefix, threshold): - def convert_single(*, cwd, infile, outfile, threshold): + def convert_single(cwd, infile, outfile, threshold): - args = ['jbig2', '--pdf', '-t', str(threshold), infile] + args = ['@jbig2@', '--pdf', '-t', str(threshold), infile] with open(outfile, 'wb') as fstdout: proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) proc.check_returncode() diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py -index 8425caec..a027f041 100644 +index 5b8600d0..fcad771b 100644 --- a/src/ocrmypdf/_exec/pngquant.py +++ b/src/ocrmypdf/_exec/pngquant.py -@@ -18,7 +18,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -15,7 +15,7 @@ from ocrmypdf.subprocess import get_version, run def version() -> Version: @@ -55,9 +55,9 @@ index 8425caec..a027f041 100644 def available(): -@@ -45,7 +45,7 @@ def input_as_png(input_file: Path): - def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int): - with input_as_png(input_file) as input_stream: +@@ -37,7 +37,7 @@ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: + """ + with open(input_file, 'rb') as input_stream: args = [ - 'pngquant', + '@pngquant@', @@ -65,10 +65,10 @@ index 8425caec..a027f041 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index 4eac3470..61315d14 100644 +index fab92bb1..78b634a7 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -114,7 +114,7 @@ class TesseractVersion(Version): +@@ -95,7 +95,7 @@ class TesseractVersion(Version): def version() -> Version: @@ -77,7 +77,7 @@ index 4eac3470..61315d14 100644 def has_thresholding() -> bool: -@@ -132,7 +132,7 @@ def get_languages() -> set[str]: +@@ -113,7 +113,7 @@ def get_languages() -> set[str]: msg += output return msg @@ -86,7 +86,7 @@ index 4eac3470..61315d14 100644 try: proc = run( args_tess, -@@ -154,7 +154,7 @@ def get_languages() -> set[str]: +@@ -135,7 +135,7 @@ def get_languages() -> set[str]: def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: @@ -96,10 +96,10 @@ index 4eac3470..61315d14 100644 args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index 2944b4f4..55a36140 100644 +index 493d9b3a..578c2dda 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -70,7 +70,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> Version: @@ -107,8 +107,8 @@ index 2944b4f4..55a36140 100644 + return Version(get_version('@unpaper@')) - SUPPORTED_MODES = {'1', 'L', 'RGB'} -@@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: + @contextmanager +@@ -92,7 +92,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index df15ebe77e449..d0866f6c0a83d 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -66,14 +66,10 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - '' + lib.optionalString stdenv.isLinux '' + '' + '' # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags substituteInPlace CMakeLists.txt \ --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - '' + lib.optionalString stdenv.isDarwin '' - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 68f692e4c37a2..7983abd2e9851 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -2,22 +2,23 @@ , fetchFromGitHub , buildPythonPackage , substituteAll -, cudaSupport ? false + +# build-system +, setuptools # runtime , ffmpeg-headless # propagates -, numpy -, torch -, torchWithCuda -, tqdm , more-itertools -, transformers , numba +, numpy , openai-triton , scipy , tiktoken +, torch +, tqdm +, transformers # tests , pytestCheckHook @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20230918"; - format = "setuptools"; + version = "20231117"; + pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wBAanFVEIIzTcoX40P9eI26UdEu0SC/xuife/zi2Xho="; + hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; }; patches = [ @@ -42,32 +43,22 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - numpy - tqdm more-itertools - transformers numba + numpy + openai-triton scipy tiktoken - ] ++ lib.optionals (!cudaSupport) [ torch - ] ++ lib.optionals (cudaSupport) [ - openai-triton - torchWithCuda + tqdm + transformers ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "tiktoken==0.3.3" "tiktoken>=0.3.3" - '' - # openai-triton is only needed for CUDA support. - # triton needs CUDA to be build. - # -> by making it optional, we can build whisper without unfree packages enabled - + lib.optionalString (!cudaSupport) '' - sed -i '/if sys.platform.startswith("linux") and platform.machine() == "x86_64":/{N;d}' setup.py - ''; - preCheck = '' export HOME=$TMPDIR ''; @@ -85,7 +76,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/openai/whisper/blob/v$[version}/CHANGELOG.md"; + changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md"; description = "General-purpose speech recognition model"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index 2dd395bab677f..ce77953f12df7 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -5,11 +5,11 @@ , hatch-fancy-pypi-readme , hatch-vcs , hatchling -, attrs -, cattrs +, anyio +, distro , httpx +, httpx-auth , openllm-core -, orjson , soundfile , transformers }: @@ -30,16 +30,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs - cattrs + anyio + distro httpx - orjson + openllm-core ]; passthru.optional-dependencies = { grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc; + auth = [ + httpx-auth + ]; agents = [ transformers # diffusers diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index 75b755740d041..ab39bf6c11b91 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -4,10 +4,12 @@ , pythonOlder , accelerate , attrs -, bentoml , bitsandbytes +, bentoml , cattrs +, click-option-group , datasets +, deepmerge , hatch-fancy-pypi-readme , hatch-vcs , hatchling @@ -15,14 +17,13 @@ , mypy-extensions , orjson , peft -, ray , transformers , typing-extensions }: buildPythonPackage rec { pname = "openllm-core"; - version = "0.3.9"; + version = "0.4.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-M/ckvaHTdKFg7xfUgFxu7pRBrS6TGw0m2U3L88b2DKU="; + hash = "sha256-Hgwc4rneY0d7KZHuBIWRpndLksts5DTvaYuwZOO4sdI="; }; sourceRoot = "source/openllm-core"; @@ -44,8 +45,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - bentoml cattrs + # not listed in pyproject.toml, but required at runtime + click-option-group + deepmerge inflection mypy-extensions orjson @@ -54,9 +57,11 @@ buildPythonPackage rec { passthru.optional-dependencies = { vllm = [ - ray # vllm ]; + bentoml = [ + bentoml + ]; fine-tune = [ accelerate bitsandbytes @@ -67,7 +72,7 @@ buildPythonPackage rec { ] ++ transformers.optional-dependencies.torch ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.accelerate; - full = with passthru.optional-dependencies; ( vllm ++ fine-tune ); + full = with passthru.optional-dependencies; ( vllm ++ bentoml ++ fine-tune ); }; # there is no tests diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index b9f3d2b6fa3b5..b1cad320a11d3 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -9,20 +9,18 @@ , accelerate , bentoml , bitsandbytes +, build , click +, ctranslate2 , datasets , docker , einops -, fairscale -, flax , ghapi +, huggingface-hub , hypothesis , ipython -, jax -, jaxlib , jupyter , jupytext -, keras , nbformat , notebook , openai @@ -34,14 +32,12 @@ , pytest-randomly , pytest-rerunfailures , pytest-xdist -, ray , safetensors , scipy , sentencepiece , soundfile , syrupy , tabulate -, tensorflow , tiktoken , transformers , openai-triton @@ -73,12 +69,16 @@ buildPythonPackage rec { accelerate bentoml bitsandbytes + build click + einops ghapi openllm-client openllm-core optimum safetensors + scipy + sentencepiece tabulate transformers ] ++ bentoml.optional-dependencies.io @@ -92,62 +92,43 @@ buildPythonPackage rec { soundfile transformers ] ++ transformers.optional-dependencies.agents; + awq = [ + # autoawq + ]; baichuan = [ # cpm-kernels - sentencepiece ]; chatglm = [ # cpm-kernels - sentencepiece + ]; + ctranslate = [ + ctranslate2 ]; falcon = [ - einops xformers ]; fine-tune = [ - accelerate - bitsandbytes datasets + huggingface-hub peft # trl ]; - flan-t5 = [ - flax - jax - jaxlib - keras - tensorflow - ]; ggml = [ # ctransformers ]; gptq = [ # auto-gptq - optimum ]; # ++ autogptq.optional-dependencies.triton; grpc = [ - openllm-client - ] ++ openllm-client.optional-dependencies.grpc; - llama = [ - fairscale - sentencepiece - scipy - ]; + bentoml + ] ++ bentoml.optional-dependencies.grpc; mpt = [ - einops openai-triton ]; openai = [ openai tiktoken - ] ++ openai.optional-dependencies.embeddings; - opt = [ - flax - jax - jaxlib - keras - tensorflow - ]; + ] ++ openai.optional-dependencies.datalib; playground = [ ipython jupyter @@ -159,11 +140,10 @@ buildPythonPackage rec { bitsandbytes ]; vllm = [ - ray # vllm ]; full = with passthru.optional-dependencies; ( - agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm + agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt ++ openai ++ playground ++ starcoder ++ vllm ); all = passthru.optional-dependencies.full; }; @@ -187,12 +167,15 @@ buildPythonPackage rec { export CI=1 ''; + disabledTestPaths = [ + # require network access + "tests/models" + ]; + disabledTests = [ - # these tests access to huggingface.co - "test_opt_125m" - "test_opt_125m" - "test_flan_t5" - "test_flan_t5" + # incompatible with recent TypedDict + # https://github.com/bentoml/OpenLLM/blob/f3fd32d596253ae34c68e2e9655f19f40e05f666/openllm-python/tests/configuration_test.py#L18-L21 + "test_missing_default" ]; pythonImportsCheck = [ "openllm" ]; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index ce61a587cd6b6..da0c13d63d614 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -1,53 +1,81 @@ -{ aiohttp -, botocore +{ lib , buildPythonPackage -, certifi , fetchFromGitHub -, lib + +# build-system +, setuptools + +# dependencies +, certifi +, python-dateutil +, requests +, six +, urllib3 + +# optional-dependencies +, aiohttp + +# tests +, botocore , mock , pytest-asyncio +, pytest-mock , pytestCheckHook , pyyaml -, requests -, urllib3 +, pytz }: buildPythonPackage rec { pname = "opensearch-py"; - version = "2.3.2"; - format = "setuptools"; + version = "2.4.2"; + pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-MkrYCi/iz1OqqrwCZknfcZSEyZNPj+CZFiMycJQk+aQ="; + hash = "sha256-MPuHdjhsrccKYUIDlDYGoXBbBu/V+q43Puf0e5j8vhU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - botocore certifi + python-dateutil requests + six urllib3 ]; + passthru.optional-dependencies.async = [ + aiohttp + ]; + nativeCheckInputs = [ + botocore mock pytest-asyncio + pytest-mock pytestCheckHook pyyaml + pytz ] ++ passthru.optional-dependencies.async; disabledTestPaths = [ # require network "test_opensearchpy/test_async/test_connection.py" "test_opensearchpy/test_async/test_server" - "test_opensearchpy/test_connection.py" "test_opensearchpy/test_server" "test_opensearchpy/test_server_secured" ]; - passthru.optional-dependencies.async = [ aiohttp ]; + disabledTests = [ + # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None) + "test_ca_certs_ssl_cert_dir" + "test_no_ca_certs" + ]; meta = { description = "Python low-level client for OpenSearch"; diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 4cce64c43008d..326f7d2acedab 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; + hash = "sha256-UrgQjZYw7TlFvhnaI7wFUpuUYeVKO5hsnx8h1OKfV8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 5297cb920d33f..fb81938bc0917 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.7"; + version = "3.9.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VkCwvksUtgvFLSMy2fHLxrpZjcWYhincSM4fX/Gwl0I="; + hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-IwWbd7LE/t1UEo/bdC0bXl2K8hYyvDPbyHLBIurfb/8="; + hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 85f92e4783546..64df3dc82e478 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.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; + hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index d902af2c26f70..5e5e5a07b9c51 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.29.2"; + version = "0.29.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-dbL4VdnPszwiDO+UjluuyqeBRMKojTnZPEFKEYiIWS0="; + hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; }; postPatch = '' @@ -63,6 +63,8 @@ buildPythonPackage rec { "test_wmts_example_informatievlaanderen" "test_opensearch_creodias" ] ++ lib.optionals stdenv.isDarwin [ + "test_ogcapi_processes_pygeoapi" + "test_ogcapi_records_pycsw" "test_ogcapi_records_pygeoapi" "test_wms_getfeatureinfo_130" ]; @@ -70,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d044c76ae8d30..588dae7b7840d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -65,27 +65,22 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; + hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; }; - patches = [ - # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 - ./installer-fix.patch - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.0.1" "meson>=1.0.1" + --replace "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch deleted file mode 100644 index b1659c9dbb3d4..0000000000000 --- a/pkgs/development/python-modules/pandas/installer-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build -index f302c649bc..ddce9ea2d6 100644 ---- a/pandas/_libs/meson.build -+++ b/pandas/_libs/meson.build -@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources - ) - endforeach - --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs') -- - subdir('window') -diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build -index 14d2eef46d..a862345c3a 100644 ---- a/pandas/_libs/tslibs/meson.build -+++ b/pandas/_libs/tslibs/meson.build -@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources - install: true - ) - endforeach -- --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs/tslibs') diff --git a/pkgs/development/python-modules/pcbnew-transition/default.nix b/pkgs/development/python-modules/pcbnew-transition/default.nix new file mode 100644 index 0000000000000..2ac478308cdab --- /dev/null +++ b/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -0,0 +1,39 @@ +{ pythonOlder +, buildPythonPackage +, fetchPypi +, lib +, kicad +, versioneer +}: +buildPythonPackage rec { + pname = "pcbnewTransition"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; + }; + + propagatedBuildInputs = [ + kicad + ]; + + nativeBuildInputs = [ + versioneer + ]; + + pythonImportsCheck = [ + "pcbnewTransition" + ]; + + meta = with lib; { + description = "Library that allows you to support both, KiCad 5, 6 and 7 in your plugins"; + homepage = "https://github.com/yaqwsx/pcbnewTransition"; + changelog = "https://github.com/yaqwsx/pcbnewTransition/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix index d002cda74d8f9..2a7a3062741fb 100644 --- a/pkgs/development/python-modules/pegen/default.nix +++ b/pkgs/development/python-modules/pegen/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pegen"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "we-like-parsers"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 1d288d2f43890..9d067789b3ab3 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.151"; + version = "2.1.153"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-op7V7Xn0qzcCTyISyi/Z4bhdk/W7Ol5YbmvD2Sl5zkM="; + hash = "sha256-idIhtaEjmX1FX2Kgaks3IjNZz76jCUdR/9w1Q1BHu4c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 41a0c834ba78e..1a86bce729699 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-CZqcQ7V2iIWpnHYbHxSoxlBLsU6WMa2HVXOa2vdYJm8="; + hash = "sha256-o4I5zZYfrDPObaNcRm11istvlCkBWY19905bgv5vVjY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 01884677f26d9..0891ad28ec3f9 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.3.0"; + version = "8.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; + hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 198e7ff2ff382..1d0505e22ed58 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; + postPatch = '' + sed -i '/addopts/d' pyproject.toml + ''; + nativeBuildInputs = [ cmake nasm @@ -68,6 +72,15 @@ buildPythonPackage rec { # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 + "test_open_heif_compare_non_standard_modes_data" + "test_open_save_disable_16bit" + "test_save_bgr_16bit_to_10_12_bit" + "test_save_bgra_16bit_to_10_12_bit" + "test_premultiplied_alpha" + "test_hdr_save" + "test_I_color_modes_to_10_12_bit" ]; meta = { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index ebfcdd8d55748..3b5dffb42cf07 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -12,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.1"; + version = "10.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0="; + hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix new file mode 100644 index 0000000000000..c88715270bd7b --- /dev/null +++ b/pkgs/development/python-modules/pixel-ring/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyusb +, spidev +}: + +buildPythonPackage rec { + pname = "pixel-ring"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "respeaker"; + repo = "pixel_ring"; + rev = version; + hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyusb + spidev + ]; + + dontUsePythonImportsCheck = true; # requires SPI access + + doCheck = false; # no tests + + meta = with lib; { + description = "RGB LED library for ReSpeaker 4 Mic Array, ReSpeaker V2 & ReSpeaker USB 6+1 Mic Array"; + homepage = "https://github.com/respeaker/pixel_ring/tree/master"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index b82712dc443f4..2c1e92c75d842 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -7,7 +7,6 @@ , setuptools , packaging , tomli -, tox }: buildPythonPackage rec { @@ -24,10 +23,15 @@ buildPythonPackage rec { hash = "sha256-mb43XbKypgilagXLW33kP8wXxioNsfLtl6AEnOI1WlA="; }; + # tox is listed in build requirements but not actually used to build + # keeping it as a requirement breaks the build unnecessarily + postPatch = '' + sed -i "/requires/s/, 'tox>=3.25.1'//" pyproject.toml + ''; + nativeBuildInputs = [ packaging setuptools - tox ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index b5fc0c4499c94..89fc2fd32f740 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pkg-config , pytestCheckHook @@ -37,6 +38,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; + # ModuleNotFoundError: No module named 'distutils' + # https://github.com/matze/pkgconfig/issues/64 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a88ce34ab0d90..1fcff9e478036 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 = "17.0.0"; + version = "18.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rVYyS2Wc3PC3BvkzUSe88sSXxJCElmP5s7B1NxSFAWY="; + hash = "sha256-1OV/oybxZXF2kjLoSA2KyQaTR91jqEWstpELSlUIg2o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index fc177fc433cbb..47ce92cc68f6d 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.5"; + version = "4.15.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-kguy8sZtc8vHuWWqQqPPuDE5DgyWs/H62yxjv5VabFY="; + hash = "sha256-VU1HVAxAOraTd4VQIqG/MLkw77xciCICIh1zbzGn/dQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index e6473e98a282d..1128d1c69eaf8 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -9,24 +9,23 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.2.0"; + version = "1.3.0"; + + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; + hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; }; nativeBuildInputs = [ setuptools-scm ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - # To prevent infinite recursion with pytest doCheck = false; passthru.tests = { diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 0802156dcd3a9..14e77c816b888 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.34.5"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0="; + hash = "sha256-eHJQXLiuWmJo/Eo4B8gEo44rwpPA7ASjxKSmdu6Tv9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/protobuf/3.nix b/pkgs/development/python-modules/protobuf/3.nix new file mode 100644 index 0000000000000..d9e3cce5f918e --- /dev/null +++ b/pkgs/development/python-modules/protobuf/3.nix @@ -0,0 +1,90 @@ +{ buildPackages +, buildPythonPackage +, fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook +, pythonAtLeast +, tzdata +}: + +assert lib.versionAtLeast protobuf.version "3.21" -> throw "Protobuf 3.20 or older required"; + +buildPythonPackage { + inherit (protobuf) pname src; + + version = protobuf.version; + + sourceRoot = "${protobuf.src.name}/python"; + + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + name = "support-python311.patch"; + url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; + stripLen = 1; # because sourceRoot above + hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; + }) + ]; + + prePatch = '' + if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then + echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" + exit 1 + fi + ''; + + # Remove the line in setup.py that forces compiling with C++14. Upstream's + # CMake build has been updated to support compiling with other versions of + # C++, but the Python build has not. Without this, we observe compile-time + # errors using GCC. + # + # Fedora appears to do the same, per this comment: + # + # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 + # + postPatch = '' + sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + ''; + + nativeBuildInputs = lib.optional isPyPy tzdata; + + buildInputs = [ protobuf ]; + + propagatedNativeBuildInputs = [ + # For protoc of the same version. + buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + ]; + + setupPyGlobalFlags = [ "--cpp_implementation" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + passthru = { + inherit protobuf; + }; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 2676dc90d68ba..3a42754de7783 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -11,30 +11,28 @@ , tzdata }: +assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; + let - versionMajor = lib.versions.major protobuf.version; - versionMinor = lib.versions.minor protobuf.version; - versionPatch = lib.versions.patch protobuf.version; + protobufVersionMajor = lib.versions.major protobuf.version; + protobufVersionMinor = lib.versions.minor protobuf.version; in buildPythonPackage { inherit (protobuf) pname src; - # protobuf 3.21 corresponds with its python library 4.21 - version = - if lib.versionAtLeast protobuf.version "3.21" - then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" - else protobuf.version; + # protobuf 21 corresponds with its python library 4.21 + version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; sourceRoot = "${protobuf.src.name}/python"; - patches = lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' (substituteAll { src = ./use-nixpkgs-abseil-cpp.patch; abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] - ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "3.22") [ + ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ (fetchpatch { name = "support-python311.patch"; url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; @@ -69,14 +67,14 @@ buildPythonPackage { propagatedNativeBuildInputs = [ # For protoc of the same version. - buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + buildPackages."protobuf_${protobufVersionMajor}" ]; setupPyGlobalFlags = [ "--cpp_implementation" ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; @@ -90,7 +88,7 @@ buildPythonPackage { "testStrictUtf8Check" ]; - disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "3.23") [ + disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "23") [ # The following commit (I think) added some internal test logic for Google # that broke generator_test.py. There is a new proto file that setup.py is # not generating into a .py file. However, adding this breaks a bunch of diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 015e82de857e7..a08ff4c7a697f 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.5"; + version = "5.9.6"; format = "setuptools"; + inherit stdenv; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VBBjjk3znFTZV/xRzgMEis2ObWCrwPUQevUeX7Vm6zw="; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; }; buildInputs = diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 65156543e87d6..24063596918ca 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -50,6 +50,14 @@ let libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) + + # https://github.com/psycopg/psycopg/pull/669 + # mark some tests as timing remove on next version update + (fetchpatch { + name = "mark_tests_as_timing.patch"; + url = "https://github.com/psycopg/psycopg/commit/00a3c640dd836328ba15931b400b012171f648c2.patch"; + hash = "sha256-DoVZv1yy9gHOKl0AdVLir+C+UztJZVjboLhS5af2944="; + }) ]; baseMeta = { diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index bfe33e1ec3ad9..43a06e5a9e4d4 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -8,6 +8,7 @@ , openssl , sphinxHook , sphinx-better-theme +, buildPackages }: buildPythonPackage rec { @@ -19,20 +20,29 @@ buildPythonPackage rec { # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 disabled = pythonOlder "3.6" || isPyPy; + outputs = [ "out" "doc" ]; + src = fetchPypi { inherit pname version; hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; }; - outputs = [ "out" "doc" ]; + postPatch = '' + # Preferably upstream would not depend on pg_config because config scripts are incompatible with cross-compilation, however postgresql's pc file is lacking information. + # some linker flags are added but the linker ignores them because they're incompatible + # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py + substituteInPlace setup.py \ + --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + ''; nativeBuildInputs = [ - postgresql sphinxHook sphinx-better-theme ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + postgresql + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; @@ -45,6 +55,8 @@ buildPythonPackage rec { "psycopg2" ]; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.postgresql ]; + meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; homepage = "https://www.psycopg.org"; diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index f9ea8ec99dc03..36ae22a67b680 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1oy0gXHDAoCIPXAitQv6MRb3p2j89zBaZvpUni6wT8A="; + hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index f16fa4cedfd9c..aac49c83d81c9 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.20231109"; + version = "0.10.0.20231120"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cr2rEoGVJ8BeXLfyPq4Auxu7OEOlVnKxlSMUREmji2E="; + hash = "sha256-HUFufQ4cEeko1babG6oIBzagTB1akxzCjA1ma6aace0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix new file mode 100644 index 0000000000000..efee87277cb5a --- /dev/null +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, astropy +, qtpy +, pyqt6 +, pyqt-builder +, setuptools +, setuptools-scm +, scipy +, matplotlib +, spectral-cube +, pytestCheckHook +, pytest-astropy +}: + +buildPythonPackage rec { + pname = "pvextractor"; + version = "0.4"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "radio-astro-tools"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + propagatedBuildInputs = [ + astropy + scipy + matplotlib + pyqt6 + qtpy + spectral-cube + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # collecting ... qt.qpa.xcb: could not connect to display + # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + pytest-astropy + ]; + + pythonImportsCheck = [ "pvextractor" ]; + + meta = with lib; { + homepage = "http://pvextractor.readthedocs.io"; + description = "Position-velocity diagram extractor"; + license = licenses.bsd3; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 5281701f99e10..32c8b966ad585 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.11.0"; + version = "4.11.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qF8ed380P5HiIdF14VI9AG7vHIEGwQ/S4zgoC6snP6Y="; + hash = "sha256-7hnjX721t0YzKcJ75R+tEfUI6E9bxMYXUEtI56GDZP0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 07855f6b32881..56036d21c1093 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.3.8"; + version = "0.4.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-uIO06RRuUuE9qCEg/tTcn68i7vaFAAeFhxdxW9WAbuw="; + hash = "sha256-gxoBc7PjS4EQix38VNX6u9cwy4FCjENcUN1euOJJLCo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 9a1af7c13cf71..b5bdffca75909 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/anhaidgroup/py_stringmatching"; changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix new file mode 100644 index 0000000000000..ad7294fd63582 --- /dev/null +++ b/pkgs/development/python-modules/pybars3/default.nix @@ -0,0 +1,38 @@ +{ python3 +, fetchPypi +, lib +, pymeta3 +, buildPythonPackage +}: +buildPythonPackage rec { + pname = "pybars3"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI="; + }; + + propagatedBuildInputs = [ + pymeta3 + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pybars" + ]; + + meta = with lib; { + description = "Handlebars.js template support for Python 3 and 2"; + homepage = "https://github.com/wbond/pybars3"; + changelog = "https://github.com/wbond/pybars3/releases/tag/${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e2b216d1724ba..9eeb40225cabb 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -22,6 +22,19 @@ pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; + + # clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11. + # libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6, + # but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a + # support for C++17 aligned allocations on macOS. + # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. + stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + then python.stdenv.override (oldStdenv: { + buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; }; + targetPlatform = oldStdenv.targetPlatform // { darwinMinVersion = "10.13"; }; + hostPlatform = oldStdenv.hostPlatform // { darwinMinVersion = "10.13"; }; + }) + else python.stdenv; in buildPythonPackage rec { pname = "pybind11"; version = "2.11.1"; @@ -41,6 +54,8 @@ in buildPythonPackage rec { buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = [ setupHook ]; + stdenv = stdenv'; + dontUseCmakeBuildDir = true; # Don't build tests if not needed, read the doInstallCheck value at runtime diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix new file mode 100644 index 0000000000000..b5516bc144e09 --- /dev/null +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, can +, cobs +, libpcap +, nunavut +, numpy +, pyserial +}: + +buildPythonPackage rec { + pname = "pycyphal"; + version = "1.15.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KVX+DwcJp1sjpcG1Utl9me1LwWDZPof+O6hoUt1xlXA="; + }; + + propagatedBuildInputs = [ + can + cobs + libpcap + numpy + nunavut + pyserial + ]; + + # Can't seem to run the tests on nix + doCheck = false; + pythonImportsCheck = [ + "pycyphal" + ]; + + meta = with lib; { + description = "A full-featured implementation of the Cyphal protocol stack in Python"; + longDescription = '' + Cyphal is an open technology for real-time intravehicular distributed computing and communication based on modern networking standards (Ethernet, CAN FD, etc.). + ''; + homepage = "https://opencyphal.org/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 11114257714d2..ddb4482ef3e7d 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -36,6 +36,11 @@ buildPythonPackage { format = "setuptools"; + patches = [ + # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c + ./pillow-10.1.0-compat.patch + ]; + propagatedBuildInputs = [ numpy pillow diff --git a/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch new file mode 100644 index 0000000000000..2599f955f7ddc --- /dev/null +++ b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch @@ -0,0 +1,29 @@ +diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py +index ff781025d..a44eb9a41 100644 +--- a/pydicom/pixel_data_handlers/pillow_handler.py ++++ b/pydicom/pixel_data_handlers/pillow_handler.py +@@ -119,18 +119,12 @@ def _decompress_single_frame( + # space prior to compression, setting the value of "mode" to YCbCr + # signals Pillow to not apply any color transformation upon + # decompression. +- if (transfer_syntax in PillowJPEGTransferSyntaxes and +- photometric_interpretation == 'RGB'): +- if 'adobe_transform' not in image.info: +- color_mode = 'YCbCr' +- image.tile = [( +- 'jpeg', +- image.tile[0][1], +- image.tile[0][2], +- (color_mode, ''), +- )] +- image.mode = color_mode +- image.rawmode = color_mode ++ if ( ++ transfer_syntax in PillowJPEGTransferSyntaxes ++ and photometric_interpretation == 'RGB' ++ and "adobe_transform" not in image.info ++ ): ++ image.draft("YCbCr", image.size) + return image + + diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5352ef65d7f31..ad506999d5958 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -60,6 +60,10 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index f2c2668f4043b..9dde5d012225c 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, black -, codespell -, isort -, mypy -, pre-commit , pygobject3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.9.0"; - format = "pyproject"; + version = "2.10.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; + hash = "sha256-fz+qzFWl9JJu9CEVkeiV6XUIPDvwWgrfhTo/nj1EH5c="; }; nativeBuildInputs = [ @@ -32,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 561 Typing Stubs for PyGObject"; homepage = "https://github.com/pygobject/pygobject-stubs"; - changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ hacker1024 ]; }; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 5788618141404..d21fcddc42ee8 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -5,6 +5,7 @@ , configparser , distro , fetchFromGitHub +, fetchpatch , gevent , jinja2 , paramiko @@ -30,6 +31,15 @@ buildPythonPackage rec { hash = "sha256-BYd2UYQJD/HsmpnlQjZvjfg17ShPuA3j4rtv6fTQK/A="; }; + patches = [ + # https://github.com/Fizzadar/pyinfra/pull/1018 + (fetchpatch { + name = "bump-paramiko-major-version.patch"; + url = "https://github.com/Fizzadar/pyinfra/commit/62a8f081279779c4f1eed246139f615cf5fed642.patch"; + hash = "sha256-aT9SeSqXOD76LFzf6R/MWTtavcW6fZT7chkVg9aXiBg="; + }) + ]; + propagatedBuildInputs = [ click colorama diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8980da8e24bda..176e9fcd1545a 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; + hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 0514b9eaeb402..8326580395319 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pykrakenapi"; - version = "0.3.1"; + version = "0.3.2"; disabled = pythonOlder "3.3"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dominiktraxl"; repo = "pykrakenapi"; rev = "v${version}"; - hash = "sha256-gG0kbB3yaFU4DcBKupnBS7UFuU1hIMThdUHCuqufKzc="; + hash = "sha256-sMtNdXM+47iCnDgo33DCD1nx/I+jVX/oG/9aN80LfRg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index 4c8d6aee1e49f..c65e6d0e14873 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/sbraz/pymediainfo"; changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pymeta3/default.nix b/pkgs/development/python-modules/pymeta3/default.nix new file mode 100644 index 0000000000000..f0350c4153b74 --- /dev/null +++ b/pkgs/development/python-modules/pymeta3/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "pymeta3"; + version = "0.5.1"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "PyMeta3"; + hash = "sha256-GL2jJtmpu/WHv8DuC8loZJZNeLBnKIvPVdTZhoHQW8s="; + }; + + doCheck = false; # Tests do not support Python3 + + pythonImportsCheck = [ + "pymeta" + ]; + + meta = with lib; { + description = "Pattern-matching language based on OMeta for Python 3 and 2"; + homepage = "https://github.com/wbond/pymeta3"; + changelog = "https://github.com/wbond/pymeta3/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 9b801e42c8a97..463de728aea29 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -19,9 +19,10 @@ buildPythonPackage rec { patches = [ # Fixes a TypeError on Python 3.11 # (see https://github.com/pympler/pympler/issues/148) + # https://github.com/pympler/pympler/pull/149 (fetchpatch { name = "${pname}-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/pull/149.patch"; + url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; }) ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index d7e69706e51f8..1c21e6b90c1a4 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -2,9 +2,10 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, python , swig -, xcbuild , mupdf , freetype , harfbuzz @@ -13,33 +14,32 @@ , libjpeg_turbo , gumbo , memstreamHook +, fonttools }: -buildPythonPackage rec { +let + # PyMuPDF needs the C++ bindings generated + mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; +in buildPythonPackage rec { pname = "pymupdf"; - version = "1.23.3"; + version = "1.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyMuPDF"; - inherit version; - hash = "sha256-AhR4rmx26IWSQdu5cGEskIColX2L1pe7oLRTHcHPT4c="; + src = fetchFromGitHub { + owner = "pymupdf"; + repo = "PyMuPDF"; + rev = version; + hash = "sha256-60KT5+EGP+s7HD4UIeaf9x2QVNU9IUbC5WKEJbrIBCI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf - ''; nativeBuildInputs = [ + pytestCheckHook swig - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild ]; buildInputs = [ - mupdf freetype harfbuzz openjpeg @@ -50,10 +50,40 @@ buildPythonPackage rec { memstreamHook ]; - doCheck = false; + propagatedBuildInputs = [ + mupdf-cxx + ]; + + env = { + # force using system MuPDF (must be defined in environment and empty) + PYMUPDF_SETUP_MUPDF_BUILD = ""; + # provide MuPDF paths + PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib"; + PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include"; + }; + + # TODO: manually add mupdf rpath until upstream fixes it + postInstall = lib.optionalString stdenv.isDarwin '' + for lib in */*.so $out/${python.sitePackages}/*/*.so; do + install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" + done + ''; + + checkInputs = [ + fonttools + ]; + + disabledTests = [ + # fails for indeterminate reasons + "test_color_count" + ] ++ lib.optionals stdenv.isDarwin [ + # darwin does not support OCR right now + "test_tesseract" + ]; pythonImportsCheck = [ "fitz" + "fitz_new" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 251c08f026087..bd3931e4f1dc3 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8="; + hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynvim-pp/default.nix b/pkgs/development/python-modules/pynvim-pp/default.nix index af2dbc27d63ea..0f69b51e65dea 100644 --- a/pkgs/development/python-modules/pynvim-pp/default.nix +++ b/pkgs/development/python-modules/pynvim-pp/default.nix @@ -7,15 +7,14 @@ buildPythonPackage { pname = "pynvim-pp"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-08-03"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "pynvim_pp"; - rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b"; - hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo="; + rev = "40d0f6053ddbba61f53505eebb0290cfb661661b"; + hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4e67fd0783d52..bc841cc2fd4e0 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postPatch = '' # remove cryptography pin - sed "/cryptography/ s/,<[0-9]*//g" setup.py + sed -i "/cryptography/ s/,<[0-9]*//g" setup.py ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 29c131a12f9fe..31d8adb3b6297 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.1"; + version = "1.13.2"; 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-55oqrVjvbdwNn5S3YQVU3saWtFHhoUCcyW9VzXs87YM="; + hash = "sha256-WGFRZhnlTDC9uv9N4sKznIdgjBwpnuT9Gsa8hdlnPAE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index fc87620c6b9c9..16ff853422bfd 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -1,30 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder , psutil , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyperf"; - version = "2.6.1"; - format = "setuptools"; + version = "2.6.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fxrqabjv3mEhDlEhZth2Tndlqcdni3aAUhdLAfNJ8kc="; + hash = "sha256-ZNj63OanT0ePKYMsHqoqBIVmVev/FyktUjf8gxfDo8U="; }; - patches = [ - (fetchpatch { - name = "fix-pythonpath-in-tests.patch"; - url = "https://github.com/psf/pyperf/commit/d373c5e56c0257d2d7abd705b676bea25cf66566.patch"; - hash = "sha256-2q1fTf+uU3qj3BG8P5otX4f7mSTnQxm4sfmmgIUuszA="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -35,12 +31,21 @@ buildPythonPackage rec { unittestCheckHook ]; - unittestFlagsArray = [ "-s" "pyperf/tests/" "-v" ]; + unittestFlagsArray = [ + "-s" + "pyperf/tests/" + "-v" + ]; + + pythonImportsCheck = [ + "pyperf" + ]; meta = with lib; { description = "Python module to generate and modify perf"; homepage = "https://pyperf.readthedocs.io/"; + changelog = "https://github.com/psf/pyperf/releases/tag/${version}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index faf99607199a7..4dc25322863de 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Python Progress Bar and Percent Indicator Utility"; homepage = "https://github.com/rasbt/pyprind"; license = licenses.bsd3; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 0d77ed937cf1f..576688accc075 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -100,11 +100,11 @@ buildPythonPackage rec { "pyproj.exceptions" ]; - meta = { + meta = with lib; { description = "Python interface to PROJ library"; homepage = "https://github.com/pyproj4/pyproj"; changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lsix dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ lsix dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index cfa2f64c38b3d..6e7a1ec29cbed 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,10 +1,13 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, setuptools +, pkg-config , swig , pcsclite , PCSC +, pytestCheckHook }: let @@ -15,27 +18,44 @@ in buildPythonPackage rec { version = "2.0.7"; pname = "pyscard"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-J4BUUl+nX76LEEYNh+3NA6cK2U1oixE0Xkc5mH+Fwb8="; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "pyscard"; + rev = "refs/tags/${version}"; + hash = "sha256-nkDI1OPQ4SsNhWkg53ZTsG7j0+mvpkJI7dsyaOl1a/8="; }; - postPatch = if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + nativeBuildInputs = [ + setuptools + swig + ] ++ lib.optionals (!withApplePCSC) [ + pkg-config + ]; + + buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) - "-I ${lib.getDev pcsclite}/include/PCSC"; + nativeCheckInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - nativeBuildInputs = [ swig ]; + postPatch = + if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + + preCheck = '' + # remove src module, so tests use the installed module instead + rm -r smartcard + ''; meta = with lib; { homepage = "https://pyscard.sourceforge.io/"; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix new file mode 100644 index 0000000000000..34f6de519266a --- /dev/null +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysuez"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ooii"; + repo = "pySuez"; + rev = "refs/tags/v${version}"; + hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pysuez" + ]; + + meta = with lib; { + description = "Module to get water consumption data from Suez"; + homepage = "https://github.com/ooii/pySuez"; + changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index bca05a0010a5d..90b7e6f55e2b8 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,30 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "gabrielcnr"; repo = "pytest-datadir"; - rev = "refs/tags/${version}"; - hash = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; + rev = "refs/tags/v${version}"; + hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { description = "Pytest plugin for manipulating test data directories and files"; homepage = "https://github.com/gabrielcnr/pytest-datadir"; + changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index bd1ce2a597b17..b1e46802b450a 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d557bcf15e937..a00b59c425b7f 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,10 +3,10 @@ , callPackage , pythonOlder , fetchPypi -, isPyPy , writeText # build +, setuptools , setuptools-scm # propagates @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.2"; - format = "pyproject"; + version = "7.4.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p2YlnPq1ZKKtUssarhuIGnXD6340yjd5aXwj7UfEcGk="; + hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; }; outputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python-fedora/default.nix index 7f4e6e2a4fd57..01c79c39ea1c5 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python-fedora/default.nix @@ -1,15 +1,16 @@ { lib , beautifulsoup4 , buildPythonPackage -, bunch , fetchPypi , kitchen , lockfile , munch +, nose , openidc-client -, paver +, pytestCheckHook , pythonOlder , requests +, setuptools , six , urllib3 }: @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "python-fedora"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,20 +27,30 @@ buildPythonPackage rec { hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 - bunch kitchen lockfile munch openidc-client - paver requests six urllib3 ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + nose + ]; + + disabledTestPaths = [ + # requires network access + "tests/functional/test_openidbaseclient.py" + ]; pythonImportsCheck = [ "fedora" @@ -48,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the infrastructure of the Fedora Project"; homepage = "https://github.com/fedora-infra/python-fedora"; - changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1"; + changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/${version}"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index fe81dda8939ca..98cc6109ae784 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.10.1"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OG45mKYqWrgyDyTlWPz95VXQDKAx4QeU1ZZGmHhbviI="; + hash = "sha256-7HneedqHbNB9ZYFUCCQ/puLtA1QlIkTKqji0py9hwBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 68150935da96a..6e3f406fe5a30 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,18 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , ecdsa , rsa -, pycrypto , pyasn1 -, pycryptodome + +# optional-dependencies , cryptography +, pycrypto +, pycryptodome + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "mpdavis"; @@ -21,27 +31,43 @@ buildPythonPackage rec { hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - cryptography ecdsa pyasn1 - pycrypto - pycryptodome rsa ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + passthru.optional-dependencies = { + cryptography = [ + cryptography + ]; + pycrypto = [ + pycrypto + ]; + pycryptodome = [ + pycryptodome + ]; + }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; + pythonImportsCheck = [ + "jose" + ]; - pythonImportsCheck = [ "jose" ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { + changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}"; homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index db9565607a662..5bc9f3fecfcc0 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -2,27 +2,41 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pyasn1 -, pyasn1-modules -, pythonAtLeast , pythonOlder -, pytestCheckHook + +# build-system +, setuptools + +# native dependencies , openldap , cyrus_sasl + +# dependencies +, pyasn1 +, pyasn1-modules + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.3"; + version = "3.4.4"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-ldap"; + repo = "python-ldap"; rev = "refs/tags/python-ldap-${version}"; - hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; + hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ openldap cyrus_sasl @@ -53,7 +67,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { + changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; description = "Python modules for implementing LDAP clients"; + downloadPage = "https://github.com/python-ldap/python-ldap"; homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index bc3c13478e61b..cd45cbe7d284b 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index 9de9819e8840e..eef8f21cb3aaa 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.66.0"; + version = "0.67.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; rev = "refs/tags/v${version}"; - hash = "sha256-Y18NospSDcr9K93xS24vKTnrT8DT1GPRX78clZB040E="; + hash = "sha256-wO2ZSELxu8BmIZN4x2mSLzsbU3sU49MEpjTfiSzVzaE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix index b633848e649e4..473eb8089707f 100644 --- a/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -1,30 +1,35 @@ { lib +, aiohttp , buildPythonPackage , fetchPypi -, aiohttp -, urllib3 , pythonOlder +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "python-opendata-transport"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "python_opendata_transport"; inherit version; - hash = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8="; + hash = "sha256-2lEKPu5vjyqNUqz1NGmZ5b6YP3oWnCgoubDdiQCbdps="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp urllib3 ]; - # no tests are present + # No tests are present doCheck = false; pythonImportsCheck = [ @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for interacting with transport.opendata.ch"; homepage = "https://github.com/home-assistant-ecosystem/python-opendata-transport"; + changelog = "https://github.com/home-assistant-ecosystem/python-opendata-transport/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 4f65f7edcb2f8..afe1451042b65 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.35"; + version = "0.0.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8Z4wZRJJV4TED6foM2Db+Ghl+EHrfGXoXZm3KsNh8OQ="; + hash = "sha256-cng19NW5Eq3arysl0B3dfK2Hy6lQFBFh7g2hxvxeklU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 15804b2c5b354..1ed718a700323 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.0"; + version = "2.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-gpY5pfvgciiQF5kDUui5UbxLlZ6X3mSNBNZWfpYD5Sc="; + hash = "sha256-1psTa++qF5WPDVXeDGWfcQ4hGz98uW297QDUKrQyoRE="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 29b1e5f8d530b..8c3c0d86f3b8c 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -1,5 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage -, six, udev, pytest, mock, hypothesis, docutils +{ lib +, fetchPypi +, buildPythonPackage +, six +, udev +, pytest +, mock +, hypothesis +, docutils +, stdenvNoCC }: buildPythonPackage rec { @@ -11,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; }; - postPatch = '' + postPatch = lib.optionalString stdenvNoCC.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; @@ -27,9 +35,10 @@ buildPythonPackage rec { # https://github.com/pyudev/pyudev/issues/187 doCheck = false; - meta = { + meta = with lib; { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ frogamic ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index c2af4be8df86b..59f1c4233ab38 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-JlwqxKJaJ3sk2mROUOaF0N5d4V7LM43VqEXnuSO45BY="; + hash = "sha256-kVMhzdTYwra8G/4gg1G853vUr7YHxxt/zXus/SXMkXc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 71fe7601ce9ce..70272d54ac8d6 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , pytestCheckHook , glib @@ -13,6 +14,8 @@ buildPythonPackage rec { pname = "pyvips"; version = "2.2.1"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; @@ -26,6 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' @@ -41,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; + changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ccellado anthonyroussel ]; }; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 7a740efe5a4e5..f395f88bf7dc5 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, lxml , requests , six +, pyopenssl , pythonOlder }: buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.2.0"; + version = "8.0.2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM="; + hash = "sha256-Y7Zor70P4lhkAslckg/prfCmnszVMFPntWdJpfWnvIM="; }; propagatedBuildInputs = [ @@ -25,6 +27,13 @@ buildPythonPackage rec { six ]; + passthru.optional-dependencies = { + sso = [ + lxml + pyopenssl + ]; + }; + # Requires old version of vcrpy doCheck = false; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index f640012d9a5ed..80094a1a350d7 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-C+jQN0QXZzH0IKdC3O5uPNAEd+XSffi3nkwFSv2HqPY="; + hash = "sha256-JgTmhnKVzv9m8//GMQjvCFPNJQM/7dalCD5bk6fWBPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 65c5a5759998f..83252b1c3338f 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "CTypes based LibRaw bindings for Python"; homepage = "https://rawkit.readthedocs.org/"; license = licenses.mit; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 832d843847591..c95f4b6e3ffe2 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.15"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-BSl7dECYJIjR9QTvcizUF3Lz1jmgm9xi4kPt7PdO/Nk="; + hash = "sha256-HcEJwgb912NbRt2RTSNccluchWYBBqADi5LcW3mY8I4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index f56921a691aab..674c508696bf5 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM="; + hash = "sha256-A7FQeeYym0nAQlkbpejpZqd5ZgX2cw3/DbshDxlrivw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 4eea1c1ab677d..0640ce63db351 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-u5GMCM9HyrblGbmIvfDWTfIAV8Zpn8tF0oOaolFtQMk="; + hash = "sha256-MDD0Vs5XIWqxKHbrAa0vXJRd8uYZDlr//hP1NBf4b7U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 29970e7fd281e..65b7c62b9e34c 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { - url = "https://github.com/errbotio/rocket/pull/1.patch"; + # https://github.com/errbotio/rocket/pull/1 + name = "errbotio-rocket-pull-1.patch"; + url = "https://github.com/errbotio/rocket/compare/f1a52fe17164f83bccce5e6a1935fc5071c2265f...d69adcd49de5d78bd80f952a2ee31e6a0bac4e3d.patch"; sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 3617648186057..748b6abecf452 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "boto"; repo = pname; rev = version; - hash = "sha256-hoHNblnCSZteHmI5sJN72WrX7tveNFZqmL1jFKQmdag="; + hash = "sha256-EvLqRvm9E1Taf+JvbhQbfJqIlbu2a+rB2MX0IO90x98="; }; propagatedBuildInputs = [ botocore ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; + changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index a9393cb487811..cf9d4c84c0bbd 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -1,15 +1,18 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , cython , gfortran , git , meson-python , pkg-config +, blas +, lapack , numpy -, openblas , setuptools , wheel +, pytestCheckHook }: buildPythonPackage rec { @@ -27,8 +30,14 @@ buildPythonPackage rec { postPatch = '' patchShebangs . + # unbound numpy and disable coverage testing in pytest substituteInPlace pyproject.toml \ - --replace 'numpy==' 'numpy>=' + --replace 'numpy==' 'numpy>=' \ + --replace 'addopts = "' '#addopts = "' + + # provide a version to use when git fails to get the tag + [[ -f skmisc/_version.py ]] || \ + echo '__version__ = "${version}"' > skmisc/_version.py ''; nativeBuildInputs = [ @@ -42,9 +51,31 @@ buildPythonPackage rec { wheel ]; - buildInputs = [ + propagatedBuildInputs = [ numpy - openblas + ]; + + buildInputs = [ + blas + lapack + ]; + + mesonFlags = [ + "-Dblas=${blas.pname}" + "-Dlapack=${lapack.pname}" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # can not run tests from source directory + preCheck = '' + cd "$(mktemp -d)" + ''; + + pytestFlagsArray = [ + "--pyargs skmisc" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 0a242e2313738..5e95bed4cbdb6 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -2,6 +2,10 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch +, meson-python +, pkg-config +, Accelerate , blas , lapack , numpy @@ -12,19 +16,43 @@ buildPythonPackage rec { pname = "scs"; - version = "3.2.3"; + version = "3.2.4"; + pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = version; - hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM="; + hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs="; fetchSubmodules = true; }; - buildInputs = [ - lapack + patches = [ + # needed for building against netlib's reference blas implementation and + # the pkg-config patch. remove on next update + (fetchpatch { + name = "find-and-ld-lapack.patch"; + url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch"; + hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg="; + }) + # add support for pkg-config. remove on next update + (fetchpatch { + name = "use-pkg-config.patch"; + url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch"; + hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA="; + }) + ]; + + nativeBuildInputs = [ + meson-python + pkg-config + ]; + + buildInputs = if stdenv.isDarwin then [ + Accelerate + ] else [ blas + lapack ]; propagatedBuildInputs = [ @@ -51,6 +79,6 @@ buildPythonPackage rec { homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; + maintainers = with maintainers; [ a-n-n-a-l-e-e drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index fdb052a474991..086c53108976e 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -8,12 +8,15 @@ , trio , trio-websocket , urllib3 +, pytest-trio , nixosTests +, stdenv +, python }: buildPythonPackage rec { pname = "selenium"; - version = "4.12.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +26,30 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-A2lI40bPSIri/0yp6C3aJZBX5p6ON1fWGfJTcul9/2o="; + hash = "sha256-cTMCKfFLUlJDbTUQA3Z/pKCE1RQQRMb4K8hKKn9HqvU="; }; - postPatch = '' - substituteInPlace py/selenium/webdriver/firefox/service.py \ - --replace 'DEFAULT_EXECUTABLE_PATH = "geckodriver"' 'DEFAULT_EXECUTABLE_PATH = "${geckodriver}/bin/geckodriver"' - ''; - preConfigure = '' cd py ''; + postInstall = '' + DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ + DST_REMOTE=$DST_PREFIX/remote/ + DST_FF=$DST_PREFIX/firefox + cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE + cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE + cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $DST_PREFIX/common/macos + cp ../common/manager/macos/selenium-manager $DST_PREFIX/common/macos + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $DST_PREFIX/common/linux/ + cp ../common/manager/linux/selenium-manager $DST_PREFIX/common/linux/ + ''; + propagatedBuildInputs = [ certifi trio @@ -44,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-trio ]; passthru.tests = { diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d138bcb2940cc..b389da6f1c994 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -24,6 +24,7 @@ , pyramid , pyrsistent , pyspark +, pysocks , pytest-forked , pytest-localserver , pytest-watch @@ -40,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.33.1"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-a73SZssiS1i3pfble0dMw6st5Hq4AIdJA+dnT617kXg="; + hash = "sha256-wV38DW5YfY+f5Qg/I7JPQ5R8TyqqdjwHKfr5XjT2vFA="; }; propagatedBuildInputs = [ @@ -120,6 +121,7 @@ buildPythonPackage rec { mock pure-eval pyrsistent + pysocks pytest-forked pytest-localserver pytest-watch diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 488e936abb82a..7f87ddf6befab 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zqaxo+cuzpf8hVNqKBR2+bd5TeLmRsqKRRfi48FEaJM="; + hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; }; nativeBuildInputs = [ @@ -44,8 +44,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Fix a ModuleNotFoundError. Investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' - rm -r shapely # prevent import of local shapely + cd $out ''; disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 4afa930cac0b4..593a7b7d82ead 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -5,7 +5,7 @@ , cmake , qt5 , libxcrypt -, llvmPackages +, llvmPackages_15 }: stdenv.mkDerivation { @@ -21,12 +21,12 @@ stdenv.mkDerivation { cd sources/shiboken2 ''; - CLANG_INSTALL_DIR = llvmPackages.libclang.out; + CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake ]; buildInputs = [ - llvmPackages.libclang + llvmPackages_15.libclang python python.pkgs.setuptools qt5.qtbase diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 5da242e7b4c37..10d5f64385a0a 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -1,49 +1,52 @@ { lib -, fetchFromGitHub , buildPythonPackage -, authlib -, requests -, nose +, cryptography +, fetchFromGitHub +, more-itertools +, pendulum , pyjwt +, pytestCheckHook , pythonOlder , pytz +, requests , responses +, setuptools , zeep }: buildPythonPackage rec { pname = "simple-salesforce"; version = "1.12.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "simple-salesforce"; + repo = "simple-salesforce"; rev = "refs/tags/v${version}"; hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - authlib + cryptography + more-itertools + pendulum pyjwt requests zeep ]; nativeCheckInputs = [ - nose + pytestCheckHook pytz responses ]; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - pythonImportsCheck = [ "simple_salesforce" ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index f495e463864d2..b136d9e94dac6 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.1"; + version = "3.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LUD0Eoj7fDGiR0yhIZOto6kn7Ud0TXyDTO1UTbRMJiQ="; + hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index c0439dcec706f..e21580162cfe8 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "refs/tags/v${version}"; - hash = "sha256-71iFZS5CLYXNw57psLXswNJKfvbeKOqSncLoSsNXqjc="; + hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 58372e493acbe..b5c7496a78611 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.23.0"; + version = "3.24.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk="; + hash = "sha256-Euea7O2CYapTAlK+PZEuyGhVdpT/N44rFGSRvPiJyNs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 14530ec68abae..0c953e20c5fba 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, setuptools , regex }: buildPythonPackage rec { pname = "somajo"; - version = "2.3.0"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc="; + hash = "sha256-3A2et4pl92LsRtEx2Ki8Soz3n1nZEGQGPc3ZIBDojNM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index edc8e2ce6b058..e9f5d9c4519dc 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; - version = "0.8.3"; + version = "1.0.0"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-notfound-page"; rev = version; - hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index a034b2b3f01d7..7bc41418fe46a 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.1.1"; + version = "0.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-26cV6mfNos/1YLhz5aVQVb54qsiyHWdcHtvmmSzMurk="; + hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ sphinx @@ -30,13 +31,16 @@ buildPythonPackage rec { pytest ]; - pythonImportsCheck = [ "sphinx_pytest" ]; + pythonImportsCheck = [ + "sphinx_pytest" + ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/v${version}"; description = "Helpful pytest fixtures for Sphinx extensions"; homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index ecb477980c1d9..b14d669a10c9a 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , sphinx +, sphinx-pytest +, pytestCheckHook }: let pname = "sphinx-sitemap"; @@ -11,18 +14,25 @@ buildPythonPackage { inherit pname version; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU="; + src = fetchFromGitHub { + owner = "jdillard"; + repo = "sphinx-sitemap"; + rev = "refs/tags/v${version}"; + hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sphinx ]; - # Latest tests do not pass on Sphinx5, although it is supported - # Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25 - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + sphinx-pytest + ]; meta = with lib; { changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch deleted file mode 100644 index 805e724d0c8c1..0000000000000 --- a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Mon, 20 Sep 2021 11:39:46 +0200 -Subject: [PATCH] test-images: Use normalization equivalent character -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -One of the test images used a combining character `ä` that can be -encoded multiple ways. This means the file's name can end up encoded -differently depending on whether/which normal form the filesystem uses. - -For Nix this causes a different hash for a FOD depending on the -filesystem where it is evaluated. This is problematic because hashes -fail to match up when evaluating the FOD across multiple platforms. ---- - tests/roots/test-images/index.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst -index 14a2987..219842e 100644 ---- a/tests/roots/test-images/index.rst -+++ b/tests/roots/test-images/index.rst -@@ -13,7 +13,7 @@ test-image - - The caption of img - --.. image:: testimäge.png -+.. image:: testimæge.png - - .. image:: rimg.png - :target: https://www.sphinx-doc.org/ --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index eb559c4148600..6dac59106f5f2 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -30,29 +30,29 @@ # check phase , cython +, filelock , html5lib , pytestCheckHook -, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "5.3.0"; + version = "7.2.6"; format = "pyproject"; - - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sphinx-doc"; - repo = pname; + repo = "sphinx"; rev = "refs/tags/v${version}"; - hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' - cd $out - mv tests/roots/test-images/testimäge.png \ - tests/roots/test-images/testimæge.png - patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + # Change ä to æ in file names, since ä can be encoded multiple ways on different + # filesystems, leading to different hashes on different platforms. + cd "$out"; + mv tests/roots/test-images/{testimäge,testimæge}.png + sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; + hash = "sha256-IjpRGeGpGfzrEvwIKtuu2l1S74w8W+AbqDOGnWwtRck="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - babel alabaster + babel docutils imagesize jinja2 @@ -84,66 +84,22 @@ buildPythonPackage rec { importlib-metadata ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ cython + filelock html5lib pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME=$TMPDIR ''; disabledTests = [ # requires network access - "test_anchors_ignored" - "test_defaults" - "test_defaults_json" "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" - - # fails with pygments 2.14 - # TODO remove for sphinx 6 - "test_viewcode" - "test_additional_targets_should_be_translated" - "test_additional_targets_should_not_be_translated" - - # sphinx.errors.VersionRequirementError: The alabaster extension - # used by this project needs at least Sphinx v1.6; it therefore - # cannot be built with this version. - "test_needs_sphinx" - - # Likely due to pygments 2.14 update - # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' - "test_format_date" - ] ++ lib.optionals stdenv.isDarwin [ - # Due to lack of network sandboxing can't guarantee port 7777 isn't bound - "test_inspect_main_url" - "test_auth_header_uses_first_match" - "test_linkcheck_allowed_redirects" - "test_linkcheck_request_headers" - "test_linkcheck_request_headers_no_slash" - "test_follows_redirects_on_HEAD" - "test_get_after_head_raises_connection_error" - "test_invalid_ssl" - "test_connect_to_selfsigned_with_tls_verify_false" - "test_connect_to_selfsigned_with_tls_cacerts" - "test_connect_to_selfsigned_with_requests_env_var" - "test_connect_to_selfsigned_nonexistent_cert_file" - "test_TooManyRedirects_on_HEAD" - "test_too_many_requests_retry_after_int_del" - "test_too_many_requests_retry_after_HTTP_date" - "test_too_many_requests_retry_after_without_header" - "test_too_many_requests_user_timeout" - "test_raises_for_invalid_status" - "test_auth_header_no_match" - "test_follows_redirects_on_GET" - "test_connect_to_selfsigned_fails" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -159,14 +115,39 @@ buildPythonPackage rec { "test_partialfunction" ]; - meta = with lib; { + meta = { description = "Python documentation generator"; longDescription = '' - A tool that makes it easy to create intelligent and beautiful - documentation for Python projects + Sphinx makes it easy to create intelligent and beautiful documentation. + + Here are some of Sphinx’s major features: + - Output formats: HTML (including Windows HTML Help), LaTeX (for printable + PDF versions), ePub, Texinfo, manual pages, plain text + - Extensive cross-references: semantic markup and automatic links for + functions, classes, citations, glossary terms and similar pieces of + information + - Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + - Automatic indices: general index as well as a language-specific module + indices + - Code handling: automatic highlighting using the Pygments highlighter + - Extensions: automatic testing of code snippets, inclusion of docstrings + from Python modules (API docs) via built-in extensions, and much more + functionality via third-party extensions. + - Themes: modify the look and feel of outputs via creating themes, and + re-use many third-party themes. + - Contributed extensions: dozens of extensions contributed by users; most + of them installable from PyPI. + + Sphinx uses the reStructuredText markup language by default, and can read + MyST markdown via third-party extensions. Both of these are powerful and + straightforward to use, and have functionality for complex documentation + and publishing workflows. They both build upon Docutils to parse and write + documents. ''; homepage = "https://www.sphinx-doc.org"; - license = licenses.bsd3; - maintainers = teams.sphinx.members; + changelog = "https://www.sphinx-doc.org/en/master/changes.html"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 32470e98b4e0f..bfe5739b2a7b0 100644 --- a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.actdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx actdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index ad89521a5b59b..77fe8929b2faa 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension for running sphinx-apidoc on each build"; homepage = "https://github.com/sphinx-contrib/apidoc"; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index ef7a50382c6e2..3e8fe11d192fe 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.2"; - disabled = isPy27; + version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; + pname = "sphinxcontrib_applehelp"; + inherit version; + hash = "sha256-Of3I12LTOwGn2PAmo7fXFWPqO3J4fV8ArYRlvZ1t+/o="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix index 2da9c2d92f6ab..597dac22a0158 100644 --- a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { "sphinxcontrib.asyncio" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to add asyncio-specific markups"; homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 8589689ec8d17..ca968f3f232c2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sphinxcontrib.bayesnet" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/jluttine/sphinx-bayesnet"; description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 8c7cd9b966a90..2d8dca9912909 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { "sphinxcontrib.bibtex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8d22c5806764e..44c4de9570dd8 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 111db7922b49c..dc7798015cb75 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { "sphinxcontrib.confluencebuilder" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Confluence builder for sphinx"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 293f4c856ef53..b254d4b64327b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.2"; + version = "1.0.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; + pname = "sphinxcontrib_devhelp"; + inherit version; + hash = "sha256-Y7QeDTggfKQOu+q89NjlH3bAPnjNYavhGM9ENcc9QhI="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index e48b24c3644f7..d7cea5a6418a5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # No tests present upstream doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx excel-table extension"; homepage = "https://github.com/hackerain/sphinxcontrib-excel-table"; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f137c7..79a326150073f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # Ensure package importing works pythonImportsCheck = [ "sphinxcontrib.fulltoc" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Include a full table of contents in your Sphinx HTML sidebar"; homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 901132176ed9d..56fae964eca0c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; - disabled = isPy27; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + pname = "sphinxcontrib_htmlhelp"; + inherit version; + hash = "sha256-bCahGKBbdgAHOEKbckoFaNveW3I5GmiFd9oI8RiRCSo="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension which renders HTML help files"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index ae4a571f0bb53..96dad44be8bf2 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 1905659b25f0b..16c57f5886b78 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pytestCheckHook , sphinx @@ -8,16 +9,29 @@ buildPythonPackage rec { pname = "sphinxcontrib-jquery"; - version = "3.0.0"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "jquery"; rev = "refs/tags/v${version}"; - hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-sphinx7.1.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/ac97ce5202b05ddb6bf4e5b77151a8964b6bf632.patch"; + hash = "sha256-dc9bhr/af3NmrIfoVabM1lNpXbGVsJoj7jq0E1BAtHw="; + }) + (fetchpatch { + name = "fix-tests-with-sphinx7.2.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/03f1595b3793e087a407933fbcb757bdd3f558fc.patch"; + hash = "sha256-4gNG1DL/63N2FwXDy5fMApZpf/AGOGBruwPuVqgnVkc="; + }) + ]; + nativeBuildInputs = [ flit-core ]; @@ -31,6 +45,8 @@ buildPythonPackage rec { sphinx ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Extension to include jQuery on newer Sphinx releases"; longDescription = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index da630c6ee96dd..2b8c2cd75826e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 248030c241bfc..30c94a088fbff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { "sphinxcontrib.katex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index 867d5acc9bae9..2dfc743a60f97 100644 --- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { doCheck = false; # no tests + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/davidism/sphinxcontrib-log-cabinet"; description = "Sphinx extension to organize changelogs"; diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix index 0a283dd81a4d5..7350b837a7f85 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { "sphinxcontrib.mscgen" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using mscgen to render diagrams"; homepage = "https://github.com/sphinx-contrib/mscgen"; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8ba3b..ee9661d954e4f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,23 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonNamespaces = [ "sphinxcontrib" ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; + homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 47573ad609a8f..de4ebf723bf1e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.nwdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx nwdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 0ed95a19b98f4..6e3279b4de966 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,7 +9,7 @@ , picobox , pyyaml , sphinx-mdinclude -, sphinxcontrib_httpdomain +, sphinxcontrib-httpdomain }: buildPythonPackage rec { @@ -29,13 +29,15 @@ buildPythonPackage rec { picobox pyyaml sphinx-mdinclude - sphinxcontrib_httpdomain + sphinxcontrib-httpdomain ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index aabc1c49d0c28..d6c588c8d0222 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { # No tests included. doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 17f2d5dcbe645..67d7d9b587f90 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 4364fcb99dc6f..d526f8aad8ee6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.3"; - disabled = isPy27; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; + pname = "sphinxcontrib_qthelp"; + inherit version; + hash = "sha256-YrnRoYarf17jNW2Qb2SMrLemvblNIB7nrfJttVCSmC0="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index cc3a96086e4e8..085cb57305480 100644 --- a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.seqdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx seqdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 85ed3cdc596db..4604eec5f1842 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.5"; - disabled = isPy27; + version = "1.1.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; + pname = "sphinxcontrib_serializinghtml"; + inherit version; + hash = "sha256-DGT/iYM54frCmr0r9fEQePPsQTz+nARtMSDXymVTC1Q="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2a8085de7c236..b7a71f891c32c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "sphinxcontrib.spelling" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 4e47298c80601..dd83acb3d2057 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.tikz" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index ad800984ee46e..bd9ae779c081a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = { description = "Sphinx API for Web Apps"; homepage = "http://sphinx-doc.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 67249bd882835..ab48066dc6af2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.3.0"; + version = "1.4.1"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sphinx-contrib"; repo = "youtube"; rev = "refs/tags/v${version}"; - hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; + hash = "sha256-XuOfZ77tg9akmgTuMQN20OhgkFbn/6YzT46vpTsXxC8="; }; propagatedBuildInputs = [ sphinx requests ]; @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Youtube extension for Sphinx"; homepage = "https://github.com/sphinx-contrib/youtube"; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index dc66c1c44f4eb..85a736bd880c6 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.8.2"; + version = "0.9.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-SrZTtVzEp4E87fzisWKHl8iRP49PWt5kkJq62CqXrBc="; + hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,15 +29,20 @@ buildPythonPackage rec { setuptools-scm ]; + passthru.optional-dependencies = { + social_cards_generation = [ + matplotlib + ]; + }; + propagatedBuildInputs = [ sphinx - matplotlib ]; nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ]; + ] ++ passthru.optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index dc6befc179919..a9d5fe3729532 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; + hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ecfa57be2e302..c71172764af79 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { patches = [ # See: https://review.openstack.org/#/c/608382/ + # https://github.com/openstack/sqlalchemy-migrate/pull/18 (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ./python3.11-comp.diff diff --git a/pkgs/development/python-modules/std2/default.nix b/pkgs/development/python-modules/std2/default.nix index 2b51f9caaec6d..8e117b10e775b 100644 --- a/pkgs/development/python-modules/std2/default.nix +++ b/pkgs/development/python-modules/std2/default.nix @@ -6,15 +6,14 @@ buildPythonPackage { pname = "std2"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-10-07"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "std2"; - rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6"; - hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY="; + rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965"; + hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index 9cf75ab98ca14..86f7c6a7d629f 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-mOtmE1l2yWtO4/TA7wVS67Wpl3zjAoQz23n0c4sCryY="; + hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 93704c953ee80..8954713338025 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.208.0"; + version = "0.215.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; + hash = "sha256-7jWG9bk7NN3BhpzS2fi7OkAsxL0446hnqiNqhwiBGHc="; }; patches = [ diff --git a/pkgs/development/python-modules/stringparser/default.nix b/pkgs/development/python-modules/stringparser/default.nix index bac3159507818..44e6d6baa52f4 100644 --- a/pkgs/development/python-modules/stringparser/default.nix +++ b/pkgs/development/python-modules/stringparser/default.nix @@ -1,35 +1,50 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pytestCheckHook +, pythonOlder , setuptools , setuptools-scm -, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "stringparser"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hgrecco"; - repo = pname; - rev = version; - sha256 = "sha256-uyeHuH0UfpZqh7sMRI6+fR/Rr2jSzdR+5O/MtzslO5w="; + repo = "stringparser"; + rev = "refs/tags/${version}"; + hash = "sha256-gj0ooeb869JhlB9Mf5nBydiV2thTes8ys+BLJ516iSA="; }; - nativeBuildInputs = [ setuptools setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; - pythonImportsCheck = [ "stringparser" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "stringparser" + ]; meta = with lib; { description = "Easy to use pattern matching and information extraction"; homepage = "https://github.com/hgrecco/stringparser"; + changelog = "https://github.com/hgrecco/stringparser/blob/${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ evilmav ]; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 88c2ccf45963a..3f91435b3aa79 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, requests , pythonOlder +, requests +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "7.4.0"; - format = "setuptools"; + version = "7.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw="; + hash = "sha256-duDfcHHaXvORNNkpuMf6zxMZqkfCIr8ScrSKxVq/PW8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests typing-extensions diff --git a/pkgs/development/python-modules/succulent/default.nix b/pkgs/development/python-modules/succulent/default.nix index 3b191bae9b85e..e1ad7981b047d 100644 --- a/pkgs/development/python-modules/succulent/default.nix +++ b/pkgs/development/python-modules/succulent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; - rev = version; - hash = "sha256-fSsb2UQM69AAjJd/Rvzuok7jBeAa6udbB8FbuNP8Ztw="; + rev = "refs/tags/${version}"; + hash = "sha256-CGDgt6tv+KysrytJsgDKwf2yv6shXizvD67XsGBg+nI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 8759f35625966..84bc944317e1c 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; + hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 5635a61561594..eb66bea56f573 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # exe are only required when testpath is used on windows # https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128 - preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm testpath/cli-32.exe testpath/cli-64.exe ''; diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index 6da3e202672ad..b6bb8a1b22568 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -1,29 +1,44 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests , pytestCheckHook +, pythonOlder +, requests , responses +, setuptools-scm }: buildPythonPackage rec { pname = "testrail-api"; - version = "1.12.0"; + version = "1.12.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tolstislon"; repo = "testrail-api"; - rev = version; - sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk="; + rev = "refs/tags/${version}"; + hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + ]; + nativeCheckInputs = [ pytestCheckHook responses ]; - propagatedBuildInputs = [ - requests + pythonImportsCheck = [ + "testrail_api" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix new file mode 100644 index 0000000000000..16b77ffabc472 --- /dev/null +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, msgpack +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, textual +, time-machine +, typing-extensions +}: + +buildPythonPackage rec { + pname = "textual-dev"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual-dev"; + # we use rev instead of tag since upstream doesn't use tags + rev = "6afa9013a42cb18e9105e49d6a56874097f7c812"; + hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + msgpack + textual + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ + "textual_dev" + ]; + + meta = with lib; { + description = "Development tools for Textual"; + homepage = "https://github.com/Textualize/textual-dev"; + license = licenses.mit; + maintainers = with maintainers; [ yannip ]; + }; +} diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index fc944620e459b..a135332c3c05f 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.10"; + version = "0.9.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-PyrJhyJmuF7BZzlQ4f5fiJY5fYFC1JPRLto5ljPVbY4="; + hash = "sha256-xa7oDa8fzQT+hixuszCqCoLYfJcMLeZcHLlBT9KUWUo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index 841e6b5e09573..ced7f15387348 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -4,20 +4,59 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.5" +name = "anstream" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "memchr", + "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]] @@ -46,12 +85,9 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -60,13 +96,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "clap" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "cfg-if", - "crossbeam-utils", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +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.25", +] + +[[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 = "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]] @@ -170,9 +255,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" @@ -189,13 +280,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -210,15 +301,18 @@ dependencies = [ [[package]] name = "esaxx-rs" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f748b253ceca9fed5f42f8b5ceb3851e93102199bc25b64b65369f76e5c0a35" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] [[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 = "fnv" @@ -238,6 +332,12 @@ dependencies = [ ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "hermit-abi" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -256,45 +356,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[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 = "indoc" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] -name = "is-terminal" -version = "0.4.9" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", + "cfg-if", ] [[package]] -name = "itertools" -version = "0.8.2" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "either", + "hermit-abi", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "lazy_static" @@ -310,9 +423,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -326,15 +439,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "macro_rules_attribute" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -342,18 +455,9 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" @@ -367,9 +471,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -404,20 +508,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "ndarray" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09" -dependencies = [ - "matrixmultiply 0.2.4", - "num-complex 0.2.4", - "num-integer", - "num-traits", - "rawpointer", + "syn 2.0.25", ] [[package]] @@ -426,8 +517,8 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "matrixmultiply 0.3.7", - "num-complex 0.4.4", + "matrixmultiply", + "num-complex", "num-integer", "num-traits", "rawpointer", @@ -445,19 +536,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.2.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -474,22 +555,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numpy" @@ -498,8 +575,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", - "ndarray 0.15.6", - "num-complex 0.4.4", + "ndarray", + "num-complex", "num-integer", "num-traits", "pyo3", @@ -554,7 +631,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -570,6 +647,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,9 +660,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -646,9 +729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -691,9 +774,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -701,25 +784,23 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1259362c9065e5ea39a789ef40b1e3fd934c94beb7b5ab3ac6629d3b5e7cb7" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" dependencies = [ "either", - "itertools 0.8.2", + "itertools", "rayon", ] [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -733,11 +814,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-automata", "regex-syntax", @@ -745,20 +826,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-hash" @@ -768,54 +849,54 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -859,9 +940,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -870,9 +951,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -884,7 +965,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -898,33 +979,35 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "tokenizers" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", + "clap", "derive_builder", "esaxx-rs", "getrandom", - "itertools 0.9.0", + "indicatif", + "itertools", "lazy_static", "log", "macro_rules_attribute", @@ -947,12 +1030,12 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.14.0" +version = "0.14.1" dependencies = [ "env_logger", - "itertools 0.9.0", + "itertools", "libc", - "ndarray 0.13.1", + "ndarray", "numpy", "onig", "pyo3", @@ -965,9 +1048,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization-alignments" @@ -985,6 +1068,12 @@ 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_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -997,6 +1086,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1035,66 +1130,132 @@ 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", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" 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.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.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_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" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +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 = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +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 = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +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 = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +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 = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +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 = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 149f86a284fa8..d8a731825feb3 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE="; + hash = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 64c8d833a3fe9..f89fed489f84e 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -16,9 +16,10 @@ filelock, jinja2, networkx, - openai-triton, sympy, numpy, pyyaml, cffi, click, typing-extensions, + # ROCm build and `torch.compile` requires `openai-triton` + tritonSupport ? (!stdenv.isDarwin), openai-triton, # Unit tests hypothesis, psutil, @@ -34,16 +35,15 @@ # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, - linuxHeaders_5_19, - # dependencies for torch.utils.tensorboard pillow, six, future, tensorboard, protobuf, pythonOlder, # ROCm dependencies - rocmSupport ? false, - gpuTargets ? [ ], rocmPackages + rocmSupport ? config.rocmSupport, + rocmPackages, + gpuTargets ? [ ] }: let @@ -190,7 +190,7 @@ in buildPythonPackage rec { '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0 inline void *aligned_alloc(size_t align, size_t size)' @@ -287,6 +287,30 @@ in buildPythonPackage rec { # ... called on pointer ‘<unknown>’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12" ) [ "-Wno-error=free-nonheap-object" + ] + # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: + # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ + "-Wno-error=cast-function-type-strict" + # Suppresses the most spammy warnings. + # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. + ] ++ lib.optionals rocmSupport [ + "-Wno-#warnings" + "-Wno-cpp" + "-Wno-unknown-warning-option" + "-Wno-ignored-attributes" + "-Wno-deprecated-declarations" + "-Wno-defaulted-function-deleted" + "-Wno-pass-failed" + ] ++ [ + "-Wno-unused-command-line-argument" + "-Wno-uninitialized" + "-Wno-array-bounds" + "-Wno-free-nonheap-object" + "-Wno-unused-result" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-maybe-uninitialized" + "-Wno-stringop-overflow" ])); nativeBuildInputs = [ @@ -303,7 +327,6 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; buildInputs = [ blas blas.provider ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # <thrust/*> cuda_cudart # cuda_runtime.h and libraries @@ -356,12 +379,10 @@ in buildPythonPackage rec { # the following are required for tensorboard support pillow six future tensorboard protobuf - # ROCm build and `torch.compile` requires openai-triton - openai-triton - # torch/csrc requires `pybind11` at runtime pybind11 ] + ++ lib.optionals tritonSupport [ openai-triton ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 5ce5deace5d0d..fb510b7e764c1 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.7"; + version = "2023.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; + hash = "sha256-UTMYuSKNn5ACKg9BmeUf1SFhDV1jknbxggkmCgzB/xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 03b916883438f..e90648ec08102 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -1,38 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , click -, click-default-group +, fetchPypi +, git # shells out to git +, hatchling +, importlib-resources , incremental , jinja2 , mock , pytestCheckHook -, toml +, pythonOlder +, tomli , twisted -, setuptools -, git # shells out to git }: buildPythonPackage rec { pname = "towncrier"; - version = "23.6.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; + hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling ~= 1.17.1" "hatchling" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click - click-default-group incremental jinja2 - toml - setuptools + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; preCheck = '' diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 466d6db8da5aa..734bc324e266a 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -4,19 +4,19 @@ , coqpit , fsspec -, torch-bin +, torch , tensorboard , protobuf , psutil , pytestCheckHook , soundfile -, torchvision-bin +, torchvision }: let pname = "trainer"; - version = "0.0.31"; + version = "0.0.32"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; + hash = "sha256-lSfkokPFB09KZBHe/Qkon2gUsA82AK52WNK1bJfzCNc="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage { psutil soundfile tensorboard - torch-bin + torch ]; # only one test and that requires training data from the internet @@ -48,7 +48,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - torchvision-bin + torchvision ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 3c4fda87976fb..efee6e3d1fa47 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.35.0"; + version = "4.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-f66Y6kcAm//Z2UyCl/iEBDP+6nm3QJ5EtwpAnBn4gbc="; + hash = "sha256-h1RMSEcuali05AWeTm1wyZQJz6XrHamCF1eHrSnFnfM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index d098859f5108b..6eb833b92d50a 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.20.2"; + version = "0.20.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tree_sitter"; inherit version; - hash = "sha256-CmwGq6pV3hdCQaR2tTYXO7ooJB0uqF0ZjTOqi/AJ8Cg="; + hash = "sha256-atsSPi8+VjmbvyNZkkYzyILMQO6DRIhSALygki9xO+U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index e52f70753f327..389f31ba89bf0 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "refs/tags/v${version}"; - hash = "sha256-r0LZS8TXux1mzzXBTSu+x5sxUZOCzW7poKG3dQ2A6No="; + hash = "sha256-0rs+nBJfyXRj/3n/G2JzUDXaiIYZmWsoIcgLoWKhlV4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index dac090b3957a8..c053a9294fe99 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.10.1"; + version = "8.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-bOWyvgqa9h5SaGFPtdsvMS8HxY8Pg3uLgugXH+2opEA="; + hash = "sha256-3Gm1oKhKcTb3c+awMKVQ3qFKkdXC3azR1ECTdw60oCg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7fd258e9123fa..23e3bdc5b546e 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -54,8 +54,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # not compatible with python3.10 - "test_typed_dict" + # AssertionError: 'type of argument "x" must be ' != 'None' + "TestPrecondition::test_precondition_ok_and_typeguard_fails" + # AttributeError: 'C' object has no attribute 'x' + "TestInvariant::test_invariant_ok_and_typeguard_fails" + # AttributeError: 'D' object has no attribute 'x' + "TestInheritance::test_invariant_ok_and_typeguard_fails" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 41e92d025d3b9..4ce81ade979b2 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.19.10"; + version = "0.19.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-YowjnLt7eCBzBfklBOEEDRClp/ToA3KLi+xuftUoti4="; + hash = "sha256-N0erJxk0FN47IClSt0YiSYH58j9ysQFscSShN7rAD3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index bac128984bfb0..ea7e917199364 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "68.2.0.0"; + version = "68.2.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; + hash = "sha256-jzHoIB55aXieDrI0Y7U+vl9n2SQX30tkim6jw1fKT1E="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch new file mode 100644 index 0000000000000..ed177797da0c1 --- /dev/null +++ b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx +index b99647c..479cc9c 100644 +--- a/src/message_receiver.pyx ++++ b/src/message_receiver.pyx +@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase): + + #### Callbacks (context is a MessageReceiver instance) + +-cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): ++cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): + if context != NULL: + context_pyobj = <PyObject*>context + if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 207ad3d43727f..c306068f7fdbf 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -27,6 +27,9 @@ buildPythonPackage rec { patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch + ] ++ [ + # Fix incompatible function pointer conversion error with clang 16. + ./clang-fix-incompatible-function-pointer-conversion.patch ]; postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 49b56c5f1e30a..9eef1512490d1 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch }: buildPythonPackage rec { @@ -13,14 +12,6 @@ buildPythonPackage rec { hash = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; - patches = [ - # fix build with python 3.9 - (fetchpatch { - url = "https://github.com/freach/udatetime/pull/33.patch"; - sha256 = "02wm7ivkv1viqn2wflgd10dgpddfqfrwacmrldigb1mwb79n554j"; - }) - ]; - # tests not included on pypi doCheck = false; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 4083810195a9c..e68d0be6ad357 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; - rev = version; - hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A="; + rev = "refs/tags/release-${version}"; + hash = "sha256-bXAQjq7xBYn34tIZF96Sr5jDUii3s4FGkNx65rGKXkY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix new file mode 100644 index 0000000000000..e6633ab2e6768 --- /dev/null +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unidecode +, sphinx +, pythonAtLeast +, pythonOlder +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "uqbar"; + version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-cEhWXGtMSXVjT5QigDedjT/lwYQnVqPCE5vbctXWznk="; + }; + + propagatedBuildInputs = [ + unidecode + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pytestFlagsArray = [ + "tests/" + "-vv" + "-rf" + "--cov-branch" + "--cov-report=html" + "--cov-report=term" + "--doctest-modules" + ]; + + disabledTests = [ + # UnboundLocalError: local variable 'output_path' referenced before + # assignment + "test_01" + # AssertionError: assert False + "test_sphinx_book_html_cached" + # FileNotFoundError: [Errno 2] No such file or directory: 'unflatten' + "test_sphinx_style_html" + # assert not ["\x1b[91mWARNING: dot command 'dot' cannot be run (needed for + # graphviz output), check the graphviz_dot setting\x1b[39;49;00m"] + "test_sphinx_style_latex" + ] + # assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring + ++ lib.optional (pythonAtLeast "3.11") "test_sphinx_style"; + + pythonImportsCheck = [ "uqbar" ]; + + meta = { + description = "Tools for creating Sphinx and Graphviz documentation"; + license = lib.licenses.mit; + homepage = "https://github.com/josiah-wolf-oberholtzer/uqbar"; + changelog = + "https://github.com/josiah-wolf-oberholtzer/uqbar/releases/tag/v${version}"; + maintainers = [ lib.maintainers.davisrichard437 ]; + }; +} diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index a5a3e6b8b644b..7a374f7c0c2c5 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,5 @@ { lib +, backports-zoneinfo , brotli , brotlicffi , buildPythonPackage @@ -8,44 +9,55 @@ , hatchling , idna , isPyPy -, mock , pyopenssl , pysocks -, pytest-freezegun , pytest-timeout , pytestCheckHook -, python-dateutil +, pythonOlder , tornado , trustme }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.0.5"; - format = "pyproject"; + version = "2.0.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E6vzc4LqLOb7dE1NrWeDjuyFfJ9PVwCYkYBeC14SNZQ="; + hash = "sha256-yX394fe9Q6ccjSpY42npsr9pLRM06p+crlWt19DdD4Q="; }; nativeBuildInputs = [ hatchling ]; - # FIXME: remove backwards compatbility hack - propagatedBuildInputs = passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; + passthru.optional-dependencies = { + brotli = if isPyPy then [ + brotlicffi + ] else [ + brotli + ]; + # Use carefully since pyopenssl is not supported aarch64-darwin + secure = [ + certifi + cryptography + idna + pyopenssl + ]; + socks = [ + pysocks + ]; + }; nativeCheckInputs = [ - python-dateutil - mock - pytest-freezegun pytest-timeout pytestCheckHook tornado trustme - ]; + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will @@ -60,6 +72,8 @@ buildPythonPackage rec { # Still, failures can occur and for that reason tests are disabled. doCheck = false; + passthru.tests.pytest = self.overridePythonAttrs (_: { doCheck = true; }); + preCheck = '' export CI # Increases LONG_TIMEOUT ''; @@ -68,29 +82,12 @@ buildPythonPackage rec { "urllib3" ]; - passthru.optional-dependencies = { - brotli = if isPyPy then [ - brotlicffi - ] else [ - brotli - ]; - # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ - certifi - cryptography - idna - pyopenssl - ]; - socks = [ - pysocks - ]; - }; - meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; + description = "Powerful, user-friendly HTTP client for Python"; + homepage = "https://github.com/urllib3/urllib3"; changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -} +}; +in self diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 38283c71acd63..9ee7fec919445 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,34 +3,42 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system , cython +, setuptools + +# native dependencies , libuv , CoreServices , ApplicationServices -# Check Inputs +# tests , aiohttp , psutil , pyopenssl -, pytest-forked , pytestCheckHook }: buildPythonPackage rec { pname = "uvloop"; - version = "0.17.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.19.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; + hash = "sha256-Akb0/Rvyv3AuBrDUXukWd+5cMSQvOaq06m/gxRrt0P0="; }; nativeBuildInputs = [ cython + setuptools ]; + env.LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -38,45 +46,25 @@ buildPythonPackage rec { ApplicationServices ]; - dontUseSetuptoolsCheck = true; nativeCheckInputs = [ - pytest-forked + aiohttp + pyopenssl pytestCheckHook psutil - ] ++ lib.optionals (pythonOlder "3.11") [ - aiohttp ]; - LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; - pytestFlagsArray = [ - # from pytest.ini, these are NECESSARY to prevent failures - "--capture=no" - "--assert=plain" - "--strict" - "--tb=native" - # Depend on pyopenssl - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" - # test gets stuck in epoll_pwait on hydras aarch64 builders - # https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" - # Tries to import cythonized file for which the .pyx file is not shipped via PyPi - "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" - # Tries to run "env", but fails to find it + # Tries to run "env", but fails to find it, even with coreutils provided "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" # AssertionError: b'' != b'out\n' "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Segmentation fault - "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ]; disabledTestPaths = [ @@ -84,23 +72,13 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = '' + # force using installed/compiled uvloop + rm -rf uvloop + '' + lib.optionalString stdenv.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' - # pyopenssl is not well supported by upstream - # https://github.com/NixOS/nixpkgs/issues/175875 - substituteInPlace tests/test_tcp.py \ - --replace "from OpenSSL import SSL as openssl_ssl" "" - # force using installed/compiled uvloop vs source by moving tests to temp dir - export TEST_DIR=$(mktemp -d) - cp -r tests $TEST_DIR - pushd $TEST_DIR - ''; - - postCheck = '' - popd ''; pythonImportsCheck = [ @@ -112,6 +90,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/MagicStack/uvloop/releases/tag/v${version}"; description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 3962b608ca3a2..bbd43887025cc 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python-versioneer"; repo = "python-versioneer"; rev = "refs/tags/${version}"; - hash = "sha256-seYT/v691QB0LUzeI4MraegbNILU3tLO//9UbZIfe+A="; + hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 23b41404034f9..d90a71ca2582c 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.6"; + version = "1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-OrRR5wLTq3icSBq+9m+MxIvkTvJP7yiGR9yzPt53q+k="; + hash = "sha256-Q29Nh/4Z3tYuwoodWKDl5FS+lfl9yDXN7RHn/RReCds="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 801b108e50428..97ceedec0d268 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.0.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; rev = "refs/tags/${version}"; - hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; + hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; + changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 6b1ffcb31f52d..727ec482c161a 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "weasel"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "weasel"; rev = "refs/tags/v${version}"; - hash = "sha256-I8Omrez1wfAbCmr9hivqKN2fNgnFQRGm8OP7lb7YClk="; + hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix index 9246b2b571e7a..dba9d91875c2b 100644 --- a/pkgs/development/python-modules/web-cache/default.nix +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Simple Python key-value storage backed up by sqlite3 database"; homepage = "https://github.com/desbma/web_cache"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index c99e89944c477..3f85f8064899d 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.2"; + version = "0.48.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-8JJBWF53VOmTD/uetCURFaTkfSTax/YeafKsZtA1xAA="; + hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e3bb7c34b5b97..e9f4877110efe 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.59.4"; + version = "0.59.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z9tiK6oDyyMcXhgUUxSDL9URYDp6Uz8rFPART3qxd+s="; + hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 5f77c34f98ade..2b98674fb5759 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; homepage = "https://github.com/rspeer/wordfreq/"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index cafc66dab9e30..2daf40454974b 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU="; + hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8="; }; configureFlags = [ diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index f44d2e4435664..065f434bd7ee4 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -1,20 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , clikit , poetry-core -, pytestCheckHook }: buildPythonPackage rec { version = "6.0.0"; pname = "xdg"; - disabled = isPy27; + disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchFromGitHub { - owner = "srstevenson"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; + # the github source uses `xdg_base_dirs`, but pypi's sdist maintains `xdg` for compatibility. + # there are actually breaking changes in xdg_base_dirs, + # and libraries that want to support python 3.9 and below need to use xdg. + src = fetchPypi { + inherit pname version; + hash = "sha256-JCeAlPLUXoRtHrKKLruS17Z/wMq1JJ7jzojJX2SaHJI="; }; nativeBuildInputs = [ poetry-core ]; @@ -23,7 +26,12 @@ buildPythonPackage rec { clikit ]; - nativeCheckInputs = [ pytestCheckHook ]; + # sdist has no tests + doCheck = false; + + pythonImportsCheck = [ + "xdg" + ]; meta = with lib; { description = "XDG Base Directory Specification for Python"; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 0d11e9df8c1be..d4a04317ad800 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.19.5"; + version = "1.19.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zEgC3tTQ6kwDovHPHRTvYndWVF79DpnAX454VDZiedE="; + hash = "sha256-zrdR4KuORCGIoRTZDednT9JDV/seWQRa3aPal8gxdTE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xlsxwriter/default.nix b/pkgs/development/python-modules/xlsxwriter/default.nix index f19fe38366cd6..5bd96b3aa1b63 100644 --- a/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/pkgs/development/python-modules/xlsxwriter/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.1.7"; + version = "3.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-ZOKS9sTZvlopfIYOEhOk/rq4qtcMrNQ4Bwb8lDtKfxs="; + hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; homepage = "https://xlsxwriter.readthedocs.io/"; + changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 3657997f5a74e..eac1153b4f50a 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , buildPythonPackage , python , ndtypes @@ -15,6 +16,17 @@ buildPythonPackage { propagatedBuildInputs = [ ndtypes ]; + buildInputs = [ libndtypes ]; + + patches = [ + # python311 fixes which are on main. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch"; + hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 2531a6648e36f..40af2c4fb629f 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.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw="; + hash = "sha256-vDkrKVqyisPkswvfb+UPH95mehwNgyFxRmeT+1UHvXs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index cb9075567274c..c4c3cd8b8d23b 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.4.20"; - source.sha256 = "sha256-dEsrGVHaYTryr2hU98H54W3ZC0tmzZrxonqfRIx2G+4="; + version = "2.4.22"; + source.sha256 = "sha256-dHulCw5n3yXL07SPlYMad6TVOlgdVfBjly/LFG0ULF8="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cd814e4b41452..a380f9734bfda 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx +, cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie @@ -76,7 +76,7 @@ in cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -376,7 +376,12 @@ in }; iconv = attrs: { + dontBuild = false; buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + patches = [ + # Fix incompatible function pointer conversion errors with clang 16 + ./iconv-fix-incompatible-function-pointer-conversions.patch + ]; }; idn-ruby = attrs: { diff --git a/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch new file mode 100644 index 0000000000000..1cc38cbae1357 --- /dev/null +++ b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch @@ -0,0 +1,51 @@ +diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c +index 2801049..77fae7e 100644 +--- a/ext/iconv/iconv.c ++++ b/ext/iconv/iconv.c +@@ -188,7 +188,7 @@ static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, in + static VALUE iconv_s_allocate _((VALUE klass)); + static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self)); +-static VALUE iconv_s_convert _((struct iconv_env_t* env)); ++static VALUE iconv_s_convert _((VALUE env)); + static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_init_state _((VALUE cd)); + static VALUE iconv_finish _((VALUE self)); +@@ -204,7 +204,7 @@ static VALUE charset_map; + * Returns the map from canonical name to system dependent name. + */ + static VALUE +-charset_map_get(void) ++charset_map_get(VALUE klass) + { + return charset_map; + } +@@ -642,7 +642,7 @@ iconv_s_allocate(VALUE klass) + } + + static VALUE +-get_iconv_opt_i(VALUE i, VALUE arg) ++get_iconv_opt_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) + { + VALUE name; + #if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ +@@ -784,8 +784,9 @@ iconv_s_open(int argc, VALUE *argv, VALUE self) + } + + static VALUE +-iconv_s_convert(struct iconv_env_t* env) ++iconv_s_convert(VALUE env_value) + { ++ struct iconv_env_t* env = (struct iconv_env_t*)env_value; + VALUE last = 0; + + for (; env->argc > 0; --env->argc, ++env->argv) { +@@ -906,7 +907,7 @@ list_iconv(unsigned int namescount, const char *const *names, void *data) + + #if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST) + static VALUE +-iconv_s_list(void) ++iconv_s_list(VALUE klass) + { + #ifdef HAVE_ICONVLIST + int state; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index b9d0a663aaf18..0e15bec58def4 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.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0="; + hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 6d77425814636..33fed022b0310 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 = "5.2.5"; + version = "5.2.6"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-KpAfPZqDfbf3LLBhTZ/rFftGf42onJnFMvnO2jzxqmo="; + sha256 = "sha256-SNXUARAu4szX7otyAKy3F/piNhxlPVNN6Dj2UwevL8A="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1e45079aa7834..2609859b40f77 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.0.32"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-YOZ7F/bxbnBh3mhiFL3cMMAc3qeOMab48LcvYeJgfrg="; + hash = "sha256-MHiM9ZiVLTqMapebN0gW6WZjHzwm8HvtjZlo31ol+Ak="; }; patches = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index d6c6740e2a26c..96bd017e77765 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.12.4"; + version = "10.12.5"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-ecWTB/4Lc7zgkQI6nN5VvKfRizeMEdyGUyL0fxiAHhk="; + sha256 = "sha256-DAUPngTL9c2MePG5ISLul+iRvnwqChg04fo63aKAee0="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ba5e608bd3549..6ed8c18d0b1a3 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.219.5"; + version = "0.222.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-cg0tqwvYQ43Nvu6fQHGEX002sjmDBcz2AGke+K5Gk7g="; + sha256 = "sha256-IOy6zsDGUfiSeOalQnku/4uNyjqpz2bMcpmf7Vq9fyI="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index d5bcd116dc203..412b62593d271 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config which makeWrapper ]; buildInputs = [ libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto - libpfm zlib python3Packages.python python3Packages.pexpect procps capnproto ]; cmakeFlags = [ "-Ddisable32bit=ON" diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 09222eb1d6f2c..4c901c58f0314 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -1,22 +1,32 @@ -{ buildNpmPackage, fetchFromGitHub, nodePackages, python3, lib }: +{ buildNpmPackage, fetchFromGitHub, lib, stdenv, testers, snyk }: buildNpmPackage rec { pname = "snyk"; - version = "1.1207.0"; + version = "1.1248.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "v${version}"; - hash = "sha256-wEXE+dcAfBK7fuoB23RdPSbJCaovB5sXrFO0QGyf+aw="; + hash = "sha256-pdjua3dMHM/21E6NxxsZu3OAMMrW+OCzci+lvWznNdM="; }; - npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4="; + npmDepsHash = "sha256-6cQjSJRXtj97pS8vBzohjSwC44GYv1BvFii15bm/reE="; - nativeBuildInputs = [ nodePackages.node-gyp python3 ]; + postPatch = '' + substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' + ''; + + env.NIX_CFLAGS_COMPILE = + # Fix error: no member named 'aligned_alloc' in the global namespace + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; npmBuildScript = "build:prod"; + passthru.tests.version = testers.testVersion { + package = snyk; + }; + meta = with lib; { description = "Scans and monitors projects for security vulnerabilities"; homepage = "https://snyk.io"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a43520ecb4b79..c8046b68cd96d 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.21.0"; + version = "3.22.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-EM4WGLs+M/rRbreVUrCj4SEXYkSKDX/OEcimJDuayXE="; + hash = "sha256-yBHbWt0sX3KZRMr0fE56Zdyqu5Rh5HK1eHZd179tLUw="; }; patches = [ diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/development/tools/api-linter/default.nix index b34e2ed4f80fc..5b0e8e7c5928c 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/development/tools/api-linter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.59.0"; + version = "1.59.1"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-rT7mN/vW7o7Qj2BUYmwePJtvURYdgvRK7Oi7Rw/RK4A="; + hash = "sha256-PgDdCcXiy9Dpop2myuRoi8KQROZdJ76ce4ax7wU4bpc="; }; - vendorHash = "sha256-TV0lA0DkQu3e9aq2uX4Ea8vrvDXxM8vgOn7EXGjld9E="; + vendorHash = "sha256-egAZ4CeSSStfkN2mGgzGHTBojHKHoVEf3o0oi+OpMkw="; subPackages = [ "cmd/api-linter" ]; @@ -23,7 +23,7 @@ buildGoModule rec { "-w" ]; - # reference: https://github.com/googleapis/api-linter/blob/v1.59.0/.github/workflows/release.yaml#L76 + # reference: https://github.com/googleapis/api-linter/blob/v1.59.1/.github/workflows/release.yaml#L76 preBuild = '' cat > cmd/api-linter/version.go <<EOF package main diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 9aff7365d767d..b36331e8126f1 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-BpTborNURfLdw4eyPbGMyNOSvtePB+lcCrCKTl0LoGQ="; + hash = "sha256-bF+NTiPrqWD1B/v44+XuxXotOPhUBCYyg6h+T/ydmGM="; }; - cargoHash = "sha256-1FdimBQZ4SvAnrYzNnyulUT8b8bTnJfnWRNosfQqSco="; + cargoHash = "sha256-T6NfjlHQhHwfcAnmr8R2WWXVKgMZZXFq6IvlvWOVACg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix index 5a3cd9c640108..b8eef344f20dd 100644 --- a/pkgs/development/tools/ats-acc/default.nix +++ b/pkgs/development/tools/ats-acc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pretty-print error messages of the ATS Compiler"; homepage = "https://github.com/sparverius/ats-acc"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.unfree; # Upstream has no license }; } diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c39dca4e28d86..3c60d0e25e2eb 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,19 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.1"; + version = "10.21.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; - rev = "v${version}"; - sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-FdiDxWmCRkSOa+6A9XgKeyFGk/ba+BgFm3/ChERkYvk="; }; subPackages = [ "." ]; - vendorHash = "sha256-byFroeXRMepN9RYak2++tT9IE8ZbT+0qJAyipHkE5WE="; + vendorHash = "sha256-F5YMPwdS2A5FAwuG1gfiAqBKapZ24VIGzJXnwojoDk0="; doCheck = false; @@ -22,8 +26,10 @@ buildGoModule rec { ''; meta = with lib; { - maintainers = with maintainers; [ colemickens kashw2 ]; - license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; + homepage = "https://github.com/Azure/azure-storage-azcopy"; + changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens kashw2 ]; }; } diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index e187dbf6b3937..cf039c5758f5e 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -27,7 +27,7 @@ }; }; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 5ac8f971cf35a..441496ed4352c 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform"); + src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform"); nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 88d31f718ef6f..55c30a12addfc 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.024871", - "publishDate": "2023-10-24T04:09:23.7109231Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", - "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", - "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", - "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "stable", - "buildId": "1.0.024741", - "publishDate": "2023-10-10T20:13:22.904778Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/linux/StaticSitesClient", - "sha": "0e174b1551a495dbb751240201b8d264f86264c704d66678c189fe4d94f53502" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/windows/StaticSitesClient.exe", - "sha": "cb8d6e7cf83ab7ee394627b088f42de6e63fa77ed5c56eb79a088a1de02163ff" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/macOS/StaticSitesClient", - "sha": "1ef4292cad223972ed820921d29f6b844e18edd732c99c183269e86b150a8224" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "backup", - "buildId": "1.0.024671", - "publishDate": "2023-10-04T00:20:16.1747762Z", + "buildId": "1.0.024871", + "publishDate": "2023-10-24T04:09:23.7109231Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/linux/StaticSitesClient", - "sha": "82b8181bb5ea47e1d449c1c56e622bd350513dd97f27ac4abd25bd139fde92e2" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", + "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/windows/StaticSitesClient.exe", - "sha": "a7660746d9dbed8814259547da7f96122d01ae90de6f8aa5ccf7b07b58f59f19" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", + "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/macOS/StaticSitesClient", - "sha": "7584bea04c7d9e685216d4248063226d5a230cc955e560885a48737d1abd385e" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", + "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" } } } diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index dda16c2384369..be59f6686d5bb 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NZDdSIXNQFSCoav+YN1VLFrHQSKZfoZDp2TWXtmQC6o="; + sha256 = "sha256-no1+sQ+8Ead1diCYytC3MXVA68SuWWxt40OFVrGWYdQ="; }; - vendorHash = "sha256-oYagIEb/u/XCTbZkvynxcOtORhW75hReinrVAkdOApM="; + vendorHash = "sha256-hjV7Pc3DFExSCsA0jKVxb1GxoXQ7LRFGuot3V0IHG58="; doCheck = false; diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 05b7d61f858e4..3aa78a18ecd96 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.27.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-3kJPBvw12iyAu9WVIZgyUrsW6XQ0AqpDmDl1E72vyuE="; + hash = "sha256-18kXDdkwT0bINpwQ5sG+ic0ZFJS/vBMidzo67/C/fbM="; }; - vendorHash = "sha256-ikrpFnn+CTuhttd3gVyoKU3RIBRR/zL8YjvE0tjIH6I="; + vendorHash = "sha256-UbXKMeia6j5xARzO8GjRiDn6GGYz7gjEIdP8ylvJGT4="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index c96e5a7194863..65a039d34cf86 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , libgit2_1_6 +, rust-jemalloc-sys , zlib , stdenv , darwin @@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libgit2_1_6 + rust-jemalloc-sys zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 8c46b2456ee37..f22e7c3c22af4 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.3"; + version = "6.4.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; + hash = "sha256-k4qbveJ1BORnwjOIZcJLWIGVMRjCAqVhISggQ/VTzA4="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index e007cbac9582d..4506e3f0f8615 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh deleted file mode 100644 index 6305a405af21a..0000000000000 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -mesonConfigurePhase() { - runHook preConfigure - - if [ -z "${dontAddPrefix-}" ]; then - mesonFlags="--prefix=$prefix $mesonFlags" - fi - - # See multiple-outputs.sh and meson’s coredata.py - mesonFlags="\ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --localedir=${!outputLib}/share/locale \ - -Dauto_features=${mesonAutoFeatures:-enabled} \ - -Dwrap_mode=${mesonWrapMode:-nodownload} \ - $mesonFlags" - - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" - - echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - - meson setup build $mesonFlags "${mesonFlagsArray[@]}" - cd build - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "meson: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "meson: enabled parallel installing" - fi - - runHook postConfigure -} - -if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= - configurePhase=mesonConfigurePhase -fi diff --git a/pkgs/development/tools/build-managers/scons/3.1.2.nix b/pkgs/development/tools/build-managers/scons/3.1.2.nix new file mode 100644 index 0000000000000..097a8ffd519eb --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/3.1.2.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "3.1.2"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + setupHook = ./setup-hook.sh; + + doCheck = true; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.1.0.nix b/pkgs/development/tools/build-managers/scons/4.1.0.nix new file mode 100644 index 0000000000000..65499280c2c4a --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.1.0.nix @@ -0,0 +1,50 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.1.0"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-ctKNdi4hJnh/Fz49WeCJI5+LL06e8xFNV/ELEgaYXYU="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.5.2.nix b/pkgs/development/tools/build-managers/scons/4.5.2.nix new file mode 100644 index 0000000000000..61d1719642e08 --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.5.2.nix @@ -0,0 +1,54 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.5.2"; + src = fetchurl { + url = "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"; + hash = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + patches = [ + ./env.patch + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix deleted file mode 100644 index 64890d12cea96..0000000000000 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ version, sha256 }: - -{ fetchurl, python, lib }: - -python.pkgs.buildPythonApplication rec { - pname = "scons"; - inherit version; - - src = fetchurl { - url = - if lib.versionAtLeast version "4.3.0" then - "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz" - else - "mirror://sourceforge/scons/scons-${version}.tar.gz"; - inherit sha256; - }; - - setupHook = ./setup-hook.sh; - - patches = lib.optionals (lib.versionAtLeast version "4.3.0") [ - ./env.patch - ]; - - postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" - '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' - substituteInPlace setup.cfg \ - --replace "build/doc/man/" "" - ''; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = lib.versionOlder version "4.0.0"; - - postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" - ''; - - passthru = { - # expose the used python version so tools using this (and extensing scos with other python modules) - # can use the exact same python version. - inherit python; - }; - - meta = with lib; { - description = "An improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - homepage = "https://scons.org/"; - changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix deleted file mode 100644 index f338d346a7017..0000000000000 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ callPackage, python2, python3 }: - -let - mkScons = args: callPackage (import ./common.nix args) { - python = python3; - }; -in { - scons_3_1_2 = (mkScons { - version = "3.1.2"; - sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }); - scons_4_1_0 = mkScons { - version = "4.1.0"; - sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; - }; - scons_latest = mkScons { - version = "4.5.2"; - sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; - }; -} diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index a22150594361f..a6761a7350c78 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.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-imhl8CezFoSi0M0nMxIFL/ZVa8eDAA4s/ZVIMr/QUJ4="; + hash = "sha256-Av4wrJ+anVu1pTSFTpaseBhj+7ECsRoKb1bATrUKYuo="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index b8ab1367ab1c9..2aca42bbb262d 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-pjeqaLCxWq2maz+C4jCNNRhYhclvcABi6zC+Qxy2GPw="; + hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; }; - vendorHash = "sha256-pBRU/eWuI14uDmTPo593hW0YAye5Y1Fm1axd/+X7nS8="; + vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index 859ce0a7468f1..aff3646340ed8 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.5"; + version = "2.2.6"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-Cu1bbLzVOAvPNzTavaMUfW2SCnQHc9mOM+IHAgVHhT4="; + sha256 = "sha256-esewCJw4o4SfSst5ALZ90X3XgOuOAsaxytpotvFeHB0="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 62856ffd389a0..5dfec9c11a874 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.106.1"; + version = "0.107.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W+3sqWPYpMkbmA8dGEodZy+pZGRBLJdthicBFdkn6oU="; + sha256 = "sha256-PaIjeqL32CADE+m6kq7VIDXMBvEEMVW8eSlXiIwNEJ4="; }; - vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; + vendorHash = "sha256-OHeoa3SXmDiUROxFiprlq/gfnqMjha6PQ8tlkr7Pd00="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 57a78dbb3101a..c0c15a121738f 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -15,12 +15,11 @@ , runtimeShell # List of Node.js runtimes the package should support , nodeRuntimes ? [ "node20" ] -, nodejs_16 , nodejs_20 }: # Node.js runtimes supported by upstream -assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; +assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; @@ -210,8 +209,6 @@ buildDotnetModule rec { preCheck = '' mkdir -p _layout/externals - '' + lib.optionalString (lib.elem "node16" nodeRuntimes) '' - ln -s ${nodejs_16} _layout/externals/node16 '' + lib.optionalString (lib.elem "node20" nodeRuntimes) '' ln -s ${nodejs_20} _layout/externals/node20 ''; @@ -250,8 +247,6 @@ buildDotnetModule rec { # externals/node$version. As opposed to the official releases, we don't # link the Alpine Node flavors. mkdir -p $out/lib/externals - '' + lib.optionalString (lib.elem "node16" nodeRuntimes) '' - ln -s ${nodejs_16} $out/lib/externals/node16 '' + lib.optionalString (lib.elem "node20" nodeRuntimes) '' ln -s ${nodejs_20} $out/lib/externals/node20 '' + '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f07ac564b88a7..479f319c5426a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.5.0"; + version = "16.6.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-C37ijxvyY9PG/Qn29Fmk0pxK+hq45kHIBveBltfIfTo="; + vendorHash = "sha256-m0+iAJITX0JfBd5ZboqlcG6eNbPJ35gHa4LV21jX5d8="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-NLidtwn1zT7BxzMEF5K41fwbZaICA/KuAr8MIjpJD+A="; + sha256 = "sha256-4N00+yO7Ps0+jy7WmHhm4Eh4MXt3beH00ScZ1RWNByE="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index aa4de161d9ce2..1de4ffddd0743 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.414.3"; + version = "2.426.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-LZMlS8GG3zSbxK0GtrHddXxJMZDwVY0RHb2pUXqEe1k="; + hash = "sha256-jYTzzdZDDAmNH084dAlX4/LQrCYbL5xoy/nDBjY/0cg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix index 3703cc757c691..ba7ebe5db1719 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/development/tools/darklua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-lBnEMQqAUkr377aYNRvpbIyZMmB6NIY/bmB1Oe8QPIM="; + hash = "sha256-9ukhKAhN4dD36Em90Eox8o+7W1eXboG2xAE8+oPlhaI="; }; - cargoHash = "sha256-YmtOVS58I8YdNpWBXBuwSFUVKQsVSuGlql70SPFkamM="; + cargoHash = "sha256-hi9kzCwsw8c1tcvSsFV0do/jQ/KyDz3TcTEfOqHNxyw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 337f0393dca9a..7afa8b43a855f 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -1,24 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: buildGoModule rec { pname = "atlas"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-dOqL/9sJUbaHqF3N5PEL7f6LxQQWNL0FvaH5BxQp4Xg="; + hash = "sha256-qEui+Y7auNFJwLSUT90jJH7IPgNW06phbJel9y3C1bk="; }; modRoot = "cmd/atlas"; - vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis="; + proxyVendor = true; + vendorHash = "sha256-BJB+ZwrfZsYlyVX0G3qNQW8KexxMmc1Y9m2TRbOX6Tc="; nativeBuildInputs = [ installShellFiles ]; - env.GOWORK = "off"; - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; subPackages = [ "." ]; @@ -30,6 +29,12 @@ buildGoModule rec { --zsh <($out/bin/atlas completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = atlas; + command = "atlas version"; + version = "v${version}"; + }; + meta = with lib; { description = "A modern tool for managing database schemas"; homepage = "https://atlasgo.io/"; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fe89b0c791e3d..69797da5af872 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.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk="; + hash = "sha256-6NeReekizEBRfsiRBshBD5WrGJpDdNpvvC7jslpsQoI="; }; - vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ="; + vendorHash = "sha256-r3IuE5qdN3B9IZyRjLokaRZ99Ziypbfg4H/uiMzSB+w="; doCheck = false; diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 83b1fb0c9f718..27b37eff489b2 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uao8I3b38JZWpO5iM+qvV4CDxWg1ueYm7BoaW/+FOkA="; + sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4="; }; ldflags = [ diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index e36f0760ec187..80883ebfe9965 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.4.0"; + version = "1.5.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-SSt3QOc8eKpcCHxfOuY+eAkH/xiFBUp2bJ9QXP9pq9M="; + sha256 = "sha256-T7Jfxup3yTh0YhalUO/wxyAT4209BhZkUTbCGZggcJ0="; }; - vendorHash = "sha256-ODIDlP0w3t1t7H5jevXkKmFpWVSJFUwmT66LOS+ySI4="; + vendorHash = "sha256-NYWmTXGxt2ko/puNiY2Z0K6gFZW4IC//iT6xQcqSVsQ="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index c373b18108a2a..f6dadecaefa4a 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-xjmxikIcR3v5lpxq7w2p0bukPunUTYH/HTQhy9fAOz8="; + hash = "sha256-Hh4SfmdR7hujc6Ty+ay8uyl1vkjYuxwa5J5RacqHOAE="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-fDh+6aBrHUqioNbgufFiD5c4i8SGAYrUuFXgTVmhrRE="; + vendorHash = "sha256-SVChgkPgqhApWDNA1me41zS0hXd1G2oFrL/SsnFiIsg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index b7e24e34ac31a..6ddb483e03c0c 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.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ED74Cqq2fw+TpkJyipxlBpKq60ScZinlPj0hEX13/0="; + sha256 = "sha256-e9sa9LniG5fj3S+x9T91v6ILPI0CD2y3QnZxXcKy6Ik="; }; meta = with lib; { diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 1cc99e2aeaacb..2c0891d75a954 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.19.5"; + version = "0.19.7"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mIXsPj804jxDd8+jPH8tWnnUj7dXIRwfKTeT4WDWb5c="; + hash = "sha256-a7IxZhmprwQuBqxTOaHo2KzguhXXQmrhaE7fHGh0yrQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; @@ -22,7 +22,7 @@ buildGoModule rec { homepage = "https://esbuild.github.io"; changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ lucus16 marsam undefined-moe ]; + maintainers = with maintainers; [ lucus16 marsam undefined-moe ivan ]; mainProgram = "esbuild"; }; } diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index c5089bc2d7f35..d1d48796909e5 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-D5ck96nR8agiYf1t6ViOaEWws9AQ0EBZ48YKp68jfRA="; + hash = "sha256-CNEfqrysSETTJzhVl45Aip04QRxE9Kbqalu6SLQ16i4="; }; - cargoHash = "sha256-mKpAGS6Rxoq2v/VW0AncVx/9BjvG7wM8ePTR+661e5U="; + cargoHash = "sha256-9eQm2+p8eXrfbvdjfqQrbQ4oprNJL8rO88gafBe8/RQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 383ca09294491..026dbbcc54828 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { "-s" "-w" "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" - "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" + "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}" ]; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 4a2ec51260806..cf05403e0256e 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.1.4"; + version = "4.5.0"; - nugetSha256 = "sha256-9wMQj4+xmAprt80slet2wUW93fRyEhOhhNVGYbWGS3Y="; + nugetSha256 = "sha256-KeNkS2fuZFnI8WVqSpIRjo2eA+XKuHLLpMIzDzgqXdg="; meta = with lib; { description = "Fable is an F# to JavaScript compiler"; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index a8d8c7348b0f9..b6ff7cc91c236 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-txHkQDLyIejsEZGpfIGqeiJ8EUePZq1btxfd+EZD4aM="; + sha256 = "sha256-wAPTJXD2CxZQA2EG4rQCM9v3dIu6hn3q23K7Vv9wkAk="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index dab6f0aa4fbfe..a04c8a9e14e9f 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -15,7 +15,6 @@ (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) - (fetchNuGet { pname = "fake-cli"; version = "5.23.0"; sha256 = "1bmw5kyc9q1sqd08pamibgk0qm5xwylawc5nfrnfx3pl1pifd71y"; }) (fetchNuGet { pname = "Fake.Api.GitHub"; version = "5.20.4"; sha256 = "1hgzqin7bm5fm0n97w7s9cq3zcxyncjmd6xk2da3p12wi7kghx0v"; }) (fetchNuGet { pname = "Fake.Core.CommandLineParsing"; version = "5.23.1"; sha256 = "10zlkri6w2xly19v4qqvg9vii5mjwbjqfynn525swzwyna9jws76"; }) (fetchNuGet { pname = "Fake.Core.Context"; version = "5.23.1"; sha256 = "1z3a77d53f5084sai9r9w9cdnyp4xn3x0262nhsi0znx52vizppl"; }) @@ -39,17 +38,17 @@ (fetchNuGet { pname = "Fake.IO.Zip"; version = "5.23.1"; sha256 = "0iac86jlxb5bwgiich3zzvr7bz5aw8xq53ly263mwxhv9lrsd815"; }) (fetchNuGet { pname = "Fake.Net.Http"; version = "5.23.1"; sha256 = "1g0dpxi5b78qh7myz09pmjxzb0iblj3rqx5mpaammbppbbazvzdk"; }) (fetchNuGet { pname = "Fake.Tools.Git"; version = "5.23.1"; sha256 = "0cg1sbp7zl1d18cjhbs94ix8580hr6gyaxjw17q246lbaj9bfg8l"; }) - (fetchNuGet { pname = "fantomas"; version = "6.2.0"; sha256 = "0jmr63c2a4maf1blcsiyxz9najrc31xk1ignc7j7l2sswis6hx7k"; }) + (fetchNuGet { pname = "fantomas"; version = "6.2.2"; sha256 = "1ln1czswz8njwn1wgsq0psh7dcw6smjcilqxg8978mq05ki7i4dg"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) (fetchNuGet { pname = "Fantomas.FCS"; version = "6.2.0"; sha256 = "1hhsa7hbxsm2d8ap4sqzwlzjmf4wsgg74i731rprr0nshjvd8ic7"; }) (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.11.0"; sha256 = "0djgbxnygmpdkrw923z2vgirs5kamrvf94ls7pvnk43c52xlb0pf"; }) - (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.400"; sha256 = "1sdc63vyplw02s5wzrly1kdsmhb144arj57q22yggigmsrhzqlag"; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.100"; sha256 = "0lk8pqasbxkqp37fsnnidw8556l1k6s8w9qhq51w8zfnp7nw1xwm"; }) (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; }) (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; }) (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "7.0.400"; sha256 = "1pl6iqqcpm9djfn7f6ms5j1xbcyz00nb808qd6pmsjrnylflalgp"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "8.0.100"; sha256 = "06z3vg8yj7i83x6gmnzl2lka1bp4hzc07h6mrydpilxswnmy2a0l"; }) (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; }) (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; }) (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; sha256 = "1rzf5m38fcpphfhcv359plk2sval16kj00gdfwzpm9gi8wjw8j8k"; }) @@ -67,19 +66,19 @@ (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; sha256 = "1b7iwf5qk4c449mi5lsnf6j99pwwrj79y8zkinzf5j2rslc97r0z"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; }) - (fetchNuGet { pname = "IcedTasks"; version = "0.5.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; }) + (fetchNuGet { pname = "IcedTasks"; version = "0.9.2"; sha256 = "1i4sg398qvxyrprca9jssn4lccwn67zndbg1a3a37cmsms5rlbvj"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.19"; sha256 = "1n910ipbscr7b3cr873cr5zh40ysn0n9z47dlqlndbq0g3kl6vi5"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.20"; sha256 = "08ym8lljnkqk638f2djw3c0p6h0nzxycifz1dqhzzd2my5ss46zf"; }) (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; }) (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; }) (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; }) (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.62.0"; sha256 = "05yxz0hhpi1b0kdyzbjbb0klmpbaq8i5d0s4y59wr2qbz2318xpa"; }) (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) + (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"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.4.0"; sha256 = "0j8rqwl8h2hh4yl4bvsijm0rl8356a8vfvdqj4jk5blmvfcfs7b4"; }) @@ -131,36 +130,36 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.6.2115"; sha256 = "0924lvb8i1y1majjph1hczi8p72mxlvkk3b7apdqgv5hmbn9sdxq"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.3.44"; sha256 = "07w5ca1jwmiynpznb36xhxpf42y97v9flj6rxsmg4gqsh1h430i1"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.3.44"; sha256 = "0l1hh2xb183xr5nk8xvbd8zz45n7h15cxlicg5zii6q68q8z49wf"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.844"; sha256 = "0fp2gng4gk63ac0wz231zwbnpy6a35mq04gy8fc81gra6px4sy5v"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.61"; sha256 = "1wxhrqlhb8wq1x5kn3wacylicznl3fgmfdqvx6r3s97yv89zyzy4"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; sha256 = "04p4vd2v3mj1g315jj0fcb9ajwdr6clnbnl80mn6nyj3wmjb56nz"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.3.0"; sha256 = "0j4ahrzakkrqqppp465bqi39bf4wn31020b96n4zl3j2zvppc0bg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.3.0"; sha256 = "0adafjzzrbm285hhdfn2nd57xzn4r5ldm1zm2w9yaj97cdqd228f"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.7.0"; sha256 = "0h6k5ywqmnl3mn30d6hhvzzk0344f0cy3ks2rxvjfas1822hbpz9"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.0"; sha256 = "0bskqxz2b4z1f9m8kak6my9l08ngd8r0cnd7ac1h6pbf39iwfq0a"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; sha256 = "05mqbfgkif9qa5hg1sjmcvx69ifdhiqs2xjplqjrvrj9ybmd5i0c"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.3.0"; sha256 = "0gw2r7iajdk8c52vv0g2bgwlnx79zsacy5n7yv5g2niggxrbm82x"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.3.0"; sha256 = "0vv8wbwrgvr02niv5dclcbhykxyw0mxhkmpnlh9i8rvajn0gfb0a"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.3.0"; sha256 = "1fimxklifac8ahdf02gq01533k502izay6plxcd1j8rg24xrjz6p"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.0"; sha256 = "02sg1qa00dq4hfrj4zrrlccpbrmr1ymac8vcp48q9ffsx5wx6895"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.0"; sha256 = "0q1q21cl6987f3q73g9549h637gm2qal3x1wy81qbag4aaxfqpb0"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.0"; sha256 = "1v5ibnq2mp801vw68zyj169hkj3xm7h55824i33n1jxxj2vs3vbk"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.0"; sha256 = "1k9dzgm3a9ahalykdvjnnd47940py8lqkfrjd1k9lkiczn1bkqmi"; }) (fetchNuGet { pname = "Octokit"; version = "0.48.0"; sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; }) - (fetchNuGet { pname = "octonav"; version = "0.0.1"; sha256 = "1zzv8nqgrrrh3ay4rvwx3npx3q0xvnsqib5q3xww5h17a6lzcbni"; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; sha256 = "1v9ipc75ipwjhhz4mkyjygw85i6ba5flcbhyspmf90vfi2nk7b79"; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; sha256 = "0fgl99k6nm3n47vv9mx6y36pnljj2b5g641cs2zsw6l86n57qwv1"; }) (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; sha256 = "14p6rn68mqrch3ani17vwyl4ggjz680nxkw1nf65xmf1ljlkb4iq"; }) - (fetchNuGet { pname = "Paket"; version = "7.2.1"; sha256 = "1d3ic5kw1yxb7ja07hzrsfjcv8vky6x60han5h6rjm0qbsnwb6xj"; }) + (fetchNuGet { pname = "Paket"; version = "8.0.0-alpha002"; sha256 = "1c2kdndyb04plgwvqp78224zwk26dkicjy94pqh7shc9ifskrvsb"; }) (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) (fetchNuGet { pname = "SemanticVersioning"; version = "2.0.2"; sha256 = "025l5akirkd9g7d5g5wydvkn1wabglcyvbfshkmly7j3r0k596vp"; }) (fetchNuGet { pname = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.12.27"; sha256 = "15k0z6y3dsgipzfaa73irf5xjddr5mj9z26k27s8p6viay608cxc"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; sha256 = "1bwbbzd8rg1mjsig046ihs53gn8ywf5j9mjfy32axfziisqr1c2w"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) @@ -178,7 +177,8 @@ (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) @@ -194,7 +194,8 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.3"; sha256 = "0gw07qhch88jvx393m7ibl4g3dml60s42f3pa8a9f3v88ckkaxws"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) @@ -203,9 +204,12 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; sha256 = "1877gr3f8wl1x3njhgss9psxm21xpqv6cpg625f2mvvak79fzrra"; }) diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 08cf6caae3ef8..117bd0c9450e2 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,6 +6,10 @@ , makeWrapper } : +let + arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc; +in + stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; @@ -17,6 +21,10 @@ stdenv.mkDerivation { sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm"; }; + makeFlags = [ + "CROSS_COMPILE=${arm-embedded-cc.targetPrefix}" + ]; + installPhase = '' mkdir -p $out/bin $out/share cp fusee-launcher.py $out/bin/fusee-launcher @@ -28,7 +36,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; - nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ]; + nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ]; buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index daf27a1d2af4a..73f0bc8093a43 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.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-N+O8qjSOBv7UVcFZ4BOUFoj+qfN0d2rBHO7d8FBtayY="; + sha256 = "sha256-r2tAYH8E1j/gC+IRwcOv0Frcgd2RKEZjVzmuzOOhR7A="; }; - vendorHash = "sha256-wUpWvq6iiS9HkCi4ztXLNs1nCgAomyUo8YaFcElnfeI="; + vendorHash = "sha256-5dEKb+KnUZTxSSoaOH1GpqMmYdLcXKMs2nq0SvR2pUs="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 163b4e95496e2..2ba546699f174 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bump"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mroth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; + sha256 = "sha256-DFgNx0H9/hZ+wUdPkEybRCIjnLsmuoYWruYgbDuFRhU="; }; - vendorHash = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; + vendorHash = "sha256-AiXbCS3RXd6KZwIo7qzz3yM28cJloLRR+gdWqEpyims="; doCheck = false; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index b7dc3b04ac5a1..e99d4cb6a8441 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { description = "Free and Open Source 2D and 3D game engine"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ twey shiryel ]; + maintainers = with maintainers; [ shiryel ]; mainProgram = "godot4"; }; } diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index b98f287d612d6..b41a7a02bdc6b 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "graphql-client"; - version = "0.10.0"; + version = "0.13.0"; src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - sha256 = "sha256-OV4kpvciEJOGfhkxPoNf1QmhdytWMhXuQAKOFJvDFA4="; + sha256 = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; - cargoSha256 = "sha256-r/pRwDLc/yGMzdZIx8SV46o63eb6qrlTb6MsUBhq97w="; + cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index b649310214fb3..6758f1b44e9b2 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -22,7 +22,7 @@ , setuptools , toposort , wheezy-template -, libclang +, llvmPackages , gst_all_1 }: @@ -100,9 +100,9 @@ buildPythonApplication rec { postPatch = '' substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index b3a23a28f7312..ae7c6b35bd7bd 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-Wz10goMJYWbFak4v10W6ez+z+T+ohG06HU+rS8AXQqg="; + hash = "sha256-Jc/etdQtJfFmmdxWdJUVQqPjHTCY6ZUAO+ShNJboOq0="; }; - cargoHash = "sha256-fvuwn5pA33QE4YplG5VAkHF1MgwRni0nbA6B2JkNndU="; + cargoHash = "sha256-TaWD9xpTsNWQt/Wz5PYY0mgFfP5d/Jn3EhcHUywUk3Q="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index b602f2b4fc6d8..8626daa9c7627 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8/MqcJ7kxlmVkZCa7PWZ6kzo6D/9Zwx2rOJs675mJUE="; + hash = "sha256-HGOLPns7kBq02hF5TVs0DdTdJ+16JGs996JZ66k83Os="; }; - vendorHash = "sha256-5LHL0L7xTmy3yBs7rtrC1uvUjLKBU8LpjQaHyeRyFhw="; + vendorHash = "sha256-jUuJBGEb4pSdyuRd3qHINyC8aRwqyJnsb/raM9nEh84="; doCheck = false; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 66a196ab02d41..3f9bc4c0b3fc7 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.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z0VemNdN35p5fA+cenXil7Vonl+ryu1ruKxzWFwMPfI="; + hash = "sha256-BEKsa5mzJplcyR65/4T0MizrYxEk8/ON8SDFt8ZxqMU="; }; vendorHash = null; diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix new file mode 100644 index 0000000000000..04c9521b13d5e --- /dev/null +++ b/pkgs/development/tools/kubedock/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubedock"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "joyrex2001"; + repo = "kubedock"; + rev = version; + hash = "sha256-xjt/RqvkOHTSTZwNgxmlUeYndPW9jwUE1knLyNXDxaE="; + }; + + vendorHash = "sha256-4X4v40c4J5SPwj53Zk+j+A9k0RkHGwqz128E+FnLr1c="; + + # config.Build not defined as it would break r-ryantm + ldflags = [ + "-s" + "-w" + "-X github.com/joyrex2001/kubedock/internal/config.Version=${version}" + ]; + + CGO_ENABLED = 0; + + meta = with lib; { + description = "Minimal implementation of the Docker API that will orchestrate containers on a Kubernetes cluster"; + homepage = "https://github.com/joyrex2001/kubedock"; + license = licenses.mit; + maintainers = with maintainers; [ mausch ]; + mainProgram = "kubedock"; + }; +} diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index 7cab205945166..fc6f9c30daa09 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.5.1"; + version = "1.7.1"; src = fetchFromGitHub { - owner = "rikatz"; + owner = "kubepug"; repo = "kubepug"; rev = "v${version}"; - hash = "sha256-HjnkGEzTobtILqML5xcjpYVtg6a5PqMKYyaGTYrqEDo="; + hash = "sha256-VNxaYQy81U0JWd6KS0jCvMexpyWL4v1cKpjxLRkxBLE="; }; - vendorHash = "sha256-w2WwJa8qaXmgFwZJo2r2TowcTehgQY0nGY4u1UROaxM="; + vendorHash = "sha256-HVsaQBd7fSZp2fOpOOmlDhYrHcHqWKiYWPFLQX0azEw="; ldflags = [ "-s" @@ -19,13 +19,9 @@ buildGoModule rec { "-X sigs.k8s.io/release-utils/version.gitVersion=${version}" ]; - patches = [ - ./skip-external-network-tests.patch - ]; - meta = with lib; { description = "Checks a Kubernetes cluster for objects using deprecated API versions"; - homepage = "https://github.com/rikatz/kubepug"; + homepage = "https://github.com/kubepug/kubepug"; license = licenses.asl20; maintainers = with maintainers; [ mausch ]; }; diff --git a/pkgs/development/tools/kubepug/skip-external-network-tests.patch b/pkgs/development/tools/kubepug/skip-external-network-tests.patch deleted file mode 100644 index e24aa01ad1758..0000000000000 --- a/pkgs/development/tools/kubepug/skip-external-network-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pkg/utils/downloader_test.go b/pkg/utils/downloader_test.go -index b227760..b72dee9 100644 ---- a/pkg/utils/downloader_test.go -+++ b/pkg/utils/downloader_test.go -@@ -7,6 +7,7 @@ import ( - ) - - func TestDownloadSwaggerFile(t *testing.T) { -+ t.Skipf("Nix sandbox does not have networking") - var tmpdir string - // Github actions does not have a temporary dir :/ - tmpdir = os.Getenv("RUNNER_TEMP") diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 0bc8bddefbd01..32e6ec7a35b2f 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -1,6 +1,5 @@ { lib , rustPlatform -, rust , fetchFromGitHub , substituteAll , stdenv @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./use-correct-binary-path-in-tests.patch; - target_triple = rust.toRustTarget stdenv.hostPlatform; + target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 6085ec71a08d9..c7bf7da64d247 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.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; + hash = "sha256-hcicI5ka6m0W2Sj8IaxNsLfIc97eR8SKKp81mJvM2GM="; }; modRoot = "gopls"; - vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; + vendorHash = "sha256-jjUTRLRySRy3sfUDfg7cXRiDHk1GWHijgEA5XjS+9Xo="; doCheck = false; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index faf662981068f..e0f9b6811d9bf 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; + hash = "sha256-iAxRGG7/zaUbJ/PWgmjxGS0UTq9/OXc8RWzlpUTUftc="; fetchSubmodules = true; }; @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { -e '/cxx_/s,$cc,clang++,' ''; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; @@ -80,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/luals/lua-language-server"; changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda sei40kr ]; + maintainers = with maintainers; [ figsoda gepbird sei40kr ]; mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 9fda43915ca20..2188af2a11664 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zigtools/zls"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda fortuneteller2k ]; + maintainers = with lib.maintainers; [ figsoda moni ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix index 11279b98de801..eac30c4da0549 100644 --- a/pkgs/development/tools/maizzle/default.nix +++ b/pkgs/development/tools/maizzle/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "maizzle"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "maizzle"; repo = "cli"; rev = "v${version}"; - hash = "sha256-HGoqwqO50Y1oZBCVXkgM3NyZu+vPz/iniEH9mm/SQ1I="; + hash = "sha256-6AV5irttsI76CQH0GixnCufZ35Il+JQjy3hkK9Iktbo="; }; - npmDepsHash = "sha256-vqhuoTtrZYmxameaoOfA9N5QGXzdhT1/tWx70KBk5aI="; + npmDepsHash = "sha256-DeAV3uOo5UpSX0RP0cIb6IwS759PLKK0DtguQH3m73M="; dontNpmBuild = true; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a001f9f6d3ac1..567e93efd67ed 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.53"; + version = "0.2.54"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-p2ujmHWIBUcH5UpHHO72ddqSb1C0gWAyKUIT9E6Oyxk="; + hash = "sha256-1DYK47pucEh423ySyBy3hwi6QeB/nNQvwapEJZYRX8E="; }; - vendorHash = "sha256-W50NodoaKY7s4x7Goyvydxd5Q2lz9m9pFwgcQ9wRGVM="; + vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; doCheck = false; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 66e972826cb96..315a213609514 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,25 +2,20 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.1"; + version = "3.4.10"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${version}_linux.tar.gz"; - sha256 = "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + hash = "sha256-b2fshytDe9PFHg914RLk2/2ybV+3vZz4pIDxCvVVcGM="; }; - # lots of hardcoded references to /usr - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace ' /usr/' " $out/" - ''; - nativeBuildInputs = [ cmake ]; meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; + maintainers = with maintainers; [ carlossless ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 0cb1d5d61e33b..b08e7251e9e2b 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 85cc7fbc83356..ff02a02fa7025 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.22.0"; + version = "2.23.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 = "HvNf6yB6+ljTVJXV3l5Jr1/HTR8tmofgJ4fDPbM2k3M="; + sha256 = "g92AUmrfu+naLUo11u0fqJKPRiY2nSIUAqZY4D6ti0I="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "LvEUPcArVJV1sFFgvflzCQPyhl/q7cXqdwdvN9AsBho="; + sha256 = "l8KwAvD8tWiVNYCp9HikBDPSr+8iYhp5svdTkhitxy0="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "48Twr/zkJVS3uSiAX0/FL7EDtbE9ZHKoQ+otzRo1w9A="; + sha256 = "Ffg2kwg/jOMwEHujfb0x4tjc6PLPswVi3EWm+u/o5wc="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "k8YnRzSc6RuwBcJcRpjwZevCh2Tc9/j7BetivrMc1mM="; + sha256 = "yywxgvzK7BKzYsiElYLy8M80RKIp6ksNv0wq4QzRyfY="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "PTSggxBfWtIXj8DX2bLmKXlFXWBE7q8FfYww4SCvWh0="; + sha256 = "4o34UR411nokdvpSMhbdrL9D4r4ZqoS7pwDEj153GZg="; }; }; diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index 81cf9c120edd9..6c0cdb3c5bb14 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; + hash = "sha256-B7ydYz9nui3B/IC3obVTiJZvzTD/lCQyf+tREwFJERg="; }; - cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; + cargoHash = "sha256-CXvaGrE4sQlc7K6FVQqGU8EKPfHr8EIV5YFq+VMoBWg="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 56bd85b77218e..f65b0386cfd8a 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, fetchpatch , bash , cmake , colordiff @@ -29,6 +30,14 @@ buildPythonApplication rec { patches = [ # Refer to unifdef by absolute path. ./unifdef.patch + + # Refer to shell via /usr/bin/env: + # https://github.com/marxin/cvise/pull/121 + (fetchpatch { + name = "env-shell.patch"; + url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch"; + hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA="; + }) ]; postPatch = '' @@ -37,10 +46,6 @@ buildPythonApplication rec { substituteInPlace CMakeLists.txt \ --replace " -Werror " " " - # 'cvise --command=...' generates a script with hardcoded shebang. - substituteInPlace cvise.py \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" - substituteInPlace cvise/utils/testing.py \ --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ --replace "'colordiff'" "'${colordiff}/bin/colordiff'" diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 83a30f3e6f17f..d61cf961615f2 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.189"; + version = "0.190"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ob2PGjOOK3zUq8P/EaDt3G5pD2lXildHjYF5tBSHCMg="; + hash = "sha256-jgCjqbXwS8HcJzroYoHS0m7UEgILOR/8wjGY8QIx1pI="; }; patches = [ diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d24d4b66d66c9..6420d56bba2f3 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { 'set +o posix' ''; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + meta = { description = "Command-line option parser generator"; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 410bad35251ec..733966f470628 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -123,13 +123,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-08-23"; + version = "2023-11-17"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "00d30874da759eb0f44f446415b2469920ff41b5"; - sha256 = "sha256-e+68WCN1e1h2rf1pmwNNukTt5EBtF9KQNXhqJtoyJzo="; + rev = "8f48e4ddecbf403be35f8243b97d73cb39dd61bb"; + hash = "sha256-5q/7yz6jJedD8YU3SuYyXtN3qEAlOBRKGZxOcYt/0X8="; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0d4c272e414e1..8e6ba9b70c04d 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ texinfo ]; buildInputs = [ libintl ]; - pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling + depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration" diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix deleted file mode 100644 index a4faa31a4214c..0000000000000 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ elk7Version -, enableUnfree ? true -, lib -, stdenv -, makeWrapper -, fetchurl -, nodejs_16 -, coreutils -, which -}: - -let - nodejs = nodejs_16; - inherit (builtins) elemAt; - info = lib.splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; - hashes = - { - x86_64-linux = "sha512-09XokG5krjxGnk34DhxpLOGRLjb2jd82uZtwGfrzSuuqMpBhkEptK2oySGxuGdHF8uowwlR5p5YO2TvBwMsWkQ=="; - x86_64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - aarch64-linux = "sha512-zhtYThz5j4+w5gI1JWSnHv709Tk23eegVsrtYmdaYhZiTw2yvCTYI5uNAfBjBr8XPdp6CKF4e6Bh2wHKDYg1mg=="; - aarch64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - }; - -in stdenv.mkDerivation rec { - pname = "kibana"; - version = elk7Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - patches = [ - # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. - # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just - # disable the version check. - ./disable-nodejs-version-check-7.patch - ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = with lib; { - description = "Visualize logs and time-stamped data"; - homepage = "http://www.elasticsearch.org/overview/kibana"; - license = licenses.elastic20; - maintainers = with maintainers; [ offline basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch deleted file mode 100644 index ef4c207764c1f..0000000000000 --- a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js -index 3f611e5a..f5c60c85 100644 ---- a/src/setup_node_env/node_version_validator.js -+++ b/src/setup_node_env/node_version_validator.js -@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c - var currentVersion = process && process.version || null; - var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null; - var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion; --var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. -+var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. - - if (!isVersionValid) { - var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. - - console.error(errorMessage); - process.exit(1); --} -\ No newline at end of file -+} diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 3bace16de56d2..0c19b59c5c35e 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.1"; - sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; + version = "2.13.6"; + sha256 = "sha256-5+BFlt1zrHqpnifNAA+UnbsP7VG9KQmfmwiiXB3wztU="; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 941a582cead00..20acab5a8584d 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,13 +2,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-02-26"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919"; - sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo="; + rev = "4240b25b95d7165cde66fc2acaf5a0f9ad40fd0c"; + sha256 = "sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk="; }; patches = [ ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index bd12125d83bdc..c15e7f6451be1 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.9"; + version = "2.4.12"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-zM5XztFv+A7cNMqNPGAO5i0B45w6AMyRL4OR+tG03JY="; + hash = "sha256-QqGtozLZtrS5UgnLmsKWxqbcTykLhlossVxuN4WNYzo="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 138765bb22803..47ae36c77ea98 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.6.0"; + version = "0.7.2"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; + sha256 = "sha256-hup9FM2KEBXRx6NleDGR01C0whJgR1KYyIrcIv2UE80="; }; - cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; + cargoSha256 = "sha256-Od1uaKZVAZaIDrsNheR1kYIjnmpnThlU7k3EIKdOjzM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 0eb55d14c0055..36145a05e592c 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.2.2"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+1nuezax7aV9b+L11zzIouA8QEWduqBzPiT6jvCGMac="; + sha256 = "sha256-ikOKpQHMLPCC2IfqWvW0I1auiCdyIZZMu6nMGle/bE0="; }; - cargoHash = "sha256-o7HDhNtjA0/JybJCiEejR8PcRIdJim+/wq4q8xj9A5Q="; + cargoHash = "sha256-tprtlG/M2ItE7Ay/9QWrZQHdVEPYD9hDJ+uPR8pq1Xk="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index b91460160ce8c..3472a21f51dd2 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security, zlib }: rustPlatform.buildRustPackage rec { pname = "tokei"; @@ -17,6 +17,8 @@ rustPlatform.buildRustPackage rec { libiconv Security ]; + checkInputs = lib.optionals stdenv.isDarwin [ zlib ]; + # enable all output formats buildFeatures = [ "all" ]; diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix index 2128115165baa..cb4f3884d79fd 100644 --- a/pkgs/development/tools/misc/topiary/default.nix +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, stdenv , nix-update-script }: @@ -36,6 +37,9 @@ rustPlatform.buildRustPackage rec { env = { TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries"; + } // lib.optionalAttrs stdenv.cc.isClang { + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; postInstall = '' diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 6899c590e95f6..0929aa5286b0e 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.77.1"; + version = "0.78.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-9U6PTeU/LVFL9XzP9XSFjDx18CR3athThEz+h2+5qZ8="; + sha256 = "sha256-wuwZFTa8XGMN3dlpdaMYiKvyS3DJMUgqRgaDtj/s7vI="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix new file mode 100644 index 0000000000000..4c993c19cdcf5 --- /dev/null +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchPypi +, stdenv +, click +, coloredlogs +, psutil +, pycyphal +, pyserial +, ruamel-yaml +, requests +, scipy +, simplejson +}: + +buildPythonApplication rec { + pname = "yakut"; + version = "0.13.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-MBVSt01D36rBPW2bopujyu8Opwwavmm7S3tdaWp5ACw="; + }; + + buildInputs = [ + stdenv.cc.cc.lib + click + coloredlogs + psutil + pycyphal + pyserial + ruamel-yaml + requests + scipy + simplejson + ]; + + # Can't seem to run the tests on nix + doCheck = false; + + meta = with lib; { + description = "Simple CLI tool for diagnostics and debugging of Cyphal networks"; + longDescription = '' + Yakút is a simple cross-platform command-line interface (CLI) tool for diagnostics and debugging of Cyphal networks. By virtue of being based on PyCyphal, Yakut supports all Cyphal transports (UDP, serial, CAN, ...) and is compatible with all major features of the protocol. It is designed to be usable with GNU/Linux, Windows, and macOS. + ''; + homepage = "https://github.com/OpenCyphal/yakut/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 4f483fd5f3b36..d8edce696a787 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.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-eX76LRzhAk2n96eMtvbnm4Id99jRCDo3gMlrr5hI3Nw="; + hash = "sha256-YXFfjJp4dSxzEyAtrEi/ONQZKD7QAU/MZ62l4QCcbwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index a97ce8499b2a9..22104d3d4dc05 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-camlidl"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "camlidl"; - rev = "camlidl111"; - sha256 = "sha256-8m0zem/6nvpEJtjJNP/+vafeVLlMvNQGdl8lyf/OeBg="; + rev = "camlidl112"; + hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0="; }; nativeBuildInputs = [ ocaml ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp + substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs ''; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 02355cb9846c6..d0308f31f7eef 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, perl, makeWrapper -, rresult, bos, ocaml_pcre, re, camlp-streams +, rresult, bos, re, camlp-streams , legacy ? false }: @@ -10,26 +10,19 @@ else let params = if lib.versionAtLeast ocaml.version "4.12" && !legacy then rec { - version = "8.00.05"; + version = "8.02.01"; src = fetchFromGitHub { owner = "camlp5"; repo = "camlp5"; rev = version; - hash = "sha256-Havr3RB6iUP7QzV+LUGwMHtGzmRdS5RqYsqJ0N5w6gE="; + hash = "sha256-qSA2559vqWLU+0ns7LPUGI2K5f8sfu+QQ0sCH8sR6To="; }; nativeBuildInputs = [ makeWrapper ocaml findlib perl ]; - buildInputs = [ bos ocaml_pcre re rresult ]; + buildInputs = [ bos re rresult ]; propagatedBuildInputs = [ camlp-streams ]; - postFixup = '' - for p in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5 - do - wrapProgram $out/bin/$p \ - --suffix CAML_LD_LIBRARY_PATH : ${ocaml_pcre}/lib/ocaml/${ocaml.version}/site-lib/stublibs - done - ''; } else rec { version = "7.14"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 724ea73e6b14c..428f3d91864e5 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-4arcK/g9j/lv1HWP7rvhAXJpYRMKgmSbGPZjy2UkhyE="; + hash = "sha256-HqMnZireYw8k7TXkR+M+Ct97OISaBUNCABR0nYqljjQ="; }; - vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU="; + vendorHash = "sha256-z4ERIfwLPYIMpSetepDx0U2WUA+9RXjoQICMbp+qS3k="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 7b7da31ad1de5..aa8b4ae20f711 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,14 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.55.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-piQ8Cig2zG6UhzVbiDCTruAXNis8P5HUja4xiiol9jA="; + hash = "sha256-zDTL/kP0ldPiZhLqLQmpIoDaq979KNDVJyXp93sPZAk="; }; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +35,10 @@ buildGoModule rec { + "`opa build` does not need this feature.") "opa_wasm"); + checkFlags = lib.optionals (!enableWasmEval) [ + "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" + ]; + preCheck = '' # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 48c7cbba56798..649b49a098505 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -1,24 +1,27 @@ { lib , rustPlatform , fetchFromGitHub +, rust-jemalloc-sys , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.15"; + version = "0.0.17"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-zjTJF8yU3Hb8CTzzsPdo2EJI7QriEsjUyXVwprb22xQ="; + hash = "sha256-s+D9+gHJLldTaMHr+XahppNHYL62V1J9iOgRZkr/p9Q="; }; - cargoHash = "sha256-mRmoCH0VVO9LhFfEd4VfDbCfl5VCpcIKBkaNzU0+9SU="; + cargoHash = "sha256-NQ/s39x/LLQoiW7p2x65l1oBkDal46g5/G6r4Ttpgsw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + rust-jemalloc-sys + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index b16b0491c9b63..4f618665573c0 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # Disable a failing test. rm -rf ../../tests/style.d + '' + lib.optionalString stdenv.cc.isClang '' + export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' ''; installPhase = '' diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index c8c553afad6ed..cbbb026b8336e 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -34,7 +34,7 @@ in -t ${haskellPackages.warp} \ $out/bin/pandoc remove-references-to \ - -t ${haskellPackages.pandoc_3_1_8} \ + -t ${haskellPackages.pandoc_3_1_9} \ $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions @@ -48,5 +48,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_9 ]; }) diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index 55259b9321249..c1d20845e6bff 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index bd7c8c4db0aeb..4b6db0adb731f 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.8.1"; + version = "1.9.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-Cb+HYUObL3So3ZcG4Iy276rdO0TC9rholwEBIYA5BNU="; + hash = "sha256-nVHm0JJsFXGnYlBBlcR5zBS46PZuALle3ik3GMTPYTQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/quick-lint-js/build-tools-install.patch b/pkgs/development/tools/quick-lint-js/build-tools-install.patch new file mode 100644 index 0000000000000..2326170d52368 --- /dev/null +++ b/pkgs/development/tools/quick-lint-js/build-tools-install.patch @@ -0,0 +1,32 @@ +From 3923f0df76d24b73d57f15eec61ab190ea048093 Mon Sep 17 00:00:00 2001 +From: "Matthew \"strager\" Glazar" <strager.nds@gmail.com> +Date: Thu, 26 Oct 2023 18:08:30 -0400 +Subject: [PATCH] fix(build): fix installing build tools for cross-compilation + +'cmake --install . --component build-tools' copies no files [1]. This +was caused by commit 1f2e1a47 where the code calling install() became +dead code on accident. Call install() so that 'cmake --install' copies +the build artifacts as intended. + +[1] https://github.com/quick-lint/quick-lint-js/issues/1099 + +Refs: 1f2e1a4701793cac24eaac44d7af81a8b820b1bc +--- + docs/CHANGELOG.md | 7 +++++++ + tools/CMakeLists.txt | 1 - + 2 files changed, 7 insertions(+), 1 deletion(-) + + (docs/CHANGELOG.md changes omitted to reduce conflicts.) + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 71ccbdf1b..b541afb52 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -68,7 +68,6 @@ if (QUICK_LINT_JS_ENABLE_BUILD_TOOLS) + COMMENT "Building all quick-lint-js build-time tools" + DEPENDS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS} + ) +-elseif (QUICK_LINT_JS_ENABLE_BUILD_TOOLS) + install( + TARGETS ${QUICK_LINT_JS_BUILD_TOOL_TARGETS} + COMPONENT build-tools diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 54badbaddc604..32c61c836b969 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -1,8 +1,6 @@ -{ cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: +{ buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: - -stdenv.mkDerivation rec { - pname = "quick-lint-js"; +let version = "2.17.0"; src = fetchFromGitHub { @@ -12,11 +10,41 @@ stdenv.mkDerivation rec { sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug="; }; + quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation { + pname = "quick-lint-js-build-tools"; + inherit version src; + + patches = [ ./build-tools-install.patch ]; + + nativeBuildInputs = [ cmake ninja ]; + doCheck = false; + + cmakeFlags = [ + "-DQUICK_LINT_JS_ENABLE_BUILD_TOOLS=ON" + # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + ninjaFlags = "quick-lint-js-build-tools"; + + installPhase = '' + runHook preInstall + cmake --install . --component build-tools + runHook postInstall + ''; + }; +in +stdenv.mkDerivation rec { + pname = "quick-lint-js"; + inherit version src; + nativeBuildInputs = [ cmake ninja ]; doCheck = true; - # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + cmakeFlags = [ + "-DQUICK_LINT_JS_USE_BUILD_TOOLS=${quick-lint-js-build-tools}/bin" + # Temporary workaround for https://github.com/NixOS/nixpkgs/pull/108496#issuecomment-1192083379 + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; passthru.tests = { version = testers.testVersion { package = quick-lint-js; }; @@ -29,4 +57,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ratsclub ]; platforms = platforms.all; }; + + # Expose quick-lint-js-build-tools to nix repl as quick-lint-js.build-tools. + passthru.build-tools = quick-lint-js-build-tools; } diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 688a475a1403f..151c489de6b53 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-I32DC0hzVM/LCSqS878sZd+UYZ0NfBuzBgd9Aed/Sq0="; + hash = "sha256-XzDxfjXY7Mu6qDZ66r3c0/RDBQF7wCONZTpfQ0j1B1c="; }; - cargoHash = "sha256-CYy0YEWK9sHAr0yFIH9yzxPnzG6x/EcE8ZLkueYgSiE="; + cargoHash = "sha256-J/ecoC8efv0IfAta7Ug0g7N/2jGV+DOACgbhXVfNK3k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 75e32e0c7c1b9..94f70251e504c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-g52cIw0af/wQSuA4QhC2dCjcDGikirswBDAtwf8Drvo="; + hash = "sha256-EX1tXe8KlwjrohzgzKDeJP0PjfKw8+lnQ7eg9PAUAfQ="; }; - cargoHash = "sha256-1jfKRpyGewNlvMkL/MKnOaRJyajwLAuw+YyeTyTtcP4="; + cargoHash = "sha256-ueWSBYXcdaxagjFjxfsImulOs0zVVqGHmfXp4pQLaMM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/development/tools/rust-code-analysis/default.nix index 7427a8bd76d64..eaf87a1908f9d 100644 --- a/pkgs/development/tools/rust-code-analysis/default.nix +++ b/pkgs/development/tools/rust-code-analysis/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchCrate, stdenv }: rustPlatform.buildRustPackage rec { pname = "rust-code-analysis"; @@ -12,6 +12,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-axrtFZQOm1/UUBq1CDFkaZCks1mWoLWmfajDfsqSBmY="; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + meta = with lib; { description = "Analyze and collect metrics on source code"; homepage = "https://github.com/mozilla/rust-code-analysis"; diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/development/tools/rust/cargo-benchcmp/default.nix index 4aa3c411f12e3..d46a57355d731 100644 --- a/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ b/pkgs/development/tools/rust/cargo-benchcmp/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchFromGitHub , substituteAll -, rust , stdenv }: @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { # patch the binary path so tests can find the binary when `--target` is present (substituteAll { src = ./fix-test-binary-path.patch; - shortTarget = rust.toRustTarget stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 74b5a5dd3a4d9..8613b15aa5ca1 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-OVtSvlmMRngxhUeq4u+exVc7WQUqBnksDpb8esbly9Y="; + hash = "sha256-zCivxYHhaVqzPe3qBUKXgMgEE6niGqkHJM77rfEUoFo="; }; - cargoHash = "sha256-3OuyN+nm2t+LH8lue3xYoBQp7OYjzhDbnc2LCGqFJgY="; + cargoHash = "sha256-O8X+oLKhKeQGeUrsRVeakZjaMKPiXdIns48rV8Q9JA8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 5805d605835a5..849aa5a8ca595 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-QEqWSCqX00aMF9kM6xyClJjMiEGmscEWZu0W/MmSj2M="; + hash = "sha256-8wbJFvAXicchxI8FTthCiuYCZ2WA4nMUJTUD4WKG5FI="; }; - cargoHash = "sha256-kZjQFoP5aZyVt0EcMtUUXc1wUZQxUwONMzzN6iLUAbM="; + cargoHash = "sha256-HkFROhjx4bh9QMUlCT1xj3s7aUQxn0ef3FCXoEsYCnY="; nativeBuildInputs = [ curl @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index cbfa86c69ef90..30a2fd44eab5e 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.3"; + version = "0.25.4"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-tyNbBG2okxoLmu8mwoeR3Ud0nIpqkwVmFHT0Gi1Pibs="; + sha256 = "sha256-cXGZhTLIxR9VHrQT+unbl69AviiQ6FCOJTdOP/4fRYI="; }; - cargoHash = "sha256-sKQw4Bak3JY07TYKkThKTFhh3H5GB2lDcfcGE4cRHDY="; + cargoHash = "sha256-H/5OZCnshGOUKVaBTbFAiMpYdsNC/96gV+rOgiuwDYc="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 961f3287e6476..89d5b1547c8e2 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-lh3nK3yj03pEurjw6/fMh70GnBawxUqilupUzfgryG0="; + hash = "sha256-QN+fO8aH4z0gtbDhS3BLKpiWMFoYP1JjPehWHUjR9z4="; }; - cargoHash = "sha256-lUeCMyH6qE76SVjubWVo/Hpj6J8PM6ndOqrJufcfByw="; + cargoHash = "sha256-tNRZx5i5noahhoxJ15rBSnPxqoJ4MlBRjcuUYmrNDVg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock index 963294460ab30..7e0abac242a84 100644 --- a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "cargo-leptos" -version = "0.2.1" +version = "0.2.2" dependencies = [ "ansi_term", "anyhow", @@ -1306,9 +1306,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -1400,9 +1400,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -1443,7 +1443,7 @@ checksum = "a6902fabee84955a85a6cdebf8ddfbfb134091087b172e32ebb26e571d4640ca" dependencies = [ "anyhow", "camino", - "indexmap 2.0.2", + "indexmap 2.1.0", "parking_lot", "proc-macro2", "quote", @@ -1746,9 +1746,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" dependencies = [ "bitflags 2.4.1", "cfg-if 1.0.0", @@ -1778,9 +1778,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" dependencies = [ "cc", "libc", @@ -2437,9 +2437,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2986,9 +2986,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2996,9 +2996,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", @@ -3011,9 +3011,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21c60239a09bf9bab8dfa752be4e6c637db22296b9ded493800090448692da9" +checksum = "f2252adf46913da7b729caf556b81cedd1335165576e6446d84618e8835d89dd" dependencies = [ "anyhow", "base64 0.9.3", @@ -3033,9 +3033,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafbe1984f67cc12645f12ab65e6145e8ddce1ab265d0be58435f25bb0ce2608" +checksum = "43f3b73cf8fcb86da78c6649c74acef205723f57af99b9f549b2609c83fe7815" dependencies = [ "anyhow", "walrus", @@ -3043,9 +3043,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3055,9 +3055,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3065,9 +3065,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", @@ -3078,9 +3078,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581419e3995571a1d2d066e360ca1c0c09da097f5a53c98e6f00d96eddaf0ffe" +checksum = "930dd8e8226379aebb7d512f31b9241a3c59a1801452932e5a15bebfd3b708fb" dependencies = [ "anyhow", "walrus", @@ -3088,15 +3088,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d272073981137e8426cf2a6830d43d1f84f988a050b2f8b210f0e266b8983" +checksum = "759b1e9784f903a7890bcf147aa7c8c529a6318a2db05f88c054194a3e6c6d57" dependencies = [ "anyhow", "walrus", @@ -3105,9 +3105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9c65b1ff5041ea824ca24c519948aec16fb6611c617d601623c0657dfcd47b" +checksum = "2dc12bc175c837239520b8aa9dcfb68a025fcf56a718a02551a75a972711c816" dependencies = [ "anyhow", "walrus", @@ -3115,9 +3115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5c796220738ab5d44666f37205728a74141c0039d1166bcf8110b26bafaa1e" +checksum = "6a5510ab88377b4e3160a7e5d90a876d0a1da2d9b9b67495f437246714c0980f" dependencies = [ "anyhow", "log", @@ -3133,9 +3133,9 @@ checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -3392,18 +3392,18 @@ checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" [[package]] name = "zerocopy" -version = "0.7.16" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c552e97c5a9b90bc8ddc545b5106e798807376356688ebaa3aee36f44f8c4b9e" +checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.16" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964bc0588d7ac1c0243d0427ef08482618313702bbb014806cb7ab3da34d3d99" +checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index 4d11eb8b1c053..a1e1ca030711f 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -15,13 +15,13 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = "${version}"; - hash = "sha256-XoTXVzhBW+oUHu2TBZC+sFqMAVZCOJeuymqmsxTWpZ0="; + rev = "e98b478b0c82af1469151eff30f4246b9af4a539"; + hash = "sha256-7o/yQanBBSA+MmMiGCYSjar4hZ8TRZoPiUniF5ELzXU="; }; cargoLock = { @@ -44,6 +44,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}"; 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 f591540785cd8..0da95637741fd 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -21,11 +21,12 @@ , fetchFromGitHub , rustPlatform , rustc +, git }: let pname = "cargo-llvm-cov"; - version = "0.5.33"; + version = "0.5.37"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -36,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk="; + sha256 = "sha256-UJXZ7FhbkIcVAv4PymO4sCqhJ0KFORCCO3w0w9W46qQ="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -54,7 +55,8 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU="; + sha256 = "sha256-aJIMG2gaotu1XdNxcE2xJS78qAqlNzF3p2RMvqBraTk="; + leaveDotGit = true; }; # Upstream doesn't include the lockfile so we need to add it back @@ -62,13 +64,24 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ="; + cargoSha256 = "sha256-dbC8OcH/Ae98SUx9d4rsBdhYQfzsWZpiGqJoIGPDSbY="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests LLVM_COV = "${llvm}/bin/llvm-cov"; LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + nativeCheckInputs = [ + git + ]; + + preCheck = '' + # `cargo-llvm-cov`'s tests rely on `git ls-files` so the staging area needs + # to not have everything staged as deleted, which is how `leaveDotGit` in + # `fetchFromGitHub` leaves the staging area for reproducibility reasons. + git restore --staged . + ''; + meta = { inherit homepage; changelog = homepage + "/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 7712e9c9ffe53..5f3a2c14e076e 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - hash = "sha256-71NRaIDWPbhDn6cfYhyZZzO2huQlj1vkKdBV6WJqI9s="; + hash = "sha256-EzXQ4YQFpK7vFI/qpANSOHTKH/XgPnNNp+JngSJqlgY="; }; - cargoHash = "sha256-lgqe9pXg/PE9WrXVpSJWYE6FUMGBgUDpEyJ31RSEj5A="; + cargoHash = "sha256-KWehtgFxi0DgsQaYnxPFpNifgihiADvKqL4fFY14I84="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index fefa6bb21fba8..a3d97ff443989 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 = "23.10.0"; + version = "23.11.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-AJcteYaEm1pJ2tn1mydZAhrhqoMtEVJUrfGY/Vt71Ks="; + hash = "sha256-UZ4agGxJfkqERrl354RjQb6x+FDMbrrXCjZBp6Gzu/c="; }; - cargoHash = "sha256-0NLP8KtzeX3jjWjSXBKku4c1LzKmoJce1RPUB+aO804="; + cargoHash = "sha256-0zezsxZPCt0jtV/4RrSQ6rriWvuwzztHFEUONvW1ZOs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index f911f5ee58735..e472c977f5f25 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.61"; + version = "0.9.63"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-kVADlW5XqKAuQ2n0lmEin67CXGkhTVWgJaPMKpvS5Gs="; + hash = "sha256-xAFpTcugAWUmHwWe2Ny1urxrIzRXyfxUMb9kBoGa3SA="; }; - cargoHash = "sha256-IU2oW00VzEV8p3BpqIJZwXvdcaeweAF9nGHwtX+98vY="; + cargoHash = "sha256-ase0pfcDDkQGnTEtAD2ZTnBP7jdGS9pki1BoFbfUuFk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 295ac413fe3e7..b87d9d4570b6c 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -31,6 +31,12 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optional stdenv.isDarwin Security; + preCheck = lib.optionalString stdenv.isDarwin '' + # Darwin issue: Os { code: 24, kind: Uncategorized, message: "Too many open files" } + # https://github.com/google/cargo-raze/issues/544 + ulimit -n 1024 + ''; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 4143c08da5e72..5fa4d53086743 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.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-bfkRuFVlKfzyTomFhgnxbDj76Mfq/Q/Y3ZQUuMpkYQ0="; + hash = "sha256-cy1YgNBxVSxdoVq/2t6Uf4PBQf54degabtEYfIeIBDU="; }; - cargoHash = "sha256-poPTFF+XCAHhHftxOOPaN+dixX2uqtZVfn20DB+cZ5o="; + cargoHash = "sha256-Xl6wneomb5NeqhA9pMyNkCtc6FgYtx7k2zgQ3oBHP/Q="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 37cc46a74e001..3a8dbfb08c61e 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.21"; + version = "0.2.22"; src = fetchCrate { inherit pname version; - hash = "sha256-0Fj+yC464XdqeMWBgBj5g6ZQGrurFM5LbqSe9GSgbGg="; + hash = "sha256-yj895sAjTQAUmhU38nv9ea6r7lIwqjZFBEeGSHd0J98="; }; - cargoHash = "sha256-fW+WvsZv34ZpwaRCs6Uom7t0cV+9yPIlN5pbRea9YEk="; + cargoHash = "sha256-JbS72/sE2vCocC7o4X6vZfqGz0Tb0FvO/omzj0LhnHQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 265e0a32f2c0e..27ea2aefbec75 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -19,14 +19,15 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -121,9 +122,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arbitrary" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" @@ -275,7 +276,7 @@ dependencies = [ "futures-util", "http-types", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "serde", "serde_json", "serde_path_to_error", @@ -314,9 +315,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" dependencies = [ "aws-credential-types", "aws-http", @@ -330,7 +331,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 1.9.0", + "fastrand 2.0.1", "hex", "http", "hyper", @@ -344,148 +345,136 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand 1.9.0", + "fastrand 2.0.1", "tokio", "tracing", "zeroize", ] [[package]] -name = "aws-endpoint" -version = "0.55.3" +name = "aws-http" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" dependencies = [ + "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", + "bytes", "http", - "regex", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", "tracing", ] [[package]] -name = "aws-http" -version = "0.55.3" +name = "aws-runtime" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" dependencies = [ "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes", + "fastrand 2.0.1", "http", - "http-body", - "lazy_static", "percent-encoding", - "pin-project-lite", "tracing", + "uuid", ] [[package]] name = "aws-sdk-rds" -version = "0.27.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8f92d7f105d0d50cc6307236c669854e63244260ae85ea74f0dec3b689883e" +checksum = "45177b4af2c0a04d6b19891f70062609aed49389943882e1fa96f691c6370960" 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", "http", "regex", "tokio-stream", - "tower", "tracing", ] [[package]] name = "aws-sdk-sso" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" 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", "http", "regex", "tokio-stream", - "tower", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" 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", "http", "regex", - "tower", - "tracing", -] - -[[package]] -name = "aws-sig-auth" -version = "0.55.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-http", - "aws-types", - "http", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" dependencies = [ "aws-smithy-http", "form_urlencoded", @@ -502,9 +491,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af" dependencies = [ "futures-util", "pin-project-lite", @@ -514,23 +503,23 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand 1.9.0", + "fastrand 2.0.1", "http", "http-body", "hyper", - "hyper-rustls 0.23.2", + "hyper-rustls", "lazy_static", "pin-project-lite", - "rustls 0.20.9", + "rustls", "tokio", "tower", "tracing", @@ -538,9 +527,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" dependencies = [ "aws-smithy-types", "bytes", @@ -560,9 +549,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -576,50 +565,88 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" dependencies = [ "aws-smithy-types", "urlencoding", ] [[package]] +name = "aws-smithy-runtime" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" +dependencies = [ + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "tokio", + "tracing", +] + +[[package]] name = "aws-smithy-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728" dependencies = [ "base64-simd", "itoa", "num-integer", "ryu", + "serde", "time", ] [[package]] name = "aws-smithy-xml" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +checksum = "e01d2dedcdd8023043716cfeeb3c6c59f2d447fce365d8e194838891794b23b6" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -639,7 +666,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.4", + "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -686,26 +713,6 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d" -dependencies = [ - "axum", - "bytes", - "cookie 0.16.2", - "futures-util", - "http", - "mime", - "pin-project-lite", - "tokio", - "tower", - "tower-http 0.3.5", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a93e433be9382c737320af3924f7d5fc6f89c155cf2bf88949d8f5126fab283f" @@ -713,7 +720,7 @@ dependencies = [ "axum", "axum-core", "bytes", - "cookie 0.17.0", + "cookie", "futures-util", "http", "http-body", @@ -728,9 +735,9 @@ dependencies = [ [[package]] name = "axum-server" -version = "0.4.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bace45b270e36e3c27a190c65883de6dfc9f1d18c829907c127464815dc67b24" +checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063" dependencies = [ "arc-swap", "bytes", @@ -739,22 +746,22 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "rustls 0.20.9", + "rustls", "rustls-pemfile", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tower-service", ] [[package]] name = "axum-sessions" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b114309d293dd8a6fedebf09d5b8bbb0f7647b3d204ca0dd333b5f797aed5c8" +checksum = "714cad544cd87d8da821cda715bb9aaa5d4d1adbdb64c549b18138e3cbf93c44" dependencies = [ "async-session", "axum", - "axum-extra 0.4.2", + "axum-extra", "futures", "http-body", "tokio", @@ -785,15 +792,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.20.0" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -813,9 +814,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basic-toml" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" dependencies = [ "serde", ] @@ -910,7 +911,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bollard-stubs", "bytes", "futures-core", @@ -941,7 +942,7 @@ checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" dependencies = [ "serde", "serde_repr", - "serde_with 3.3.0", + "serde_with 3.4.0", ] [[package]] @@ -1014,12 +1015,6 @@ dependencies = [ ] [[package]] -name = "byteyarn" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff" - -[[package]] name = "camino" version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1126,17 +1121,16 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "assert_cmd", "async-trait", "bollard", - "cargo_metadata", + "cargo_metadata 0.18.1", "chrono", "clap", "clap_complete", - "crossbeam-channel", "crossterm 0.27.0", "dialoguer", "dirs 5.0.1", @@ -1166,15 +1160,15 @@ dependencies = [ "shuttle-common-tests", "shuttle-proto", "shuttle-service", - "strum", + "strum 0.25.0", "tar", "tempfile", "tokio", "tokio-tungstenite", "tokiotest-httpserver", - "toml 0.7.8", - "toml_edit", - "tonic", + "toml 0.8.6", + "toml_edit 0.20.7", + "tonic 0.10.2", "tracing", "tracing-subscriber", "url", @@ -1198,6 +1192,20 @@ dependencies = [ ] [[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.20", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1250,9 +1258,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -1260,9 +1268,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -1272,18 +1280,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.3" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -1293,9 +1301,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clru" @@ -1337,8 +1345,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" dependencies = [ "crossterm 0.26.1", - "strum", - "strum_macros", + "strum 0.24.1", + "strum_macros 0.24.3", "unicode-width", ] @@ -1390,11 +1398,11 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[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 = [ - "base64 0.20.0", + "base64 0.21.5", "hmac 0.12.1", "percent-encoding", "rand 0.8.5", @@ -1405,17 +1413,6 @@ dependencies = [ ] [[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 = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1442,27 +1439,27 @@ dependencies = [ [[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", ] [[package]] name = "cranelift-bforest" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b9d1a9e776c27ad55d7792a380785d1fe8c2d7b099eed8dbd8f4af2b598192" +checksum = "751cbf89e513f283c0641eb7f95dc72fda5051dd95ca203d1dc45e26bc89dba8" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5528483314c2dd5da438576cd8a9d0b3cedad66fb8a4727f90cd319a81950038" +checksum = "210730edc05121e915201cc36595e1f00062094669fa07ac362340e3627b3dc5" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1472,7 +1469,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "log", "regalloc2", "smallvec", @@ -1481,33 +1478,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f46a8318163f7682e35b8730ba93c1b586a2da8ce12a0ed545efc1218550f70" +checksum = "b5dc7fdf210c53db047f3eaf49b3a89efee0cc3d9a2ce0c0f0236933273d0c53" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d1239cfd50eecfaed468d46943f8650e32969591868ad50111613704da6c70" +checksum = "f46875cc87d963119d78fe5c19852757dc6eea3cb9622c0df69c26b242cd44b4" [[package]] name = "cranelift-control" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc530560c8f16cc1d4dd7ea000c56f519c60d1a914977abe849ce555c35a61d" +checksum = "375dca8f58d8a801a85e11730c1529c5c4a9c3593dfb12118391ac437b037155" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f333fa641a9ad2bff0b107767dcb972c18c2bfab7969805a1d7e42449ccb0408" +checksum = "cc619b86fe3c72f43fc417c9fd67a04ec0c98296e5940922d9fd9e6eedf72521" dependencies = [ "serde", "serde_derive", @@ -1515,9 +1512,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abf6563015a80f03f8bc4df307d0a81363f4eb73108df3a34f6e66fb6d5307" +checksum = "7eb607fd19ae264da18f9f2532e7302b826f7fbf77bf88365fc075f2e3419436" dependencies = [ "cranelift-codegen", "log", @@ -1527,15 +1524,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb29d0edc8a5c029ed0f7ca77501f272738e3c410020b4a00f42ffe8ad2a8aa" +checksum = "9fe806a6470dddfdf79e878af6a96afb1235a09fe3e21f9e0c2f18d402820432" [[package]] name = "cranelift-native" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006056a7fa920870bad06bf8e1b3033d70cbb7ee625b035efa9d90882a931868" +checksum = "fac7f1722660b10af1f7229c0048f716bfd8bd344549b0e06e3eb6417ec3fe5b" dependencies = [ "cranelift-codegen", "libc", @@ -1544,9 +1541,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.100.0" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d08c05f82903a1f6a04d89c4b9ecb47a4035710f89a39a21a147a80214672" +checksum = "b1b65810be56b619c3c55debade92798d999f34bf0670370c578afab5d905f06" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1569,9 +1566,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" [[package]] name = "crc32fast" @@ -1708,12 +1705,12 @@ dependencies = [ [[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.38", ] [[package]] @@ -1752,19 +1749,6 @@ dependencies = [ ] [[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.1", - "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" @@ -2117,12 +2101,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[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" @@ -2160,9 +2138,9 @@ dependencies = [ [[package]] name = "fqdn" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5dd19b048b2dfde153588594b4f3da47b18afd18d171bb8d1d27741256bbaa" +checksum = "e3d76ed310eb8c6f88ddde3e976d015f4f91761fe98d7d41e497db542318fca9" [[package]] name = "fs-set-times" @@ -2183,9 +2161,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2198,9 +2176,9 @@ 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", "futures-sink", @@ -2208,15 +2186,15 @@ dependencies = [ [[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", @@ -2236,9 +2214,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2257,9 +2235,9 @@ dependencies = [ [[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", @@ -2268,21 +2246,21 @@ dependencies = [ [[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-channel", "futures-core", @@ -2368,17 +2346,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", - "indexmap 2.0.2", + "indexmap 2.1.0", "stable_deref_trait", ] [[package]] name = "git2" -version = "0.17.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -2387,9 +2365,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.54.1" +version = "0.55.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6d32e74454459690d57d18ea4ebec1629936e6b130b51d12cb4a81630ac953" +checksum = "002667cd1ebb789313d0d0afe3d23b2821cf3b0e91605095f0e6d8751f0ceeea" dependencies = [ "gix-actor", "gix-attributes", @@ -2442,9 +2420,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" +checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c" dependencies = [ "bstr", "btoi", @@ -2456,16 +2434,16 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2451665e70709ba4753b623ef97511ee98c4a73816b2c5b5df25678d607ed820" +checksum = "dca120f0c6562d2d7cae467f2466e576d9f7f189beec2af2e026145107c729e2" dependencies = [ "bstr", - "byteyarn", "gix-glob", "gix-path", "gix-quote", "gix-trace", + "kstring", "smallvec", "thiserror", "unicode-bom", @@ -2500,9 +2478,9 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75a975ee22cf0a002bfe9b5d5cb3d2a88e263a8a178cd7509133cff10f4df8a" +checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36" dependencies = [ "bstr", "gix-chunk", @@ -2514,9 +2492,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c171514b40487d3f677ae37efc0f45ac980e3169f23c27eb30a70b47fdf88ab5" +checksum = "5cae98c6b4c66c09379bc35274b172587d6b0ac369a416c39128ad8c6454f9bb" dependencies = [ "bstr", "gix-config-value", @@ -2548,9 +2526,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46900b884cc5af6a6c141ee741607c0c651a4e1d33614b8d888a1ba81cc0bc8a" +checksum = "1c5c5d74069b842a1861e581027ac6b7ad9ff66f5911c89b9f45484d7ebda6a4" dependencies = [ "bstr", "gix-command", @@ -2576,9 +2554,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788ddb152c388206e81f36bcbb574e7ed7827c27d8fa62227b34edc333d8928c" +checksum = "931394f69fb8c9ed6afc0aae3487bd869e936339bcc13ed8884472af072e0554" dependencies = [ "gix-hash", "gix-object", @@ -2587,9 +2565,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69507643d75a0ea9a402fcf73ced517d2b95cc95385904ac09d03e0b952fde33" +checksum = "a45d5cf0321178883e38705ab2b098f625d609a7d4c391b33ac952eff2c490f2" dependencies = [ "bstr", "dunce", @@ -2602,9 +2580,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" +checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827" dependencies = [ "bytes", "crc32fast", @@ -2621,9 +2599,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be40d28cd41445bb6cd52c4d847d915900e5466f7433eaee6a9e0a3d1d88b08" +checksum = "92f674d3fdb6b1987b04521ec9a5b7be8650671f2c4bbd17c3c81e2a364242ff" dependencies = [ "bstr", "encoding_rs", @@ -2641,18 +2619,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" +checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" +checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2677,15 +2655,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "parking_lot 0.12.1", ] [[package]] name = "gix-ignore" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048f443a1f6b02da4205c34d2e287e3fd45d75e8e2f06cfb216630ea9bff5e3" +checksum = "1e73c07763a8005ae02cb5cf83040729cea9bb70c7cef68ec6c24159904c499a" dependencies = [ "bstr", "gix-glob", @@ -2695,9 +2673,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" +checksum = "c83a4fcc121b2f2e109088f677f89f85e7a8ebf39e8e6659c0ae54d4283b1650" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2718,9 +2696,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" +checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" dependencies = [ "gix-tempfile", "gix-utils", @@ -2740,9 +2718,9 @@ dependencies = [ [[package]] name = "gix-negotiate" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" +checksum = "2a5cdcf491ecc9ce39dcc227216c540355fe0024ae7c38e94557752ca5ebb67f" dependencies = [ "bitflags 2.4.1", "gix-commitgraph", @@ -2756,9 +2734,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" +checksum = "740f2a44267f58770a1cb3a3d01d14e67b089c7136c48d4bddbb3cfd2bf86a51" dependencies = [ "bstr", "btoi", @@ -2775,9 +2753,9 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.53.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6a392c6ba3a2f133cdc63120e9bc7aec81eef763db372c817de31febfe64bf" +checksum = "8630b56cb80d8fa684d383dad006a66401ee8314e12fbf0e566ddad8c115143b" dependencies = [ "arc-swap", "gix-date", @@ -2794,9 +2772,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7536203a45b31e1bc5694bbf90ba8da1b736c77040dd6a520db369f371eb1ab3" +checksum = "1431ba2e30deff1405920693d54ab231c88d7c240dd6ccc936ee223d8f8697c3" dependencies = [ "clru", "gix-chunk", @@ -2849,9 +2827,9 @@ dependencies = [ [[package]] name = "gix-pathspec" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" +checksum = "e9cc7194fdcf43b4a1ccfa13ffae1d79f83beb4becff7761d88dd99faeafe625" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2877,9 +2855,9 @@ dependencies = [ [[package]] name = "gix-protocol" -version = "0.40.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7b700dc20cc9be8a5130a1fd7e10c34117ffa7068431c8c24d963f0a2e0c9b" +checksum = "391e3feabdfa5f90dad6673ce59e3291ac28901b2ff248d86c5a7fbde0391e0e" dependencies = [ "bstr", "btoi", @@ -2906,9 +2884,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e6b749660b613641769edc1954132eb8071a13c32224891686091bef078de4" +checksum = "0ec2f6d07ac88d2fb8007ee3fa3e801856fb9d82e7366ec0ca332eb2c9d74a52" dependencies = [ "gix-actor", "gix-date", @@ -2927,9 +2905,9 @@ dependencies = [ [[package]] name = "gix-refspec" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0895cb7b1e70f3c3bd4550c329e9f5caf2975f97fcd4238e05754e72208ef61e" +checksum = "ccb0974cc41dbdb43a180c7f67aa481e1c1e160fcfa8f4a55291fd1126c1a6e7" dependencies = [ "bstr", "gix-hash", @@ -2941,9 +2919,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8c4b15cf2ab7a35f5bcb3ef146187c8d36df0177e171ca061913cbaaa890e89" +checksum = "2ca97ac73459a7f3766aa4a5638a6e37d56d4c7962bc1986fbaf4883d0772588" dependencies = [ "bstr", "gix-date", @@ -2957,9 +2935,9 @@ dependencies = [ [[package]] name = "gix-revwalk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" +checksum = "a16d8c892e4cd676d86f0265bf9d40cefd73d8d94f86b213b8b77d50e77efae0" dependencies = [ "gix-commitgraph", "gix-date", @@ -2984,9 +2962,9 @@ dependencies = [ [[package]] name = "gix-submodule" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0150e82e9282d3f2ab2dd57a22f9f6c3447b9d9856e5321ac92d38e3e0e2b7" +checksum = "bba78c8d12aa24370178453ec3a472ff08dfaa657d116229f57f2c9cd469a1c2" dependencies = [ "bstr", "gix-config", @@ -2999,9 +2977,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" +checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8" dependencies = [ "gix-fs", "libc", @@ -3018,11 +2996,11 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" [[package]] name = "gix-transport" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ec726e6a245e68ace59a34126a1d679de60360676612985e70b0d3b102fb4e" +checksum = "2f209a93364e24f20319751bc11092272e2f3fe82bb72592b2822679cf5be752" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bstr", "gix-command", "gix-credentials", @@ -3037,9 +3015,9 @@ dependencies = [ [[package]] name = "gix-traverse" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" +checksum = "14d050ec7d4e1bb76abf0636cf4104fb915b70e54e3ced9a4427c999100ff38a" dependencies = [ "gix-commitgraph", "gix-date", @@ -3053,9 +3031,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.24.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6125ecf46e8c68bf7202da6cad239831daebf0247ffbab30210d72f3856e420f" +checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671" dependencies = [ "bstr", "gix-features", @@ -3086,9 +3064,9 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5e32972801bd82d56609e6fc84efc358fa1f11f25c5e83b7807ee2280f14fe" +checksum = "ddaf79e721dba64fe726a42f297a3c8ed42e55cdc0d81ca68452f2def3c2d7fd" dependencies = [ "bstr", "gix-attributes", @@ -3104,9 +3082,9 @@ dependencies = [ [[package]] name = "gix-worktree-state" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3aeb06960f2c5ac9e4cdb6b38eb3c2b99d5e525e68285fef21ed17dfbd597ad" +checksum = "34a2fcccdcaf3c71c00a03df31c9aa459d444cabbec4ed9ca1fa64e43406bed4" dependencies = [ "bstr", "gix-features", @@ -3183,9 +3161,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ "ahash", "allocator-api2", @@ -3197,7 +3175,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -3206,7 +3184,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -3381,7 +3359,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3401,33 +3379,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - -[[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", "log", - "rustls 0.21.7", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -3541,12 +3504,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", "serde", ] @@ -3593,9 +3556,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d50eb225913c1903c788287ddd0b16369771e5abc988756a5e5927390ba04f" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "ring 0.16.20", "serde", "serde_json", @@ -3634,7 +3597,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2 0.5.5", "widestring", "windows-sys 0.48.0", "winreg", @@ -3642,9 +3605,9 @@ dependencies = [ [[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" @@ -3734,28 +3697,37 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" dependencies = [ - "base64 0.21.4", - "pem", - "ring 0.16.20", + "base64 0.21.5", + "pem 3.0.2", + "ring 0.17.5", "serde", "serde_json", "simple_asn1", ] [[package]] +name = "kstring" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" +dependencies = [ + "static_assertions", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3778,9 +3750,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -4001,9 +3973,9 @@ 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", @@ -4013,9 +3985,9 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d517e7e678e1c9a2983ec704b43f3b22f38b1b7a247ea3ddb36d21578bf4e" +checksum = "e7c926772050c3a3f87c837626bf6135c8ca688d91d31dd39a3da547fc2bc9fe" dependencies = [ "async-trait", "base64 0.13.1", @@ -4036,20 +4008,20 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.21.7", + "rustls", "rustls-pemfile", "serde", "serde_bytes", "serde_with 1.14.0", "sha-1", "sha2 0.10.8", - "socket2 0.4.9", + "socket2 0.4.10", "stringprep", "strsim", "take_mut", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver 0.21.2", @@ -4059,19 +4031,13 @@ dependencies = [ ] [[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] name = "nbuild-core" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5ab1b0a3450a5031ae7d555bb0c71dd3b15bf8a2f2af79e00aec91f69a4a0e" dependencies = [ "cargo-lock", - "cargo_metadata", + "cargo_metadata 0.15.4", "target-spec", "thiserror", "tracing", @@ -4217,8 +4183,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.14.1", - "indexmap 2.0.2", + "hashbrown 0.14.2", + "indexmap 2.1.0", "memchr", ] @@ -4251,88 +4217,87 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f" +checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk", + "futures-core", + "futures-sink", + "indexmap 2.1.0", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry-http" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" +checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", "http", - "opentelemetry_api", + "opentelemetry", ] [[package]] name = "opentelemetry-otlp" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af72d59a4484654ea8eb183fea5ae4eb6a41d7ac3e3bae5f4d2a282a3a7d3ca" +checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http", "opentelemetry", "opentelemetry-proto", - "prost", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "prost 0.11.9", "thiserror", "tokio", - "tonic", + "tonic 0.9.2", ] [[package]] name = "opentelemetry-proto" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c" +checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "futures", - "futures-util", "opentelemetry", - "prost", - "tonic", + "opentelemetry_sdk", + "prost 0.11.9", + "tonic 0.9.2", ] [[package]] -name = "opentelemetry_api" -version = "0.19.0" +name = "opentelemetry-semantic-conventions" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2" +checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "fnv", - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", + "opentelemetry", ] [[package]] name = "opentelemetry_sdk" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1" +checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry_api", + "opentelemetry", + "ordered-float", "percent-encoding", "rand 0.8.5", "thiserror", @@ -4347,6 +4312,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "ordered-float" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +dependencies = [ + "num-traits", +] + +[[package]] name = "os_pipe" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4447,6 +4421,16 @@ dependencies = [ ] [[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 = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4462,16 +4446,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.2", -] - -[[package]] name = "pin-project" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4504,15 +4478,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pipe" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7b8f27da217eb966df4c58d4159ea939431950ca03cf782c22bd7c5c1d8d75" -dependencies = [ - "crossbeam-channel", -] - -[[package]] name = "pkcs1" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4541,9 +4506,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "portpicker" @@ -4605,16 +4570,6 @@ dependencies = [ ] [[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" @@ -4680,29 +4635,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.9", ] [[package]] -name = "prost-build" -version = "0.11.9" +name = "prost" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "prost-derive 0.12.1", ] [[package]] @@ -4719,12 +4662,25 @@ dependencies = [ ] [[package]] +name = "prost-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ - "prost", + "prost 0.12.1", ] [[package]] @@ -4882,11 +4838,11 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ - "pem", + "pem 3.0.2", "ring 0.16.20", "time", "yasna", @@ -4999,7 +4955,7 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -5008,7 +4964,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "ipnet", "js-sys", "log", @@ -5017,16 +4973,16 @@ 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", "tower-service", - "trust-dns-resolver 0.23.1", + "trust-dns-resolver 0.23.2", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -5037,9 +4993,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff44108c7925d082f2861e683a88618b68235ad9cdc60d64d9d1188efc951cdb" +checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" dependencies = [ "anyhow", "async-trait", @@ -5160,16 +5116,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", @@ -5182,9 +5136,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5193,9 +5147,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", @@ -5207,9 +5161,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" dependencies = [ "sha2 0.10.8", "walkdir", @@ -5266,9 +5220,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.1", "errno", @@ -5281,24 +5235,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring 0.16.20", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -5321,24 +5263,24 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustrict" -version = "0.7.10" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f35794fdc3d71a3ac840726c688e7892e58ed71f407b48a975b9d41fc819e80" +checksum = "cfe3300a40b60e76a856237ad1fe2210da1f40686705a2211688bb5742109a63" dependencies = [ "arrayvec 0.7.4", "bitflags 1.3.2", @@ -5401,12 +5343,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5458,9 +5400,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -5476,9 +5418,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", @@ -5487,11 +5429,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5531,9 +5473,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", @@ -5542,9 +5484,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5573,15 +5515,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 0.21.5", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_json", "time", @@ -5677,7 +5619,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "clap", @@ -5687,20 +5629,20 @@ dependencies = [ "serde_json", "shuttle-common", "tokio", - "toml 0.7.8", + "toml 0.8.6", "tracing", "tracing-subscriber", ] [[package]] name = "shuttle-auth" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-stripe", "async-trait", "axum", - "axum-extra 0.7.7", + "axum-extra", "axum-sessions", "clap", "http", @@ -5709,12 +5651,12 @@ dependencies = [ "opentelemetry", "portpicker", "rand 0.8.5", - "ring 0.16.20", + "ring 0.17.5", "serde", "serde_json", "shuttle-common", "sqlx", - "strum", + "strum 0.25.0", "thiserror", "tokio", "tower", @@ -5725,7 +5667,7 @@ dependencies = [ [[package]] name = "shuttle-builder" -version = "0.30.1" +version = "0.33.0" dependencies = [ "async-trait", "clap", @@ -5742,8 +5684,8 @@ dependencies = [ "tempfile", "thiserror", "tokio", - "toml 0.7.8", - "tonic", + "toml 0.8.6", + "tonic 0.10.2", "tracing", "tracing-subscriber", "ulid", @@ -5751,7 +5693,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.30.1" +version = "0.33.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5768,14 +5710,13 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", "axum", "base64 0.13.1", "bytes", - "cap-std", "chrono", "comfy-table", "crossterm 0.27.0", @@ -5789,21 +5730,22 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-otlp", + "opentelemetry_sdk", "pin-project", "proptest", "rand 0.8.5", "reqwest", - "ring 0.16.20", + "ring 0.17.5", "rmp-serde", "rustrict", "semver 1.0.20", "serde", "serde_json", "sqlx", - "strum", + "strum 0.25.0", "thiserror", "tokio", - "tonic", + "tonic 0.10.2", "tower", "tower-http 0.4.4", "tracing", @@ -5811,13 +5753,15 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "ttl_cache", + "url", "utoipa", "uuid", + "zeroize", ] [[package]] name = "shuttle-common-tests" -version = "0.30.1" +version = "0.33.0" dependencies = [ "cargo-shuttle", "hyper", @@ -5827,22 +5771,21 @@ dependencies = [ "shuttle-proto", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tower", ] [[package]] name = "shuttle-deployer" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", "axum", "bytes", - "cargo_metadata", + "cargo_metadata 0.18.1", "chrono", "clap", - "crossbeam-channel", "ctor", "flate2", "fqdn", @@ -5854,7 +5797,6 @@ dependencies = [ "once_cell", "opentelemetry", "opentelemetry-http", - "pipe", "portpicker", "prost-types", "rand 0.8.5", @@ -5866,14 +5808,14 @@ dependencies = [ "shuttle-proto", "shuttle-service", "sqlx", - "strum", + "strum 0.25.0", "tar", "tempfile", "thiserror", "tokio", "tokio-stream", - "toml 0.7.8", - "tonic", + "toml 0.8.6", + "tonic 0.10.2", "tower", "tower-http 0.4.4", "tracing", @@ -5887,7 +5829,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", @@ -5909,14 +5851,14 @@ dependencies = [ "once_cell", "opentelemetry", "opentelemetry-http", - "pem", + "pem 1.1.1", "pin-project", "portpicker", "rand 0.8.5", "rcgen", "reqwest", - "ring 0.16.20", - "rustls 0.20.9", + "ring 0.17.5", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -5925,10 +5867,10 @@ dependencies = [ "shuttle-proto", "snailquote", "sqlx", - "strum", + "strum 0.25.0", "tempfile", "tokio", - "tonic", + "tonic 0.10.2", "tower", "tower-http 0.4.4", "tower-sanitize-path", @@ -5945,7 +5887,7 @@ dependencies = [ [[package]] name = "shuttle-logger" -version = "0.30.1" +version = "0.33.0" dependencies = [ "async-trait", "chrono", @@ -5963,7 +5905,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tracing", "tracing-subscriber", "uuid", @@ -5971,30 +5913,30 @@ dependencies = [ [[package]] name = "shuttle-orchestrator" -version = "0.30.1" +version = "0.33.0" [[package]] name = "shuttle-proto" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "chrono", "dunce", + "futures-core", "home", - "prost", + "prost 0.12.1", "prost-types", "serde_json", "shuttle-common", "tokio", - "tonic", - "tonic-build", + "tonic 0.10.2", "tower", "tracing", ] [[package]] name = "shuttle-provisioner" -version = "0.30.1" +version = "0.33.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -6004,7 +5946,7 @@ dependencies = [ "mongodb", "once_cell", "portpicker", - "prost", + "prost 0.12.1", "rand 0.8.5", "serde_json", "shuttle-common", @@ -6012,15 +5954,14 @@ dependencies = [ "sqlx", "thiserror", "tokio", - "tonic", - "tonic-build", + "tonic 0.10.2", "tracing", "tracing-subscriber", ] [[package]] name = "shuttle-resource-recorder" -version = "0.30.1" +version = "0.33.0" dependencies = [ "async-trait", "chrono", @@ -6033,10 +5974,10 @@ dependencies = [ "shuttle-common-tests", "shuttle-proto", "sqlx", - "strum", + "strum 0.25.0", "thiserror", "tokio", - "tonic", + "tonic 0.10.2", "tracing", "tracing-subscriber", "ulid", @@ -6044,14 +5985,13 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", "cap-std", "chrono", "colored", - "crossbeam-channel", "futures", "hyper", "portpicker", @@ -6067,7 +6007,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tower", "tracing-subscriber", "uuid", @@ -6078,19 +6018,17 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.30.1" +version = "0.33.0" dependencies = [ "anyhow", "async-trait", - "cargo_metadata", - "crossbeam-channel", - "os_pipe", + "cargo_metadata 0.18.1", "serde", "shuttle-common", "strfmt", "thiserror", "tokio", - "toml 0.7.8", + "toml 0.8.6", "tracing", ] @@ -6199,9 +6137,9 @@ dependencies = [ [[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", @@ -6209,9 +6147,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -6295,13 +6233,13 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls 0.21.7", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -6363,7 +6301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.5", "bitflags 2.4.1", "byteorder", "bytes", @@ -6407,7 +6345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.5", "bitflags 2.4.1", "byteorder", "chrono", @@ -6472,6 +6410,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 = "strfmt" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6499,8 +6443,14 @@ name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + +[[package]] +name = "strum" +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]] @@ -6517,6 +6467,19 @@ dependencies = [ ] [[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] + +[[package]] name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6624,9 +6587,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "target-spec" @@ -6650,13 +6613,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "windows-sys 0.48.0", ] @@ -6699,18 +6662,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", @@ -6787,7 +6750,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] @@ -6815,22 +6778,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.7", + "rustls", "tokio", ] @@ -6866,18 +6818,18 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.7", + "rustls", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tungstenite", "webpki-roots 0.25.2", ] [[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", @@ -6923,14 +6875,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.7", ] [[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", ] @@ -6941,7 +6905,20 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6950,14 +6927,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.5", "bytes", "futures-core", "futures-util", @@ -6968,29 +6944,40 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", - "prost-derive", + "prost 0.11.9", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", ] [[package]] -name = "tonic-build" -version = "0.8.4" +name = "tonic" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", + "async-stream", + "async-trait", + "axum", + "base64 0.21.5", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.1", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", ] [[package]] @@ -7033,29 +7020,11 @@ dependencies = [ [[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", -] - -[[package]] -name = "tower-http" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bitflags 2.4.1", "bytes", "futures-core", @@ -7139,38 +7108,43 @@ dependencies = [ ] [[package]] -name = "tracing-futures" -version = "0.2.5" +name = "tracing-log" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "pin-project", - "tracing", + "log", + "once_cell", + "tracing-core", ] [[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-opentelemetry" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", "opentelemetry", + "opentelemetry_sdk", + "smallvec", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-subscriber", + "web-time", ] [[package]] @@ -7188,7 +7162,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", ] [[package]] @@ -7218,9 +7192,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559ac980345f7f5020883dd3bcacf176355225e01916f8c2efecad7534f682c6" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -7263,9 +7237,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c723b0e608b24ad04c73b2607e0241b2c98fd79795a95e98b068b6966138a29d" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -7279,7 +7253,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto 0.23.1", + "trust-dns-proto 0.23.2", ] [[package]] @@ -7325,7 +7299,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.21.7", + "rustls", "sha1", "thiserror", "url", @@ -7478,11 +7452,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82b1bc5417102a73e8464c686eef947bdfb99fcdfc0a4f228e81afa9526470a" +checksum = "6b208a50ff438dcdc887ea3f2db59530bd2f4bc3d2c70630e4d7ee7a281a1d1b" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_json", "utoipa-gen", @@ -7490,9 +7464,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d96dcd6fc96f3df9b3280ef480770af1b7c5d14bc55192baa9b067976d920c" +checksum = "0bd516d8879043e081537690bc96c8f17b5a4602c336aecb8f1de89d9d9c7e72" dependencies = [ "proc-macro-error", "proc-macro2", @@ -7503,9 +7477,9 @@ dependencies = [ [[package]] name = "utoipa-swagger-ui" -version = "3.1.5" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84614caa239fb25b2bb373a52859ffd94605ceb256eeb1d63436325cf81e3653" +checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" dependencies = [ "axum", "mime_guess", @@ -7599,9 +7573,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec076cd75f207327f5bfaebb915ef03d82c3a01a6d9b5d0deb6eafffceab3095" +checksum = "77c4db6155e71cfae4ed732d87c2583faf4bbdcb77372697eb77d636f46108ba" dependencies = [ "anyhow", "async-trait", @@ -7623,9 +7597,9 @@ dependencies = [ [[package]] name = "wasi-common" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f391b334c783c1154369be62c31dc8598ffa1a6c34ea05d7f8cf0b18ce7c272" +checksum = "bf3f291b2a567f266ac488715f1742f62b2ca633524708c62ead9c0f71b7d72c" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -7643,9 +7617,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7653,9 +7627,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", @@ -7668,9 +7642,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7680,9 +7654,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7690,9 +7664,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", @@ -7703,9 +7677,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-encoder" @@ -7718,9 +7692,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca90ba1b5b0a70d3d49473c5579951f3bddc78d47b59256d2f9d4922b150aca" +checksum = "53ae0be20bf87918df4fa831bfbbd0b491d24aee407ed86360eae4c2c5608d38" dependencies = [ "leb128", ] @@ -7746,35 +7720,35 @@ version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "semver 1.0.20", ] [[package]] name = "wasmparser" -version = "0.115.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" +checksum = "53290b1276c5c2d47d694fb1a920538c01f51690e7e261acbe1d10c5fc306ea1" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "semver 1.0.20", ] [[package]] name = "wasmprinter" -version = "0.2.70" +version = "0.2.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e" +checksum = "8f98260aa20f939518bcec1fac32c78898d5c68872e7363a4651f21f791b6c7e" dependencies = [ "anyhow", - "wasmparser 0.115.0", + "wasmparser 0.116.0", ] [[package]] name = "wasmtime" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ed7db409c1acf60d33128b2a38bee25aaf38c4bd955ab98a5b623c8294593c" +checksum = "b0263693caa1486bd4d26a5f18511948a706c9290689386b81b851ce088063ce" dependencies = [ "anyhow", "async-trait", @@ -7783,7 +7757,7 @@ dependencies = [ "cfg-if 1.0.0", "encoding_rs", "fxprof-processed-profile", - "indexmap 2.0.2", + "indexmap 2.1.0", "libc", "log", "object", @@ -7812,21 +7786,21 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53af0f8f6271bd687fe5632c8fe0a0f061d0aa1b99a0cd4e1df8e4cbeb809d2f" +checksum = "4711e5969236ecfbe70c807804ff9ffb5206c1dbb5c55c5e8200d9f7e8e76adf" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "wasmtime-cache" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41376a7c094335ee08abe6a4eff79a32510cc805a249eff1b5e7adf0a42e7cdf" +checksum = "5b79f9f79188e5a26b6911b79d3171c06699d9a17ae07f6a265c51635b8d80c2" dependencies = [ "anyhow", - "base64 0.21.4", + "base64 0.21.5", "bincode", "directories-next", "log", @@ -7841,9 +7815,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ab5b291f2dad56f1e6929cc61fb7cac68845766ca77c3838b5d05d82c33976" +checksum = "ed724d0f41c21bcf8754651a59d0423c530069ddca4cf3822768489ad313a812" dependencies = [ "anyhow", "proc-macro2", @@ -7856,15 +7830,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21436177bf19f6b60dc0b83ad5872e849892a4a90c3572785e1a28c0e2e1132c" +checksum = "7e7d69464b94bd312a27d93d0b482cd74bedf01f030199ef0740d6300ebca1d3" [[package]] name = "wasmtime-cranelift" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "920e42058862d1f7a3dd3fca73cb495a20d7506e3ada4bbc0a9780cd636da7ca" +checksum = "4e63f53c61ba05eb815f905c1738ad82c95333dd42ef5a8cc2aa3d7dfb2b08d7" dependencies = [ "anyhow", "cfg-if 1.0.0", @@ -7887,9 +7861,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516d63bbe18219e64a9705cf3a2c865afe1fb711454ea03091dc85a1d708194d" +checksum = "4f6b197d68612f7dc3a17aa9f9587533715ecb8b4755609ce9baf7fb92b74ddc" dependencies = [ "anyhow", "cranelift-codegen", @@ -7903,14 +7877,14 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cef239d663885f1427f8b8f4fde7be6075249c282580d94b480f11953ca194" +checksum = "18e2558c8b04fd27764d8601d46b8dc39555b79720a41e626bce210a80758932" dependencies = [ "anyhow", "cranelift-entity", "gimli", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "object", "serde", @@ -7926,9 +7900,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef118b557df6193cd82cfb45ab57cd12388fedfe2bb76f090b2d77c96c1b56e" +checksum = "a615a2cf64a49c0dc659c7d850c6cd377b975e0abfdcf0888b282d274a82e730" dependencies = [ "cc", "cfg-if 1.0.0", @@ -7940,9 +7914,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8089d5909b8f923aad57702ebaacb7b662aa9e43a3f71e83e025c5379a1205f" +checksum = "cd775514b8034b85b0323bfdc60abb1c28d27dbf6e22aad083ed57dac95cf72e" dependencies = [ "addr2line", "anyhow", @@ -7967,9 +7941,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b13924aedf6799ad66edb25500a20e3226629978b30a958c55285352bad130a" +checksum = "c054e27c6ce2a6191edabe89e646da013044dd5369e1d203c89f977f9bd32937" dependencies = [ "object", "once_cell", @@ -7979,9 +7953,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ff5f3707a5e3797deeeeac6ac26b2e1dd32dbc06693c0ab52e8ac4d18ec706" +checksum = "7f323977cddf4a262d1b856366b665c5b4d01793c57b79fb42505b9fd9e61e5b" dependencies = [ "cfg-if 1.0.0", "libc", @@ -7990,15 +7964,15 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ab4ce04ac05342edfa7f42895f2a5d8b16ee914330869acb865cd1facf265f" +checksum = "29e26461bba043f73cb4183f4ce0d606c0eaac112475867b11e5ea36fe1cac8e" dependencies = [ "anyhow", "cc", "cfg-if 1.0.0", "encoding_rs", - "indexmap 2.0.2", + "indexmap 2.1.0", "libc", "log", "mach", @@ -8020,9 +7994,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf61e21d5bd95e1ad7fa42b7bdabe21220682d6a6046d376edca29760849222" +checksum = "6fd7e9b29fee64eea5058cb5e7cb3480b52c2f1312d431d16ea8617ceebeb421" dependencies = [ "cranelift-entity", "serde", @@ -8033,9 +8007,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe877472cbdd6d96b4ecdc112af764e3b9d58c2e4175a87828f892ab94c60643" +checksum = "6362c557c36d8ad4aaab735f14ed9e4f78d6b40ec85a02a88fd859af87682e52" dependencies = [ "proc-macro2", "quote", @@ -8044,9 +8018,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6db393deb775e8bece53a6869be6425e46b28426aa7709df8c529a19759f4be" +checksum = "52c9e79f73320d96cd7644b021502dffee09dd92300b073f3541ae44e9ae377c" dependencies = [ "anyhow", "async-trait", @@ -8078,9 +8052,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bc5a770003807c55f2187a0092dea01722b0e24151e35816bd5091538bb8e88" +checksum = "aa5fc7212424c04c01a20bfa66c4c518e8749dde6546f5e05815dcacbec80723" dependencies = [ "anyhow", "cranelift-codegen", @@ -8095,21 +8069,21 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62003d48822f89cc393e93643366ddbee1766779c0874353b8ba2ede4679fbf9" +checksum = "dcc03bd58f77a68dc6a0b2ba2f8e64b1f902b50389d21bbcc690ef2f3bb87198" dependencies = [ "anyhow", "heck", - "indexmap 2.0.2", + "indexmap 2.1.0", "wit-parser", ] [[package]] name = "wasmtime-wmemcheck" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5412bb464066d64c3398c96e6974348f90fa2a55110ad7da3f9295438cd4de84" +checksum = "1e485bf54eba675ca615f8f55788d3a8cd44e7bd09b8b4011edc22c2c41d859e" [[package]] name = "wast" @@ -8122,30 +8096,40 @@ dependencies = [ [[package]] name = "wast" -version = "66.0.2" +version = "67.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cb43b0ac6dd156f2c375735ccfd72b012a7c0a6e6d09503499b8d3cb6e6072" +checksum = "36c2933efd77ff2398b83817a98984ffe4b67aefd9aa1d2c8e68e19b553f1c38" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.35.0", + "wasm-encoder 0.36.1", ] [[package]] name = "wat" -version = "1.0.77" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e367582095d2903caeeea9acbb140e1db9c7677001efa4347c3687fd34fe7072" +checksum = "c02905d13751dcb18f4e19f489d37a1bf139f519feaeef28d072a41a78e69a74" dependencies = [ - "wast 66.0.2", + "wast 67.0.0", ] [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" dependencies = [ "js-sys", "wasm-bindgen", @@ -8169,16 +8153,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.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8194,18 +8168,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[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 = "whoami" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8219,9 +8181,9 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wiggle" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da341f21516453768bd115bdc17b186c0a1ab6773c2b2eeab44a062db49bd616" +checksum = "e81ddbdc400b38d04241d740d0406ef343bd242c460f252fe59f29ad964ad24c" dependencies = [ "anyhow", "async-trait", @@ -8234,9 +8196,9 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22c6bd943a4bae37052b79d249fb32d7afa22b3f6a147a5f2e7bc2b9f901879" +checksum = "7c993123d6db1a1908ef8352aabdf2e681a3dcdedc3656beb747e4db16d3cf08" dependencies = [ "anyhow", "heck", @@ -8249,9 +8211,9 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "13.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d72d838b7c9302b2ca7c44f36d6af5ce1988239a16deba951d99c4630d17caf" +checksum = "476e3e09bc68e82624b70a322265515523754cb9e05fcacceabd216e276bc2ed" dependencies = [ "proc-macro2", "quote", @@ -8292,9 +8254,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50647204d600a2a112eefac0645ba6653809a15bd362c7e4e6a049a5bdff0de9" +checksum = "b9b01ca6722f7421c9cdbe4c9b62342ce864d0a9e8736d56dac717a86b1a65ae" dependencies = [ "anyhow", "cranelift-codegen", @@ -8458,9 +8420,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] @@ -8493,7 +8455,7 @@ checksum = "a39edca9abb16309def3843af73b58d47d243fe33a9ceee572446bcc57556b9a" dependencies = [ "anyhow", "id-arena", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "pulldown-cmark", "semver 1.0.20", @@ -8526,12 +8488,11 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ "asn1-rs", - "base64 0.13.1", "data-encoding", "der-parser", "lazy_static", @@ -8573,6 +8534,26 @@ dependencies = [ ] [[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", +] + +[[package]] name = "zeroize" version = "1.6.0" 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 ec3be0eb3fd83..11203c7018983 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.30.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-zfRIw1PN3KCMrwnlFM3AFh/Dt8ywu2l3EABz87s8JK0="; + hash = "sha256-9MdEB7T+ZJuI5sGbHkhibhqKiGZYmURbaarBsU4gQMk="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index fda47b5070aed..63217b655ac59 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -5,7 +5,6 @@ , Cocoa , CoreServices , Foundation -, rust , libiconv }: @@ -27,7 +26,7 @@ rustPlatform.buildRustPackage rec { # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) preCheck = '' - export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + export PATH="$(pwd)/target/${stdenv.hostPlatform.rust.rustcTarget}/release:$PATH" ''; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 5a4e14a733c97..3741be37772d3 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-7XY2hFmc4Vqh8fVCSrpQkoXZKZxX3kqppIDGc3T7qRw="; + hash = "sha256-x0TPbqwoCaXUlrjYQ47+x5KohsiK5yCrI2Q8yA2K8Zs="; }; - cargoHash = "sha256-a/WRXiTSmQyAlxXqeFUWWSPFbHKL7Sifv2CW7rgbLWk="; + cargoHash = "sha256-FK6tTAbhP1f4VasG9HCahbMTDrJ9A6zXt/T6cs3HOZE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/humility/Cargo.lock b/pkgs/development/tools/rust/humility/Cargo.lock index 7f20641b32b5c..8fd62d8cc564d 100644 --- a/pkgs/development/tools/rust/humility/Cargo.lock +++ b/pkgs/development/tools/rust/humility/Cargo.lock @@ -3,64 +3,119 @@ version = 3 [[package]] -name = "CoreFoundation-sys" -version = "0.1.4" +name = "addr2line" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e9889e6db118d49d88d84728d0e964d973a5680befb5f85f55141beea5c20b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "libc", - "mach", + "gimli 0.27.2", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[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 = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", ] [[package]] -name = "IOKit-sys" +name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99696c398cbaf669d2368076bdb3d627fb0ce51a26899d7c61228c5c0af3bf4a" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "CoreFoundation-sys", "libc", - "mach", ] [[package]] -name = "addr2line" -version = "0.17.0" +name = "anstream" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" dependencies = [ - "gimli 0.26.1", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", ] [[package]] -name = "adler" -version = "1.0.2" +name = "anstyle" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] -name = "aho-corasick" -version = "0.7.18" +name = "anstyle-parse" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ - "memchr", + "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 = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" dependencies = [ "backtrace", ] [[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] name = "atomic-polyfill" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14bf7b4f565e5e717d7a7a65b2a05c0b8c96e4db636d6f780f03b15108cdd1b" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" dependencies = [ "critical-section", ] @@ -71,7 +126,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -84,39 +139,30 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.28.4", + "object 0.30.3", "rustc-demangle", ] [[package]] -name = "bare-metal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" -dependencies = [ - "rustc_version 0.2.3", -] - -[[package]] -name = "bare-metal" -version = "1.0.0" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "base64" -version = "0.13.0" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -128,12 +174,6 @@ dependencies = [ ] [[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - -[[package]] name = "bitfield" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -146,10 +186,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" + +[[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -159,24 +205,18 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "bumpalo" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byteorder" @@ -186,15 +226,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -246,7 +286,7 @@ checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" dependencies = [ "cargo-platform", "semver 0.11.0", - "semver-parser 0.10.2", + "semver-parser", "serde", "serde_json", ] @@ -259,9 +299,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" @@ -270,13 +313,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[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 = "3.2.6" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1fe12880bae935d142c8702d500c63a4e8634b6c3c57ad72bf978fc7b6249a" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", "indexmap", @@ -288,27 +355,43 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.6" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6db9e867166a43a53f7199b5e4d1f522a1e5bd626654be263c999ce59df39a" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "clap_lex" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87eba3c8c7f42ef17f6c659fc7416d0f4758cd3e58861ee63c5fa4a4dde649e4" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] [[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 = "colored" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -321,47 +404,34 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", ] [[package]] -name = "concolor" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af" -dependencies = [ - "atty", - "bitflags", - "concolor-query", -] - -[[package]] -name = "concolor-query" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449" - -[[package]] name = "console" -version = "0.15.0" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "regex", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] name = "content_inspector" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -372,54 +442,48 @@ dependencies = [ [[package]] name = "convert_case" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1f025f441cdfb75831bec89b9d6a6ed02e5e763f78fc5e1ff30d4870fefaec" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "cortex-m" -version = "0.7.5" +name = "coolor" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd20d4ac4aa86f4f75f239d59e542ef67de87cce2c282818dc6e84155d3ea126" +checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" dependencies = [ - "bare-metal 0.2.5", - "bitfield", - "embedded-hal", - "volatile-register", + "crossterm 0.23.2", ] [[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.2" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] -name = "crc-any" -version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" -dependencies = [ - "debug-helper", -] - -[[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crc32fast" @@ -432,21 +496,15 @@ dependencies = [ [[package]] name = "critical-section" -version = "0.2.7" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd" -dependencies = [ - "bare-metal 1.0.0", - "cfg-if", - "cortex-m", - "riscv", -] +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] name = "crossbeam" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if", "crossbeam-channel", @@ -458,9 +516,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -468,9 +526,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", @@ -479,23 +537,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.9" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -503,12 +560,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.9" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -517,11 +573,44 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" dependencies = [ - "bitflags", - "crossterm_winapi", + "bitflags 1.3.2", + "crossterm_winapi 0.8.0", + "libc", + "mio 0.7.14", + "parking_lot 0.11.2", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi 0.9.0", + "libc", + "mio 0.8.6", + "parking_lot 0.12.1", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f7409c70a38a56216480fba371ee460207dd8926ccf5b4160591759559170" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi 0.9.0", "libc", - "mio", - "parking_lot", + "mio 0.8.6", + "parking_lot 0.12.1", + "serde", "signal-hook", "signal-hook-mio", "winapi", @@ -537,10 +626,19 @@ dependencies = [ ] [[package]] +name = "crossterm_winapi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +dependencies = [ + "winapi", +] + +[[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", @@ -548,13 +646,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] @@ -570,12 +667,56 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.2" +version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865" +checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" dependencies = [ "nix", - "winapi", + "windows-sys 0.45.0", +] + +[[package]] +name = "cxx" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.15", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", ] [[package]] @@ -599,7 +740,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.109", ] [[package]] @@ -610,46 +751,31 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] name = "digest" -version = "0.10.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] name = "dunce" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "embedded-hal" -version = "0.2.7" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" -dependencies = [ - "nb 0.1.3", - "void", -] +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -665,14 +791,14 @@ checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e" dependencies = [ "num-traits", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -682,6 +808,27 @@ dependencies = [ ] [[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 = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -689,30 +836,41 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] +name = "fd-lock" +version = "3.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" +dependencies = [ + "cfg-if", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] name = "filetime" -version = "0.2.16" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "winapi", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -726,21 +884,32 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "funty" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", ] [[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] name = "gimli" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -753,19 +922,25 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", "stable_deref_trait", ] [[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.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "goblin" @@ -789,19 +964,19 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heapless" -version = "0.7.14" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065681e99f9ef7e0e813702a0326aedbcbbde7db5e55f097aedd1bf50b9dca43" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" dependencies = [ "atomic-polyfill", "hash32", - "rustc_version 0.4.0", + "rustc_version", "serde", "spin", "stable_deref_trait", @@ -809,29 +984,35 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "heck" -version = "0.4.0" +name = "hermit-abi" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +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 = "hidapi" version = "1.4.1" source = "git+https://github.com/oxidecomputer/hidapi-rs?branch=oxide-stable#91237483222a42f68d16adcdfd42bc8e32adf666" @@ -852,6 +1033,36 @@ dependencies = [ ] [[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "hubpack" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a0b84aeae519f65e0ba3aa998327080993426024edbd5cc38dbaf5ec524303" +dependencies = [ + "hubpack_derive", + "serde", +] + +[[package]] +name = "hubpack_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f928320aff16ee8818ef7309180f8b5897057fd79d9dcb8de3ed1ba6dcc125a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,7 +1080,7 @@ dependencies = [ [[package]] name = "humility" -version = "0.8.14" +version = "0.10.34" dependencies = [ "anyhow", "bitfield", @@ -880,9 +1091,12 @@ dependencies = [ "env_logger", "fallible-iterator", "hif", + "humility-cli", "humility-cmd", "humility-cmd-apptable", "humility-cmd-auxflash", + "humility-cmd-bankerase", + "humility-cmd-console-proxy", "humility-cmd-dashboard", "humility-cmd-debugmailbox", "humility-cmd-diagnose", @@ -896,8 +1110,9 @@ dependencies = [ "humility-cmd-gpio", "humility-cmd-hash", "humility-cmd-hiffy", + "humility-cmd-host", "humility-cmd-i2c", - "humility-cmd-isp", + "humility-cmd-ibc", "humility-cmd-itm", "humility-cmd-jefe", "humility-cmd-lpc55gpio", @@ -907,16 +1122,20 @@ dependencies = [ "humility-cmd-net", "humility-cmd-openocd", "humility-cmd-pmbus", + "humility-cmd-power", + "humility-cmd-powershelf", "humility-cmd-probe", "humility-cmd-qspi", "humility-cmd-readmem", "humility-cmd-readvar", + "humility-cmd-rebootleby", "humility-cmd-registers", "humility-cmd-rencm", "humility-cmd-rendmp", "humility-cmd-reset", "humility-cmd-ringbuf", "humility-cmd-rpc", + "humility-cmd-sbrmi", "humility-cmd-sensors", "humility-cmd-spctrl", "humility-cmd-spd", @@ -925,9 +1144,11 @@ dependencies = [ "humility-cmd-stmsecure", "humility-cmd-tasks", "humility-cmd-test", - "humility-cmd-trace", + "humility-cmd-tofino-eeprom", + "humility-cmd-update", "humility-cmd-validate", "humility-cmd-vpd", + "humility-cmd-writeword", "humility-core", "humility-cortex", "indexmap", @@ -939,31 +1160,46 @@ dependencies = [ "num-traits", "parse_int", "pmbus", + "reedline", "scroll", "serde", "spd", - "toml", + "toml 0.5.11", "trycmd", ] [[package]] -name = "humility-cmd" +name = "humility-arch-arm" +version = "0.1.0" +dependencies = [ + "anyhow", + "capstone", + "num-derive", + "num-traits", +] + +[[package]] +name = "humility-cli" version = "0.1.0" dependencies = [ "anyhow", "clap", - "colored", - "hif", "humility-core", - "idol", "indexmap", - "log", "parse_int", - "postcard", "serde", "serde_json", - "ssmarshal", - "zerocopy", +] + +[[package]] +name = "humility-cmd" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-cli", + "humility-core", + "humility-net-core", ] [[package]] @@ -972,6 +1208,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", ] @@ -984,18 +1221,48 @@ dependencies = [ "clap", "colored", "hif", + "humility-cli", "humility-cmd", - "humility-cmd-hiffy", "humility-core", + "humility-hiffy", + "humility-idol", "idol", "indicatif", "log", "parse_int", - "regex", "tlvc", - "vsc7448-info", - "vsc7448-types", - "zip", +] + +[[package]] +name = "humility-cmd-bankerase" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-cortex", + "ihex", + "parse_int", + "path-slash", + "tempfile", +] + +[[package]] +name = "humility-cmd-console-proxy" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "crossbeam-channel", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-hiffy", + "humility-idol", + "parse_int", + "termios", ] [[package]] @@ -1004,13 +1271,14 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "crossterm", + "crossterm 0.20.0", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-idol", "idol", - "indexmap", - "log", "parse_int", "tui", ] @@ -1022,17 +1290,11 @@ dependencies = [ "anyhow", "byteorder", "clap", + "humility-cli", "humility-cmd", - "humility-core", "humility-cortex", - "log", - "num-derive", - "num-traits", "parse_int", "probe-rs", - "strum", - "strum_macros", - "zerocopy", ] [[package]] @@ -1041,8 +1303,11 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", + "humility-doppel", + "humility-jefe", "parse_int", ] @@ -1053,10 +1318,9 @@ dependencies = [ "anyhow", "cargo_metadata", "clap", + "humility-cli", "humility-cmd", - "humility-core", - "lazy_static", - "termimad", + "termimad 0.21.1", ] [[package]] @@ -1065,9 +1329,23 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "goblin", + "hubpack", + "humility-arch-arm", + "humility-cli", "humility-cmd", "humility-core", + "humility-dump-agent", + "humpty", + "indexmap", + "indicatif", "log", + "lzss", + "num-traits", + "parse_int", + "probe-rs", + "zerocopy", + "zip", ] [[package]] @@ -1076,8 +1354,8 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "colored", "csv", + "humility-cli", "humility-cmd", "humility-core", "humility-cortex", @@ -1091,8 +1369,9 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", - "humility-core", + "humility-log", "serde_json", "splitty", ] @@ -1103,8 +1382,9 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", - "humility-core", + "humility-log", "zip", ] @@ -1115,18 +1395,16 @@ dependencies = [ "anyhow", "clap", "goblin", + "humility-cli", "humility-cmd", "humility-cmd-auxflash", "humility-core", "humility-cortex", "ihex", - "log", "num-traits", "parse_int", "path-slash", - "regex", "ron 0.7.1", - "serde", "srec", "tempfile", ] @@ -1138,9 +1416,9 @@ dependencies = [ "anyhow", "clap", "ctrlc", + "humility-cli", "humility-cmd", "humility-cmd-openocd", - "humility-core", "tempfile", ] @@ -1151,8 +1429,9 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", - "humility-core", + "humility-hiffy", "parse_int", ] @@ -1163,10 +1442,11 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", "indicatif", - "log", "parse_int", "sha2", ] @@ -1178,47 +1458,62 @@ dependencies = [ "anyhow", "atty", "clap", - "colored", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-idol", "idol", "indexmap", "parse_int", ] [[package]] +name = "humility-cmd-host" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-log", + "zerocopy", +] + +[[package]] name = "humility-cmd-i2c" version = "0.1.0" dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", - "humility-core", + "humility-hiffy", + "humility-i2c", + "humility-log", "indicatif", - "log", "parse_int", ] [[package]] -name = "humility-cmd-isp" +name = "humility-cmd-ibc" version = "0.1.0" dependencies = [ "anyhow", - "byteorder", "clap", - "crc-any", + "colored", + "hif", + "humility-cli", "humility-cmd", "humility-core", - "humility-cortex", - "log", - "num-derive", - "num-traits", + "humility-hiffy", + "humility-idol", + "idol", "parse_int", - "serialport", - "strum", - "strum_macros", + "pmbus", "zerocopy", ] @@ -1229,10 +1524,10 @@ dependencies = [ "anyhow", "clap", "csv", + "humility-cli", "humility-cmd", "humility-core", "humility-cortex", - "log", "parse_int", ] @@ -1242,9 +1537,10 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", - "log", + "humility-jefe", "parse_int", ] @@ -1255,8 +1551,9 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", - "humility-core", + "humility-hiffy", "parse_int", ] @@ -1266,8 +1563,10 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", + "serde_json", ] [[package]] @@ -1276,6 +1575,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", ] @@ -1288,9 +1588,11 @@ dependencies = [ "clap", "colored", "hif", + "humility-cli", "humility-cmd", - "humility-cmd-hiffy", "humility-core", + "humility-hiffy", + "humility-idol", "idol", "log", "parse_int", @@ -1307,9 +1609,11 @@ dependencies = [ "clap", "colored", "hif", + "humility-cli", "humility-cmd", - "humility-cmd-hiffy", "humility-core", + "humility-hiffy", + "humility-idol", "parse_int", ] @@ -1320,8 +1624,8 @@ dependencies = [ "anyhow", "clap", "ctrlc", + "humility-cli", "humility-cmd", - "humility-core", "regex", "tempfile", ] @@ -1334,8 +1638,49 @@ dependencies = [ "clap", "colored", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-i2c", + "humility-idol", + "humility-pmbus", + "indexmap", + "parse_int", + "pmbus", +] + +[[package]] +name = "humility-cmd-power" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "hif", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-hiffy", + "humility-idol", + "idol", + "indexmap", + "log", + "parse_int", +] + +[[package]] +name = "humility-cmd-powershelf" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "hif", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-hiffy", + "humility-idol", + "idol", "indexmap", "log", "parse_int", @@ -1348,10 +1693,11 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-arch-arm", + "humility-cli", "humility-cmd", "humility-core", "humility-cortex", - "log", "num-traits", ] @@ -1362,8 +1708,11 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-idol", "indicatif", "log", "parse_int", @@ -1376,8 +1725,11 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", + "humility-log", + "parse-size", "parse_int", ] @@ -1387,19 +1739,43 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", ] [[package]] +name = "humility-cmd-rebootleby" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-arch-arm", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-cortex", + "ihex", + "log", + "parse_int", + "path-slash", + "probe-rs", + "tempfile", + "zip", +] + +[[package]] name = "humility-cmd-registers" version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-arch-arm", + "humility-cli", "humility-cmd", "humility-core", "humility-cortex", + "humility-stack", "num-traits", ] @@ -1411,15 +1787,16 @@ dependencies = [ "clap", "csv", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-i2c", "idt8a3xxxx", "itertools", - "log", "parse_int", "serde", "serde-xml-rs", - "serde_derive", ] [[package]] @@ -1428,27 +1805,37 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "colored", "hif", + "humility-cli", "humility-cmd", + "humility-cmd-spd", "humility-core", + "humility-hiffy", + "humility-i2c", + "humility-idol", + "humility-pmbus", "indicatif", - "log", "num-derive", "num-traits", "parse_int", "pmbus", + "zerocopy", ] [[package]] +name = "humility-cmd-repl" +version = "0.1.0" + +[[package]] name = "humility-cmd-reset" version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", - "log", - "num-traits", ] [[package]] @@ -1457,9 +1844,10 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", - "log", + "humility-doppel", ] [[package]] @@ -1470,16 +1858,37 @@ dependencies = [ "clap", "colored", "hif", + "hubpack", + "humility-cli", "humility-cmd", "humility-cmd-hiffy", - "humility-cmd-net", "humility-core", + "humility-doppel", + "humility-hiffy", + "humility-idol", "idol", "indexmap", - "libc", - "log", "parse_int", - "winapi", + "serde", + "zerocopy", +] + +[[package]] +name = "humility-cmd-sbrmi" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "colored", + "hif", + "humility-cli", + "humility-cmd", + "humility-core", + "humility-hiffy", + "humility-idol", + "parse_int", + "raw-cpuid", + "termimad 0.21.1", "zerocopy", ] @@ -1490,11 +1899,13 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", "humility-core", - "idol", + "humility-hiffy", + "humility-idol", "indexmap", - "log", + "itertools", "parse_int", ] @@ -1505,9 +1916,9 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", - "humility-core", - "log", + "humility-hiffy", "parse_int", ] @@ -1518,10 +1929,13 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-i2c", + "humility-log", "jep106", - "log", "parse_int", "spd", ] @@ -1533,9 +1947,10 @@ dependencies = [ "anyhow", "clap", "hif", + "humility-cli", "humility-cmd", "humility-core", - "log", + "humility-hiffy", "parse_int", ] @@ -1545,6 +1960,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", ] @@ -1555,6 +1971,8 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-arch-arm", + "humility-cli", "humility-cmd", "humility-core", "parse_int", @@ -1566,11 +1984,15 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "colored", + "humility-arch-arm", + "humility-cli", "humility-cmd", "humility-core", + "humility-doppel", + "humility-stack", "log", "num-traits", + "parse_int", ] [[package]] @@ -1579,20 +2001,45 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "colored", + "hif", + "humility-cli", "humility-cmd", + "humility-cmd-tasks", "humility-core", "humility-cortex", + "humility-hiffy", + "parse_int", ] [[package]] -name = "humility-cmd-trace" +name = "humility-cmd-tofino-eeprom" version = "0.1.0" dependencies = [ "anyhow", "clap", + "humility-cli", "humility-cmd", "humility-core", - "humility-cortex", + "humility-hiffy", + "humility-idol", + "indicatif", + "parse_int", +] + +[[package]] +name = "humility-cmd-update" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-cli", + "humility-cmd", + "humility-hiffy", + "humility-idol", + "humility-log", + "indicatif", + "parse_int", ] [[package]] @@ -1603,11 +2050,13 @@ dependencies = [ "clap", "colored", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-i2c", + "humility-idol", "idol", - "indexmap", - "log", "parse_int", ] @@ -1617,48 +2066,74 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "colored", "hif", + "humility-cli", "humility-cmd", "humility-core", + "humility-hiffy", + "humility-idol", "idol", "indexmap", "indicatif", - "log", "parse_int", + "ron 0.7.1", + "serde", "tlvc", "tlvc-text", "zerocopy", ] [[package]] +name = "humility-cmd-writeword" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "humility-cli", + "humility-cmd", + "humility-core", + "parse-size", + "parse_int", +] + +[[package]] name = "humility-core" version = "0.1.0" dependencies = [ "anyhow", "bitfield", "capstone", - "colored", + "clap", "fallible-iterator", "gimli 0.22.0", "goblin", + "hubpack", + "humility-arch-arm", + "humility-log", "humility_load_derive", + "humpty", "idol", "indexmap", "indicatif", + "libc", "log", "multimap", "num-derive", "num-traits", "parse_int", "probe-rs", + "rayon", "regex", + "ron 0.7.1", "rusb", "rustc-demangle", "scroll", "serde", - "ssmarshal", - "toml", + "serde_json", + "thiserror", + "toml 0.5.11", + "winapi", + "zerocopy", "zip", ] @@ -1678,12 +2153,158 @@ dependencies = [ ] [[package]] +name = "humility-doppel" +version = "0.1.0" +dependencies = [ + "anyhow", + "humility-core", + "zerocopy", +] + +[[package]] +name = "humility-dump-agent" +version = "0.1.0" +dependencies = [ + "anyhow", + "hif", + "hubpack", + "humility-arch-arm", + "humility-core", + "humility-hiffy", + "humility-idol", + "humpty", + "indexmap", + "indicatif", + "lzss", + "num-traits", + "rand", + "zerocopy", +] + +[[package]] +name = "humility-hiffy" +version = "0.1.0" +dependencies = [ + "anyhow", + "hif", + "humility-core", + "humility-doppel", + "humility-idol", + "idol", + "parse_int", + "postcard", + "zerocopy", +] + +[[package]] +name = "humility-i2c" +version = "0.1.0" +dependencies = [ + "anyhow", + "humility-core", + "parse_int", +] + +[[package]] +name = "humility-idol" +version = "0.1.0" +dependencies = [ + "anyhow", + "hubpack", + "humility-core", + "idol", + "indexmap", + "parse_int", + "serde", +] + +[[package]] +name = "humility-jefe" +version = "0.1.0" +dependencies = [ + "anyhow", + "humility-core", +] + +[[package]] +name = "humility-log" +version = "0.1.0" +dependencies = [ + "colored", + "log", +] + +[[package]] +name = "humility-net-core" +version = "0.1.0" +dependencies = [ + "anyhow", + "humility-arch-arm", + "humility-core", + "humility-dump-agent", + "humpty", +] + +[[package]] +name = "humility-pmbus" +version = "0.1.0" +dependencies = [ + "anyhow", + "humility-core", +] + +[[package]] +name = "humility-stack" +version = "0.1.0" +dependencies = [ + "humility-arch-arm", + "humility-core", +] + +[[package]] name = "humility_load_derive" version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "humpty" +version = "0.1.3" +source = "git+https://github.com/oxidecomputer/humpty#f6871f6d8844c3d2ee09c467f50b9f186652cb41" +dependencies = [ + "hubpack", + "lzss", + "serde", + "serde-big-array", + "static_assertions", + "zerocopy", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", ] [[package]] @@ -1694,14 +2315,14 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idol" -version = "0.2.0" -source = "git+https://github.com/oxidecomputer/idolatry.git#994077e3ecff3ec6df15c082fc4f810cf27c97f2" +version = "0.3.0" +source = "git+https://github.com/oxidecomputer/idolatry.git#f2396893e786d4bfa75212312908198b8d6a5310" dependencies = [ "indexmap", "quote", - "ron 0.7.1", + "ron 0.8.0", "serde", - "toml", + "toml 0.7.3", ] [[package]] @@ -1722,9 +2343,9 @@ checksum = "365a784774bb381e8c19edb91190a90d7f2625e057b55de2bc0f6b57bc779ff2" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1753,25 +2374,42 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.10.3" +name = "io-lifetimes" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ - "either", + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", ] [[package]] -name = "itoa" -version = "0.4.8" +name = "is-terminal" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jaylink" @@ -1779,7 +2417,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f58b72b6aa9d25083b8c19d292fe015a936185fa200d15e225e1524a18222e9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "log", "rusb", @@ -1787,50 +2425,48 @@ dependencies = [ [[package]] name = "jep106" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e80f965a2a659a7a4d9cdb9821a869d6e33c10f3e094e8f7d01648063c425953" +checksum = "ff93b33ae176e47fe588708ff6a4cccae22bd369b81c2d26d2179a8d41c0a0b0" dependencies = [ "serde", ] [[package]] -name = "lazy_static" -version = "1.4.0" +name = "jobserver" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] [[package]] -name = "libc" -version = "0.2.126" +name = "js-sys" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] [[package]] -name = "libm" -version = "0.2.2" +name = "lazy_static" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "libudev" -version = "0.3.0" +name = "libc" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0" -dependencies = [ - "libc", - "libudev-sys", -] +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] -name = "libudev-sys" -version = "0.1.4" +name = "libm" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libusb1-sys" @@ -1844,16 +2480,31 @@ dependencies = [ ] [[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.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -1869,21 +2520,12 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.1.2" +name = "lzss" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd13ee2dd61cc82833ba05ade5a30bb3d63f7ced605ef827063c63078302de9" +checksum = "39e2b9a6124e5200c13bb5c5d1124bf93b451bff69b651912810039e36ca97eb" dependencies = [ - "libc", -] - -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", + "void", ] [[package]] @@ -1894,27 +2536,36 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "minimad" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8957f240ecb82a4e699bcf4db189fe8a7f5aa68b9e6d5abf829c62a9ee4630ed" +checksum = "fed1b13e2000bd8e238d97a97de6fc30224f89a08b0aa5aaa09ed1bd68ba2fa1" +dependencies = [ + "once_cell", +] + +[[package]] +name = "minimad" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef" dependencies = [ "once_cell", ] [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -1933,6 +2584,18 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", +] + +[[package]] name = "miow" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1951,29 +2614,15 @@ dependencies = [ ] [[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.0.0", -] - -[[package]] -name = "nb" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" - -[[package]] name = "nix" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", + "static_assertions", ] [[package]] @@ -1992,6 +2641,16 @@ dependencies = [ ] [[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-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1999,7 +2658,17 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "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]] @@ -2013,11 +2682,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] @@ -2038,34 +2707,46 @@ dependencies = [ [[package]] name = "object" -version = "0.28.4" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.12.0" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "os_pipe" -version = "1.0.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c92f2b54f081d635c77e7120862d48db8e91f7f21cef23ab1b4fe9971c59f55" +checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" dependencies = [ "libc", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "os_str_bytes" -version = "6.1.0" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" @@ -2075,24 +2756,53 @@ 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.7", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "parse-size" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] name = "parse_int" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2102,6 +2812,17 @@ dependencies = [ ] [[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] name = "paste" version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2122,24 +2843,37 @@ dependencies = [ [[package]] name = "path-slash" -version = "0.1.4" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" + +[[package]] +name = "pbkdf2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cacbb3c4ff353b534a67fb8d7524d00229da4cb1dc8c79f4db96e375ab5b619" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] [[package]] name = "pest" -version = "2.1.3" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "pkg-version" @@ -2169,14 +2903,14 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "pmbus" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/pmbus#5ede5b7d35ece31a5e05fef9de1840f29a1435ba" +source = "git+https://github.com/oxidecomputer/pmbus#5af447d53a4bc863b7e0700cee23cbf89da39cd5" dependencies = [ "anyhow", "convert_case", "libm", "num-derive", "num-traits", - "ron 0.6.6", + "ron 0.8.0", "serde", "serde_with", ] @@ -2199,9 +2933,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c68cb38ed13fd7bc9dd5db8f165b7c8d9c1a315104083a2b10f11354c2af97f" [[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] name = "probe-rs" version = "0.12.0" -source = "git+https://github.com/oxidecomputer/probe-rs.git?branch=oxide-v0.12.0#6ff8fae61fb1e74c87d2ba160071b1989ca64bba" +source = "git+https://github.com/oxidecomputer/probe-rs.git?branch=oxide-v0.12.0#078eafb444c4e03fa7d41c7273264d00564210ce" dependencies = [ "anyhow", "base64", @@ -2209,7 +2949,7 @@ dependencies = [ "bitfield", "bitvec", "enum-primitive-derive", - "gimli 0.26.1", + "gimli 0.26.2", "hidapi", "ihex", "jaylink", @@ -2232,7 +2972,7 @@ dependencies = [ [[package]] name = "probe-rs-target" version = "0.12.0" -source = "git+https://github.com/oxidecomputer/probe-rs.git?branch=oxide-v0.12.0#6ff8fae61fb1e74c87d2ba160071b1989ca64bba" +source = "git+https://github.com/oxidecomputer/probe-rs.git?branch=oxide-v0.12.0#078eafb444c4e03fa7d41c7273264d00564210ce" dependencies = [ "base64", "jep106", @@ -2248,7 +2988,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -2265,51 +3005,92 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +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 = "raw-cpuid" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1782673f85471a9985c2210df529a11853c89567511fab7ebf14e10853cba849" +dependencies = [ + "bitflags 2.1.0", + "serde", + "serde_derive", + "serde_json", + "termimad 0.23.0", +] [[package]] name = "rayon" -version = "1.5.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -2319,65 +3100,58 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "regex" -version = "1.5.6" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", + "bitflags 1.3.2", ] [[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "reedline" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "5559b5ab4817b0da0c6fc6814edfae537209e01d955a2f3e7595606e3d039691" dependencies = [ - "winapi", + "chrono", + "crossterm 0.24.0", + "fd-lock", + "itertools", + "nu-ansi-term", + "serde", + "strip-ansi-escapes", + "strum", + "strum_macros", + "thiserror", + "unicode-segmentation", + "unicode-width", ] [[package]] -name = "riscv" -version = "0.7.0" +name = "regex" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "bare-metal 1.0.0", - "bit_field", - "riscv-target", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "riscv-target" -version = "0.1.2" +name = "regex-syntax" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222" -dependencies = [ - "lazy_static", - "regex", -] +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "ron" @@ -2386,7 +3160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -2397,7 +3171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -2408,7 +3182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -2424,33 +3198,44 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc_version" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.9.0", + "semver 1.0.17", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustix" +version = "0.37.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" dependencies = [ - "semver 1.0.10", + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] name = "ryu" -version = "1.0.10" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -2468,6 +3253,12 @@ 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 = "scroll" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2484,16 +3275,7 @@ checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", + "syn 1.0.109", ] [[package]] @@ -2502,21 +3284,15 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser", "serde", ] [[package]] name = "semver" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c" - -[[package]] -name = "semver-parser" -version = "0.7.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -2529,14 +3305,23 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] +name = "serde-big-array" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +dependencies = [ + "serde", +] + +[[package]] name = "serde-xml-rs" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2550,27 +3335,36 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ - "itoa 1.0.2", + "itoa", "ryu", "serde", ] [[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + +[[package]] name = "serde_with" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2589,14 +3383,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "serde_yaml" -version = "0.8.24" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", @@ -2605,26 +3399,21 @@ dependencies = [ ] [[package]] -name = "serialport" -version = "4.2.1-alpha.0" -source = "git+https://github.com/jgallagher/serialport-rs?branch=illumos-support#36c9f0e0292eac32215ab77c5847bf7afb13f000" +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "CoreFoundation-sys", - "IOKit-sys", - "bitflags", "cfg-if", - "libudev", - "mach2", - "nix", - "regex", - "winapi", + "cpufeatures", + "digest", ] [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", @@ -2639,9 +3428,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" dependencies = [ "libc", "signal-hook-registry", @@ -2654,41 +3443,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio", + "mio 0.7.14", + "mio 0.8.6", "signal-hook", ] [[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 = "similar" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snapbox" -version = "0.2.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767a1d5da232b6959cd1bd5c9e8db8a7cce09c3038e89deedb49a549a2aefd93" +checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835" dependencies = [ - "concolor", + "anstream", + "anstyle", "content_inspector", "dunce", "filetime", + "libc", "normalize-line-endings", "os_pipe", "similar", @@ -2696,14 +3488,17 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "yansi", + "windows-sys 0.45.0", ] [[package]] name = "snapbox-macros" -version = "0.2.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01dea7e04cbb27ef4c86e9922184608185f7cd95c1763bc30d727cda4a5e930" +checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31" +dependencies = [ + "anstream", +] [[package]] name = "spd" @@ -2716,9 +3511,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -2736,16 +3531,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17c3a0538ec242e3cd333cdcdc8b720faa2fa0a9d7f444cf1ff63e7d3303adfb" [[package]] -name = "ssmarshal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e6ad23b128192ed337dfa4f1b8099ced0c2bf30d61e551b65fda5916dbb850" -dependencies = [ - "encode_unicode", - "serde", -] - -[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2758,6 +3543,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] +name = "strip-ansi-escapes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" +dependencies = [ + "vte", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2765,33 +3559,40 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" [[package]] name = "strum_macros" -version = "0.22.0" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.3.3", + "heck", "proc-macro2", "quote", - "syn", + "rustversion", + "syn 1.0.109", ] [[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] name = "svg" -version = "0.10.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72d8b19ab05827afefcca66bf47040c1e66a0901eb814784c77d4ec118bd309" +checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -2799,15 +3600,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2818,74 +3618,87 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termimad" -version = "0.14.3" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ea6e542eaec310898d8ba84e5dbda91e95b27e5e023722f0140ca57d72136e" +checksum = "8743d628f9b0eb33087c1e1c4915d91efca23ae69f7c81981489128a0e17d300" dependencies = [ + "coolor", "crossbeam", - "crossterm", - "minimad", + "crossterm 0.23.2", + "minimad 0.10.0", "thiserror", "unicode-width", ] [[package]] -name = "terminal_size" -version = "0.1.17" +name = "termimad" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "749b18b17745261a883ab334d931adffc8c5e07e71c73a861e77124557e7b41f" +dependencies = [ + "coolor", + "crossbeam", + "crossterm 0.23.2", + "minimad 0.12.0", + "thiserror", + "unicode-width", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" dependencies = [ "libc", - "winapi", ] [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -2896,19 +3709,35 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] -name = "tlvc" +name = "time" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +dependencies = [ + "serde", + "time-core", +] + +[[package]] +name = "time-core" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/tlvc#4287f4b7cecb42617342f913dbd8ced40eb79646" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "tlvc" +version = "0.2.0" +source = "git+https://github.com/oxidecomputer/tlvc#533f0bf26b0a8f32d287af4f2ea09320bc05c2cd" dependencies = [ "byteorder", "crc", @@ -2918,7 +3747,7 @@ dependencies = [ [[package]] name = "tlvc-text" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/tlvc#2643765eb7775d1f5e8ec56910f1ab15e9c75170" +source = "git+https://github.com/oxidecomputer/tlvc#533f0bf26b0a8f32d287af4f2ea09320bc05c2cd" dependencies = [ "ron 0.8.0", "serde", @@ -2928,9 +3757,29 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] @@ -2949,9 +3798,9 @@ dependencies = [ [[package]] name = "trycmd" -version = "0.13.4" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4185126cc904642173a54c185083f410c86d1202ada6761aacf7c40829f13" +checksum = "a5377b33cbe8bb69d97da63e2a2266065a642a47cc9bb3d783c28279d0029fea" dependencies = [ "glob", "humantime", @@ -2969,54 +3818,48 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cassowary", - "crossterm", + "crossterm 0.20.0", "unicode-segmentation", "unicode-width", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] -name = "vcell" -version = "0.1.3" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "vcpkg" @@ -3037,15 +3880,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] -name = "volatile-register" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6" -dependencies = [ - "vcell", -] - -[[package]] name = "vsc7448-info" version = "0.1.0" source = "git+https://github.com/oxidecomputer/vsc7448.git#a9e71588498885e9a77282186f2bb576812f1af2" @@ -3067,6 +3901,27 @@ dependencies = [ ] [[package]] +name = "vte" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +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" @@ -3077,12 +3932,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -3093,6 +3947,66 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3124,10 +4038,166 @@ 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 = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -3157,12 +4227,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.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3174,25 +4238,61 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0fbc82b82efe24da867ee52e015e58178684bd9dd64c34e66bdf21da2582a9f" +checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" dependencies = [ "proc-macro2", - "syn", - "synstructure", + "quote", + "syn 1.0.109", ] [[package]] name = "zip" -version = "0.5.13" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" dependencies = [ + "aes", "byteorder", "bzip2", + "constant_time_eq", "crc32fast", + "crossbeam-utils", "flate2", - "thiserror", - "time", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.20", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +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/development/tools/rust/humility/default.nix b/pkgs/development/tools/rust/humility/default.nix index 9bb9cdaacbd0b..399d9dcf41b3d 100644 --- a/pkgs/development/tools/rust/humility/default.nix +++ b/pkgs/development/tools/rust/humility/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "humility"; - version = "unstable-2022-09-15"; + version = "unstable-2023-11-08"; nativeBuildInputs = [ pkg-config cargo-readme ]; buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [ @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "oxidecomputer"; repo = pname; - rev = "d336c21c7b6da7f8203a9331c7657581de2bc6ad"; - sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY="; + rev = "67d932edde8b32c11e5d6356a54e97d65f7b9b2b"; + sha256 = "sha256-3EVNlOAVfx/wUFn83VBKs1N5PanS4jVADUPlhCIok5M="; }; cargoLock = { @@ -31,15 +31,14 @@ rustPlatform.buildRustPackage rec { "capstone-0.10.0" = "sha256-x0p005W6u3QsTKRupj9HEg+dZB3xCXlKb9VCKv+LJ0U="; "hidapi-1.4.1" = "sha256-2SBQu94ArGGwPU3wJYV0vwwVOXMCCq+jbeBHfKuE+pA="; "hif-0.3.1" = "sha256-o3r1akaSARfqIzuP86SJc6/s0b2PIkaZENjYO3DPAUo="; - "idol-0.2.0" = "sha256-T4wxeSTH2tFBR8L5wL5a0gLDfcRLpALyGBE0dYNQwLI="; + "humpty-0.1.3" = "sha256-efeb+RaAjQs9XU3KkfVo8mVK2dGyv+2xFKSVKS0vyTc="; + "idol-0.3.0" = "sha256-s6ZM/EyBE1eOySPah5GtT0/l7RIQKkeUPybMmqUpmt8="; "idt8a3xxxx-0.1.0" = "sha256-S36fS9hYTIn57Tt9msRiM7OFfujJEf8ED+9R9p0zgK4="; "libusb1-sys-0.5.0" = "sha256-7Bb1lpZvCb+OrKGYiD6NV+lMJuxFbukkRXsufaro5OQ="; - "pmbus-0.1.0" = "sha256-KBc7gFwrN1jv1HXygda7qE3ZYNWAO10Wl3X6alc2JOE="; - "probe-rs-0.12.0" = "sha256-L2kQNAdSvv5x1goELuy3pZZzmoUDc4tMX3OJ7A5rAD0="; - "serialport-4.2.1-alpha.0" = "sha256-a2A2rKll2RTSyvohqRUSQ4Sw6puJdlTZoof5rePxPVE="; + "pmbus-0.1.0" = "sha256-20peEHZl6aXcLhw/OWb4RHAXWRNqoMcDXXglwNP+Gpc="; + "probe-rs-0.12.0" = "sha256-/L+85K6uxzUmz/TlLLFbMlyekoXC/ClO33EQ/yYjQKU="; "spd-0.1.0" = "sha256-X6XUx+huQp77XF5EZDYYqRqaHsdDSbDMK8qcuSGob3E="; - "tlvc-0.1.0" = "sha256-SKaVDKFUveZ/iSbKUrVbFIbni7HxCZG4P7fZxkBxY1k="; - "tlvc-text-0.1.0" = "sha256-uHPPyc3Ns5L1/EFNCzH8eBEoqLlJoqguZxwNCNxfM6Q="; + "tlvc-0.2.0" = "sha256-HiqDRqmKOTxz6UQSXNMOZdWdc5W+cFGuKBkNrqFvIIE="; "vsc7448-info-0.1.0" = "sha256-otNLdfGIzuyu03wEb7tzhZVVMdS0of2sU/AKSNSsoho="; }; }; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 4b66ecfa4674c..37cec14ee4c4c 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hxtT5cL1PTXkTXGB0nVPhMI8Vlqrk4q2MHW0KGosFwc="; + hash = "sha256-MVmu9m+9XhWuPBEEoaYmsSbMFziSZaM5Gg5kOr1DT54="; }; - cargoHash = "sha256-IZWh/Bp9TdB+flc1PXVkwrIdOr83TFk6X6O5M0FVaO4="; + cargoHash = "sha256-hrdrGFtL2vGczINnvDa4rclkXsNWnEqtTt3NVaRay8w="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 87c4a0f3ee702..dbaeb264b3585 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-aKU+1eoLm/h5Rj/vAZOyAnyl5/TpStL5g8PPdYCJ8o0="; + sha256 = "sha256-0imHwZNyhJXFai1J5tHqnQ6Ta10nETQ5TILGH0bHc8Y="; }; - cargoSha256 = "sha256-y2BoV59oJPMBf9rUgMhHu87teurwPSNowRbuPfXubGA="; + cargoHash = "sha256-Lm3agCnxDxcj7op17uiokK8Y790oMxwHJStvP/9DsI0="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index a80cb9ac1b6e4..3200790995128 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-Ng+JMhGnbZEum+nmuA/omgDhg5U1UpcOZ9+avUZeTK8="; + hash = "sha256-ddb1+h4mcQ1Uu4UvCL4IL4sjEbI70HZ4B/MMsUHbhSk="; }; vendorHash = null; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 274aff3f4e15f..8827d6b709e7b 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "sdk-${version}"; - hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index f5fcdd7623636..92c1c0037f2b3 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-Y4H8tPUHaRMMZaZt1VjkZT5JJgEIY/dhocNccvoHf1Y="; + hash = "sha256-NwSQLpqgOuVBH+EYjSch3h0BMJZPK3/FcKO4iUnNt+E="; }; proxyVendor = true; - vendorHash = "sha256-Qn10+uTAo68OTQp592H/T7D99LNIvG76aG/ye+xx2sk="; + vendorHash = "sha256-2MwibiWT9rrbNVva61wR1OPrG+fZkxTDznC2pdm3CKE="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 1afb444c323d4..23fac8ddac714 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f4U3vzgvFF1N6X8f8zwtqSaQfiwNX7CecpcJ0GKx2P0="; + sha256 = "sha256-Bw9+BUvZC4sRLFyU5K6FHsWVZ3PTlMAonRmTSwV5AwU="; }; - cargoSha256 = "sha256-az5j0qvP3mZXRJZOmslDb40MSMS+iAvXYVNGw8vt7gg="; + cargoSha256 = "sha256-bainEM4eRMNyecSBi5k1ifjDULWdXed6GP6i10IVA+w="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index ccdd0ff05cba4..77217a8acda50 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.107.0"; + version = "1.112.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-uR7Iu1PdnzWp9+IJ5szUR6r+qKckyD6LFgsY5YQxT5c="; + hash = "sha256-2Cw+TQMKWwjWUgsif+Ot9OZ1kIlancoT4TfJ343mnLY="; }; - vendorHash = "sha256-gWGoRKlSo0C1gFU/kC4DcgOl0Mp5LCTpSZ1Yav0ZL9c="; + vendorHash = "sha256-vseD7Oov7Gi1lEnF1hEAChoPByFa8T82njWBINC/Ea4="; ldflags = [ "-s" diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 1c795fe35acff..f150ebc0d4509 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.7.2"; + version = "5.7.3"; vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-2/2Hx+9MnnY4GMm/Zt6ssCTdtYgcP1gPRXe1yQMgXTE="; + hash = "sha256-mxyGdyR1yZY+YOyf9ngk6P2oBmUL+IbwLWaCvZziSIM="; }; ldflags = [ diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index c05fbdc0c5f8e..59564cec7f64f 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-tlsAztU6Rk7xq1T3NNDlB0Gt3iRpvAk72VO+gGuYEps="; - aarch64-linux = "sha256-bYe/QJ7UuMq5tDhhof/83gfUN0DbenQu/wbrvLylKeM="; - armv7l-linux = "sha256-d0kK0clkSUW4ARTNUVWpmJidXwxLucjC4Vwu924YB1E="; - x86_64-darwin = "sha256-4cvrHklkQ0fo7fVi1aRKOMhX4ky7dENwGh2jqTneQLo="; - x86_64-linux = "sha256-FX0N1WmV9pixd3ZoBXnSdBSSDBqj//S8e5nEaQuEdxc="; + aarch64-darwin = "sha256-VAJypHejh3ZW2x3fPNvuFw3VkmBbsSTnmBHuqU3hXVY="; + aarch64-linux = "sha256-Yxw6DIP8j3JANgvN870socG0aNX76d3c0z12ePbuFSs="; + armv7l-linux = "sha256-yS8LDmUit5pM4WrMjhqUJD4e0fWKWf8cr4w1PACj+8g="; + x86_64-darwin = "sha256-cTIp7HesR9Ae6yFpUy0H1hrqtHSSReIKZmKE06XCsWU="; + x86_64-linux = "sha256-Z3Co095akfV/11UWvpc0WAp3gdUrpjVskUw1v01Eifs="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index dac5acb6e4fe5..408272796d70b 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec { description = "one CLI to format the code tree"; homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; - maintainers = lib.teams.numtide.members; + maintainers = [ lib.maintainers.zimbatm ]; }; } diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 2a72686cf96a1..d5ad729050ce0 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.87.1"; + version = "0.87.4"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-wPL4fYFkk1rtHIYIVOGk5GG6S/pmOpg6WcbnpleDkUA="; + hash = "sha256-e5HuDWMmikTlWC2ezZ5zxxKYFlgz9jrpHtNfIwSiiok="; }; - vendorHash = "sha256-Jf2ZLzODPnvNrED8ST0u7rHGWivPwcyptkJbu8mdnoA="; + vendorHash = "sha256-EcWhpx93n+FzkXDOHwAxhn13qR4n9jLFeaKoe49x1x4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 1f3f0765db2b1..c8c5105531388 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.5.2"; + version = "3.6.1"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-MiehcBs+Egfen7MzkzzWxLuTrWrHkqIj1y47sPI3Y74="; + sha256 = "sha256-rpH87aFvbYanthwPw/SlluOH/rtj6owcVetBD4+TJeU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 754b2d4a5e0a0..09a11cef84f4e 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,18 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.261"; - - # If we were to use "dev" here instead of headers, the setupHook would be - # placed in that output instead of "out". - outputs = ["out" "headers"]; - outputInclude = "headers"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "v${version}"; - hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 4130c52ce1606..43b8206016144 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.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-RLJtDzG3dKaJkppJO/cAggvgB9egCxCWd1mbQ91KPuY="; + hash = "sha256-3Zd507yAymmQRgybm96VD413kId0/kMxIHbmUh8j6Kk="; }; - vendorHash = "sha256-lVZcmqEC4InZr2zcgI4WVg6Pl3Cv/crTWuLSnqY3Vyk="; + vendorHash = "sha256-OVoOCExAU6cDyWhSpk4hkhBZpWehH+4/vU/X81w9XgA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index c8e05c1fc10bb..e8f888680bad8 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -11,20 +11,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxformbuilder"; - version = "unstable-2023-04-21"; + version = "4.0.0"; src = fetchFromGitHub { owner = "wxFormBuilder"; repo = "wxFormBuilder"; - rev = "f026a8e1a7f68e794638f637e53845f8f04869ef"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-48J8osSBb5x9b8MYWZ5QGF6rWgwtcJ0PLLAYViDr50M="; + leaveDotGit = true; + postFetch = '' + substituteInPlace $out/.git-properties \ + --replace "\$Format:%h\$" "$(git -C $out rev-parse --short HEAD)" \ + --replace "\$Format:%(describe)\$" "$(git -C $out rev-parse --short HEAD)" + rm -rf $out/.git + ''; + hash = "sha256-Lqta+u9WVwUREsR7aH+2DJn0oM5QwlwRSBImuwNkmS4="; }; postPatch = '' - substituteInPlace .git-properties \ - --replace "\$Format:%h\$" "${builtins.substring 0 7 finalAttrs.src.rev}" \ - --replace "\$Format:%(describe)\$" "${builtins.substring 0 7 finalAttrs.src.rev}" + substituteInPlace third_party/tinyxml2/cmake/tinyxml2.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ sed -i '/fixup_bundle/d' cmake/macros.cmake ''; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index f0f8a3454550f..f9c619d8963dc 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.11"; + version = "1.0.13"; 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-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; + hash = "sha256-HAcPrC/xFu9UHdpyF13OW3cXQEmpcyvtswaGAdHtnUE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; + hash = "sha256-dadj5YKpWOxWzn7z+ve3naHmfVsX4fAtNARruXyY/pM="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; + hash = "sha256-QbiEZ1YRozE/af41c7/jI+DXAGAhjplTsMaZoCGKYTo="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; + hash = "sha256-rOWXBvYJfhi+3fSv6ZDU5tZ51Nfy4nBIRaFOimRHHTs="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 603c9bf5d9e25..27303fb86020a 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.38.0"; + version = "1.38.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4="; + hash = "sha256-DLVeI1pnHpUya8muVUP6VNXiLmlaedOOPPef3tHNOng="; }; - cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA="; + cargoHash = "sha256-qTvPpUBinPm3eQ5PLcqdCcZEG5Q6kGyt35mL914K9jk="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec { (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ]) ); + # work around "error: unknown warning group '-Wunused-but-set-parameter'" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; + buildAndTestSubdir = "cli"; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 20fd20a5b9884..e4d2a2fec7076 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index b38e0a28f1ab5..39831f6ea2797 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -40,13 +40,12 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.\${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 6e9fc0a669fd6..1e0a306c13b6c 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 4ced81546ca9f..862b7279f7e6d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.117"; + version = "0.1.127"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-cB1t7TKAqHuzbvrXkOMJPXtNXTqNB/TBDS3OHYX96ko="; + hash = "sha256-ho2dbuejQWU7K4j107fV4Lf5r3grsePifaE+HbRdCys="; }; - vendorHash = "sha256-+mCOSgRmvfAXHwtLup3vYhLY0zTtXIJeOtYD69B4/7o="; + vendorHash = "sha256-qo1P2PSiWco3oKqKOCmCuM6QOz6a9ov2d2MpggBU4N8="; subPackages = [ "." ]; diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index df6ed0a5233a0..17d25378d8cdf 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, bundlerApp, bundlerUpdateScript }: +{ ruby_3_2, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; - ruby = pkgs.ruby_3_0; + ruby = ruby_3_2; passthru.updateScript = bundlerUpdateScript "mailcatcher"; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8b615a55dd3a1..b1bd0ae912d95 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -34,6 +34,7 @@ let */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" + "--openssl-use-def-ca-store" ]; copyLibHeaders = @@ -52,6 +53,12 @@ let strictDeps = true; + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; + }; + CC_host = "cc"; CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix deleted file mode 100644 index e7dec1c12f665..0000000000000 --- a/pkgs/development/web/nodejs/v14.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "14.21.3"; - sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix deleted file mode 100644 index d4bb94c07d3e5..0000000000000 --- a/pkgs/development/web/nodejs/v16.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - python = python3; - }; - - npmPatches = callPackage ./npm-patches.nix { }; -in - buildNodejs { - inherit enableNpm; - # If you do upgrade here, please update in pkgs/top-level/release.nix - # the permitted insecure version to ensure it gets cached for our users - # and backport this to stable release (23.05). - version = "16.20.2"; - sha256 = "sha256-V28aA8RV5JGo0TK1h+trO4RlH8iXS7NjhDPdRNIsj0k="; - patches = [ - ./disable-darwin-v8-system-instrumentation.patch - ./bypass-darwin-xcrun-node16.patch - ./node-npm-build-npm-package-logic-node16.patch - ] ++ npmPatches; - } diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 3c8abbb291880..b36e8e3d0f3a2 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,8 +1,20 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 904bff2fef896..af3af652fb710 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.1.0"; - sha256 = "sha256-kaxy5ERMXlq0tEgDCmH/qVrNNdNKnTHS0iDuK+0BuSU="; + version = "21.2.0"; + sha256 = "sha256-1Xyc6jlHZPodmvUeUsdEn3EZPp1ExKgfvt7GU+yCdwc="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix index b795f708f1896..d9c0daef7834c 100644 --- a/pkgs/development/web/playwright-test/default.nix +++ b/pkgs/development/web/playwright-test/default.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/games/animatch/default.nix b/pkgs/games/animatch/default.nix new file mode 100644 index 0000000000000..b6bf5473807c8 --- /dev/null +++ b/pkgs/games/animatch/default.nix @@ -0,0 +1,41 @@ +{ lib +, allegro5 +, cmake +, fetchFromGitLab +, libGL +, stdenv +, xorg +}: +stdenv.mkDerivation rec { + pname = "animatch"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "HolyPangolin"; + repo = "animatch"; + fetchSubmodules = true; + rev = "v${version}"; + hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + allegro5 + libGL + xorg.libX11 + ]; + + cmakeFlags = [ + "-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games + ]; + + meta = { + homepage = "https://gitlab.com/HolyPangolin/animatch/"; + description = "A cute match three game for the Librem 5 smartphone"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} + diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 41579b5271054..fb54efee1dd5a 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ] ++ optionals stdenv.isDarwin [ "NATIVE=osx" "CLANG=1" - "OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}" + "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}" ]; postInstall = optionalString tiles diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index b8e333cd79c24..6a6fc63e8c409 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -30,23 +30,24 @@ , Cocoa , OpenGL , Security +, buildClient ? true }: stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.3"; + version = "17.4"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; + hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; + hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c="; }; nativeBuildInputs = [ @@ -64,16 +65,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl + libnotify + pcre + python3 + sqlite + ] ++ lib.optionals buildClient ([ freetype libGLU - libnotify libogg - libX11 opusfile - pcre - python3 SDL2 - sqlite wavpack ffmpeg x264 @@ -81,7 +82,14 @@ stdenv.mkDerivation rec { vulkan-headers glslang spirv-tools - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; + ] ++ lib.optionals stdenv.isLinux [ + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + OpenGL + Security + ]); postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ @@ -90,11 +98,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DAUTOUPDATE=OFF" + "-DCLIENT=${if buildClient then "ON" else "OFF"}" ]; doCheck = true; checkTarget = "run_tests"; + postInstall = lib.optionalString (!buildClient) '' + # DDNet's CMakeLists.txt automatically installs .desktop + # shortcuts and icons for the client, even if the client + # is not supposed to be built + rm -rf $out/share/applications + rm -rf $out/share/icons + rm -rf $out/share/metainfo + ''; + meta = with lib; { description = "A Teeworlds modification with a unique cooperative gameplay."; longDescription = '' diff --git a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix index c17adb72171f4..7ec57b7151380 100644 --- a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix +++ b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , directx-shader-compiler , libGLU @@ -26,6 +27,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = fetchpatch { + name = "replace-HLSL-ternary-operators.patch"; + url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/feffa4a4dd9a2a5f3c608f720cde41bea37797d3.patch"; + hash = "sha256-aR1eoWZL3+ps7P7yFXFvGsMFxpUSBDiyBsja/ISin4I="; + }; + postPatch = '' substituteInPlace neo/extern/nvrhi/tools/shaderCompiler/CMakeLists.txt \ --replace "AppleClang" "Clang" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index dad59953533bc..eaf391bbe6b18 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -2,7 +2,7 @@ let platformSlug = - if stdenv.targetPlatform.is32bit then + if stdenv.hostPlatform.is32bit then "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index c9f16918b4900..e2e9ca1338c20 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; license = with licenses; [ gpl2 free ]; # source + bundles libs + art platforms = platforms.unix; - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; homepage = "https://www.nongnu.org/enigma/"; }; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 9c51b457fb4d4..798178e58c163 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-l2NIoZrevI1PWK4mRjGP6jbx0LvXjz9oFsiTJ6m43JQ="; + hash = "sha256-bh27piX1/HIlbOmTpqQCV7NaHxOMtwMIGrjlXrFvHWE="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index a075a789f9d20..897d8f3941c46 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -3,7 +3,7 @@ , fetchzip , fetchFromGitHub , butler -, electron_11 +, electron , steam-run , makeWrapper , copyDesktopItems @@ -11,12 +11,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "itch"; - version = "25.6.2"; + version = "26.1.2"; + # TODO: Using kitch instead of itch, revert when possible src = fetchzip { - url = "https://broth.itch.ovh/${pname}/linux-amd64/${version}/itch.zip"; + url = "https://broth.itch.ovh/k${pname}/linux-amd64/${version}/archive/default#.zip"; stripRoot = false; - sha256 = "sha256-F/vaYBHCygseiKNMJ+jBy31YDIFqYToAETGUl/pkHII="; + sha256 = "sha256-thXe+glpltSiKNGIRgvOZQZPJWfDHWo3dLdziyp2BM4="; }; itch-setup = fetchzip { @@ -29,8 +30,8 @@ stdenvNoCC.mkDerivation rec { fetchFromGitHub { owner = "itchio"; repo = pname; - rev = "v25.6.1-canary"; # Use ${version} if possible - hash = "sha256-iBp7K7AW97SOlRa8N8TW2LcVtmUi9JU00fYUuPwKORc="; + rev = "v${version}-canary"; + sha256 = "sha256-veZiKs9qHge+gCEpJ119bAT56ssXJAH3HBcYkEHqBFg="; sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; @@ -53,6 +54,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall + # TODO: Remove when the next stable Itch is stabilized + 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/" @@ -72,7 +77,7 @@ stdenvNoCC.mkDerivation rec { postFixup = '' makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ - --add-flags ${electron_11}/bin/electron \ + --add-flags ${electron}/bin/electron \ --add-flags $out/share/${pname}/resources/app \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}/bin/:${itch-setup} diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index 12eb6b24a806c..87e089eb9571d 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -1,5 +1,8 @@ -{lib, stdenv, fetchurl, ncurses}: - +{ lib +, stdenv +, fetchurl +, ncurses +}: stdenv.mkDerivation rec { pname = "moon-buggy"; version = "1.0.51"; @@ -16,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "A simple character graphics game where you drive some kind of car across the moon's surface"; license = lib.licenses.gpl2; - maintainers = [lib.maintainers.rybern]; - platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rybern ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 6ca70596458d4..10bf3f9268e6d 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { patches = [ # support for love11 + # https://github.com/Stabyourself/orthorobot/pull/3 (fetchpatch { - url = "https://github.com/Stabyourself/orthorobot/pull/3.patch"; + name = "Stabyourself-orthorobot-pull-3.patch"; + url = "https://github.com/Stabyourself/orthorobot/compare/48f07423950b29a94b04aefe268f2f951f55b62e...05856ba7dbf1bb86d0f16a5f511d8ee9f2176015.patch"; sha256 = "sha256-WHHP6QM7R5eEkVF+J2pGNnds/OKRIRXyon85wjd3GXI="; }) ]; diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index eccc2146d28b8..95dadfee693fa 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.1026.0"; + version = "2023.1114.1"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; + sha256 = "sha256-MQkHbodSkAQQpjaBP+Q35afcCrgcie6UoUldc+vjRA0="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; + sha256 = "sha256-40ylXbn9jV9v+ve1hFwhT5/jhzNfWHjL2WIplVUD2qk="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; + sha256 = "sha256-Q2z2Js0Zc9nvyQNxzLuuV7TcwiNIRo+RMRER6ZYgh74="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 85ef0766b8e8f..923b69d31cfa0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib + alsa-lib libGLU libGL ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib ]; dontDisableStatic = true; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 8173fb5fe1d2f..35f92f1457b39 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 = "20230918.2d9e414"; + version = "20231025.35f7965"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-YsvJ/5DTevRb+sCxWc/KcD2X5IXwAXvWGVfokr06nUM="; + hash = "sha256-c9D8lr5V/1BrKQjBsj931uGpnpR5p80CgP0Y/HNc40E="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix index 7134e7aca8ef1..bf8ed2ea5b66e 100644 --- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix @@ -4,13 +4,13 @@ callPackage ./generic.nix rec { pname = "experienced-pixel-dungeon"; - version = "2.15.3"; + version = "2.16"; src = fetchFromGitHub { owner = "TrashboxBobylev"; repo = "Experienced-Pixel-Dungeon-Redone"; rev = "ExpPD-${version}"; - hash = "sha256-qwZk08e+GX8YAVnOZCQ6sIIfV06lWn5bM6/PKD0PAH0="; + hash = "sha256-EfSByMceefUcnNmLSTnFNJs/iz1Q45X0BHHfj89d7PI="; }; postPatch = '' diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2fcbec7a1d313..8ba5087ef7fe7 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -81,7 +81,7 @@ in buildFHSEnv rec { xorg.libXfixes libGL libva - pipewire.lib + pipewire # steamwebhelper harfbuzz diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index c8c67e94b4a4a..593d78afe0ccd 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = writeShellScript "update.sh" '' version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt) - ${nix-update}/bin/nix-update --version "$version" steamPackages.steam-runtime + ${lib.getExe nix-update} --version "$version" steamPackages.steam-runtime ''; }; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index e12c19f6cb6a6..a915832fdbe90 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -3,6 +3,7 @@ , nixosTests , Carbon , Cocoa +, buildClient ? true }: stdenv.mkDerivation rec { @@ -38,21 +39,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (buildClient && stdenv.isLinux) [ icoutils ]; buildInputs = [ - python3 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 lua5_3 zlib + ] ++ lib.optionals buildClient ([ + libGLU + SDL2 + freetype + wavpack ] ++ lib.optionals stdenv.isLinux [ alsa-lib libX11 ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa + ]); + + cmakeFlags = [ + "-DCLIENT=${if buildClient then "ON" else "OFF"}" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString buildClient (lib.optionalString stdenv.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico @@ -68,7 +78,7 @@ stdenv.mkDerivation rec { cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/" ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/" ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data" - ''; + ''); passthru.tests.teeworlds = nixosTests.teeworlds; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 2901f42e095e2..c1c9415b90df3 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -12,30 +12,35 @@ , lua , luajit , zlib +, jsoncpp +, libpng , Cocoa }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "unstable-2022-08-30"; + version = "97.0.352"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; - sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; + rev = "v${version}"; + sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + installPhase = '' install -Dm 755 powder $out/bin/powder mkdir -p $out/share/applications - mv ../resources/powder.desktop $out/share/applications mv ../resources $out/share + '' + lib.optionalString stdenv.isLinux '' + mv ./resources/powder.desktop $out/share/applications ''; meta = with lib; { diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 0d0ebded72381..4ac45503f2272 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.4"; + version = "3.7.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-G9h5U5jlLOFCAKXdwzK+J8er3pUL4AUq5FLcvbUN93A="; + sha256 = "sha256-6TXpUsQBzhZ02SCbCqZW2LZfQ370Ma57bsblmpgZmoc="; }; buildInputs = [ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ba414d7aec5b3..c8df29776db95 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # service would stop the socket and break subsequent socket activations. # See https://github.com/apple/cups/issues/6005 sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12") '' substituteInPlace backend/usb-darwin.c \ --replace "kIOMainPortDefault" "kIOMasterPortDefault" ''; diff --git a/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix new file mode 100644 index 0000000000000..c9e92e839a0e3 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/dcp375cw/default.nix @@ -0,0 +1,97 @@ +{ lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file +, a2ps, coreutils, gnugrep, which, gawk }: + +let + version = "1.1.3"; + model = "dcp375cw"; +in rec { + driver = stdenv.mkDerivation { + pname = "${model}-lpr"; + inherit version; + + src = fetchurl { + url = + "https://download.brother.com/welcome/dlf005427/dcp375cwlpr-${version}-1.i386.deb"; + sha256 = + "6daf0144b5802ea8da394ca14db0e6f0200d4049545649283791f899b7f7bd26"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + buildInputs = [ cups ghostscript a2ps gawk ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + substituteInPlace $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --replace /opt "$out/opt" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/opt/brother/Printers/${model}/lpd/br${model}filter + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/${model}/lpd/filter${model} $out/lib/cups/filter/brlpdwrapper${model} + + wrapProgram $out/opt/brother/Printers/${model}/lpd/filter${model} \ + --prefix PATH ":" ${ + lib.makeBinPath [ + gawk + ghostscript + a2ps + file + gnused + gnugrep + coreutils + which + ] + } + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = platforms.linux; + downloadPage = + "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128"; + maintainers = with maintainers; [ marcovergueira ]; + }; + }; + + cupswrapper = stdenv.mkDerivation { + pname = "${model}-cupswrapper"; + inherit version; + + src = fetchurl { + url = + "https://download.brother.com/welcome/dlf005429/dcp375cwcupswrapper-${version}-1.i386.deb"; + sha256 = + "9a255728b595d2667b2caf9d0d332b677e1a6829a3ec1ed6d4e900a44069cf2d"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + buildInputs = [ cups ghostscript a2ps gawk ]; + unpackPhase = "dpkg-deb -x $src $out"; + + installPhase = '' + for f in $out/opt/brother/Printers/${model}/cupswrapper/cupswrapper${model}; do + wrapProgram $f --prefix PATH : ${ + lib.makeBinPath [ coreutils ghostscript gnugrep gnused ] + } + done + + mkdir -p $out/share/cups/model + ln -s $out/opt/brother/Printers/${model}/cupswrapper/brother_${model}_printer_en.ppd $out/share/cups/model/ + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother ${model} printer CUPS wrapper driver"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = platforms.linux; + downloadPage = + "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_all&os=128"; + maintainers = with maintainers; [ marcovergueira ]; + }; + }; +} diff --git a/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix b/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix new file mode 100644 index 0000000000000..c64e48a86ce84 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, makeWrapper +, coreutils +, gnugrep +, gnused +, mfc465cnlpr +, pkgsi686Linux +, psutils +}: + +stdenv.mkDerivation rec { + pname = "mfc465cncupswrapper"; + version = "1.0.1-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf006134/${pname}-${version}.i386.deb"; + sha256 = "59a62ed3cf10f1565c08ace55832bd48bd5034f7067662870edf7ff3bf0cb76a"; + }; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + + installPhase = '' + lpr=${mfc465cnlpr}/usr/local/Brother/Printer/mfc465cn + dir=$out/usr/local/Brother/Printer/mfc465cn + interpreter=${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 + patchelf --set-interpreter "$interpreter" "$dir/cupswrapper/brcupsconfpt1" + substituteInPlace $dir/cupswrapper/cupswrappermfc465cn \ + --replace "mkdir -p /usr" ": # mkdir -p /usr" \ + --replace '/''${printer_model}' "/mfc465cn" \ + --replace 'br''${printer_model}' "brmfc465cn" \ + --replace 'brlpdwrapper''${printer_model}' "brlpdwrappermfc465cn" \ + --replace 'filter''${printer_model}' "filtermfc465cn" \ + --replace ' ''${printer_name}' " MFC465CN" \ + --replace ' ''${device_name}' " MFC-465CN" \ + --replace '(''${device_name}' "(MFC-465CN" \ + --replace ':''${device_name}' ":MFC-465CN" \ + --replace '/''${device_name}' "/MFC-465CN" \ + --replace 'BR''${pcfilename}' "BR465" \ + --replace '/''${device_model}' "/Printer" \ + --replace '/usr/lib64/cups/filter/brlpdwrappermfc465cn' "$out/lib/cups/filter/brlpdwrappermfc465cn" \ + --replace '/usr/local/Brother/Printer/mfc465cn/lpd/filtermfc465cn' "$lpr/lpd/filtermfc465cn" \ + --replace '/usr/share/ppd/brmfc465cn.ppd' "$dir/cupswrapper/brmfc465.ppd" \ + --replace '/usr/share/cups/model/brmfc465cn.ppd' "$dir/cupswrapper/brmfc465.ppd" \ + --replace '/usr/lib/cups/filter/brlpdwrappermfc465cn' "$out/usr/lib/cups/filter/brlpdwrappermfc465cn" \ + --replace 'nup="psnup' "nup=\"${psutils}/bin/psnup" \ + --replace '/usr/bin/psnup' "${psutils}/bin/psnup" \ + --replace '/usr/local/Brother/Printer/mfc465cn/cupswrapper/brcupsconfpt1' "$dir/cupswrapper/brcupsconfpt1" \ + --replace '/usr/local/Brother/Printer/mfc465cn/inf' "$lpr/inf" + # Create the PPD file from the cupswrapper file + sed -n '/ENDOFPPDFILE1/,/ENDOFPPDFILE1/p' "$dir/cupswrapper/cupswrappermfc465cn" | head -n -1 | tail -n +2 > $dir/cupswrapper/brmfc465.ppd + sed -n '/ENDOFPPDFILE_END/,/ENDOFPPDFILE_END/p' "$dir/cupswrapper/cupswrappermfc465cn" | head -n -1 | tail -n +2 >> $dir/cupswrapper/brmfc465.ppd + chmod 644 $dir/cupswrapper/brmfc465.ppd + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + ln $dir/cupswrapper/cupswrappermfc465cn $out/lib/cups/filter + ln $dir/cupswrapper/brmfc465.ppd $out/share/cups/model + sed -n '/!ENDOFWFILTER!/,/!ENDOFWFILTER!/p' "$dir/cupswrapper/cupswrappermfc465cn" | sed '1 br; b; :r s/.*/printer_model=mfc465cn; cat <<!ENDOFWFILTER!/' | bash > $out/lib/cups/filter/brlpdwrappermfc465cn + sed -i "/#! \/bin\/sh/a PATH=${lib.makeBinPath [ coreutils gnused gnugrep ]}:\$PATH" $out/lib/cups/filter/brlpdwrappermfc465cn + chmod 755 $out/lib/cups/filter/brlpdwrappermfc465cn + ''; + + meta = with lib; { + description = "Brother MFC-465CN CUPS wrapper driver"; + homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ phrogg ]; + }; +} diff --git a/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix b/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix new file mode 100644 index 0000000000000..dc0be00a69328 --- /dev/null +++ b/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchurl +, dpkg +, makeWrapper +, coreutils +, file +, gawk +, ghostscript +, gnused +, pkgsi686Linux +}: + +stdenv.mkDerivation rec { + pname = "mfc465cnlpr"; + version = "1.0.1-1"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf006132/${pname}-${version}.i386.deb"; + sha256 = "cfe0289510bf36bee6014286ea78b1ebc6bbb948dbfd3aee02f0664a7743f99b"; + }; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + dontBuild = true; + + installPhase = '' + dir=$out/usr/local/Brother/Printer/mfc465cn + patchelf --set-interpreter ${pkgsi686Linux.glibc.out}/lib/ld-linux.so.2 $dir/lpd/brmfc465cnfilter + wrapProgram $dir/inf/setupPrintcapij \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + ]} + substituteInPlace $dir/lpd/filtermfc465cn \ + --replace "BR_PRT_PATH=" "BR_PRT_PATH=\"$dir/\" #" + wrapProgram $dir/lpd/filtermfc465cn \ + --prefix PATH : ${lib.makeBinPath [ + coreutils + file + ghostscript + gnused + ]} + substituteInPlace $dir/lpd/psconvertij2 \ + --replace '`which gs`' "${ghostscript}/bin/gs" + wrapProgram $dir/lpd/psconvertij2 \ + --prefix PATH : ${lib.makeBinPath [ + gnused + gawk + ]} + chmod -R a+w $dir/inf/ + ''; + + meta = with lib; { + description = "Brother MFC-465CN LPR printer driver"; + homepage = "http://www.brother.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ phrogg ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index 40438d333cf97..8614bdda2ab22 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -26,9 +26,9 @@ let system = - if stdenv.targetPlatform.system == "x86_64-linux" then "intel" - else if stdenv.targetPlatform.system == "aarch64-linux" then "arm" - else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}"; + if stdenv.hostPlatform.system == "x86_64-linux" then "intel" + else if stdenv.hostPlatform.system == "aarch64-linux" then "arm" + else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: lib.makeLibraryPath buildInputs; diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh index bdb522744182e..829bc6509e069 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup arch=$(uname -m) diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index f43f3fc4f3a61..d3ae34a80ae58 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation rec { homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index fe6c5a21ceb20..ca191319243f1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.6.2"; + version = "10.6.4"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-j4dqLV1Q17RQczkTqGTh8S8Y6ELqXjWuJRr+xB/x2yE="; + hash = "sha256-+qBeE7t+d1Es63hUBO9Bcqyc0vtatcJGoYw2GE0JPxQ="; # 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-aCekNpf6C5fGIEk0pLkz4hJ6mQfBIzeCsIL6Fxf2QGk="; + vendorHash = "sha256-Mh737emdQkIoNOAkaTafCoMQnLqXIGMKX6X5ClsmMzc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix index 5bfc2c5c4a392..42d8c11915c8a 100644 --- a/pkgs/misc/i3a/default.nix +++ b/pkgs/misc/i3a/default.nix @@ -24,6 +24,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://git.goral.net.pl/mgoral/i3a"; description = "A set of scripts used for automation of i3 and sway window manager layouts"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/misc/mnemonicode/default.nix index 4ecacaf418a1d..1cd78fdce093e 100644 --- a/pkgs/misc/mnemonicode/default.nix +++ b/pkgs/misc/mnemonicode/default.nix @@ -1,20 +1,21 @@ { stdenv, lib, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mnemonicode"; - version = "2015-11-30"; + version = "1.0.0"; src = fetchFromGitHub { owner = "singpolyma"; repo = "mnemonicode"; - rev = "1687fabdf48acf68d4186f219bc20bffe02e8ee0"; - sha256 = "0kp1jhhqfwfiqg9kx0mbyr4qh4yc4zg4szqk5fbf809nx2pvprm5"; + rev = finalAttrs.version; + hash = "sha256-bGipPvLj6ig+lMLsl/Yve8PmuA93ETvhNKoMPh0JMBM="; }; installPhase = '' mkdir -p $out/bin - cp mnencode $out/bin - cp mndecode $out/bin + mv mnencode $out/bin + mv mndecode $out/bin ''; meta = with lib; { + homepage = "https://github.com/singpolyma/mnemonicode"; description = '' Routines which implement a method for encoding binary data into a sequence of words which can be spoken over the phone, for example, and converted @@ -22,6 +23,7 @@ stdenv.mkDerivation { ''; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ kirillrdy ]; + mainProgram = "mnencode"; }; -} +}) diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix deleted file mode 100644 index 038bdd5a73f1a..0000000000000 --- a/pkgs/misc/openrussian-cli/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, wget, unzip -, sqlite, which, lua, installShellFiles, makeWrapper -}: -let - luaEnv = lua.withPackages(p: with p; [ luasql-sqlite3 luautf8 ]); -in -stdenv.mkDerivation rec { - pname = "openrussian-cli"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "rhaberkorn"; - repo = "openrussian-cli"; - rev = version; - sha256 = "1ria7s7dpqip2wdwn35wmkry84g8ghdqnxc9cbxzzq63vl6pgvcn"; - }; - - nativeBuildInputs = [ - pkg-config wget unzip sqlite which installShellFiles makeWrapper - ]; - - buildInputs = [ luaEnv ]; - - makeFlags = [ - "LUA=${luaEnv}/bin/lua" - "LUAC=${luaEnv}/bin/luac" - ]; - - dontConfigure = true; - - # Can't use "make install" here - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/openrussian - cp openrussian-sqlite3.db $out/share/openrussian - cp openrussian $out/bin - - wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ - --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' - - runHook postInstall - ''; - - postInstall = '' - installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash - installManPage ./openrussian.1 - ''; - - meta = with lib; { - description = "Offline Console Russian Dictionary (based on openrussian.org)"; - homepage = "https://github.com/rhaberkorn/openrussian-cli"; - license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; - maintainers = with maintainers; [ zane ]; - mainProgram = "openrussian"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch b/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch deleted file mode 100644 index fa2575cb938a8..0000000000000 --- a/pkgs/misc/tpm2-pkcs11/0001-configure-ac-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index e861e42..018c19c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ - #;**********************************************************************; - - AC_INIT([tpm2-pkcs11], -- [m4_esyscmd_s([git describe --tags --always --dirty])], -+ [git-@VERSION@], - [https://github.com/tpm2-software/tpm2-pkcs11/issues], - [], - [https://github.com/tpm2-software/tpm2-pkcs11]) diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index dd0cf011b1588..91b7c31eb3231 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -2,32 +2,38 @@ , pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf , tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python3, glibc, libyaml , abrmdSupport ? true, tpm2-abrmd ? null +, fapiSupport ? true }: stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "sha256-f5wi0nIM071yaQCwPkY1agKc7OEQa/IxHJc4V2i0Q9I="; + sha256 = "sha256-SoHtgZRIYNJg4/w1MIocZAM26mkrM+UOQ+RKCh6nwCk="; }; - patches = lib.singleton ( - substituteAll { - src = ./0001-configure-ac-version.patch; - VERSION = version; - }); + patches = [ + ./version.patch + ./graceful-fapi-fail.patch + ]; # The preConfigure phase doesn't seem to be working here # ./bootstrap MUST be executed as the first step, before all # of the autoreconfHook stuff postPatch = '' + echo ${version} > VERSION ./bootstrap ''; + configureFlags = lib.optionals (!fapiSupport) [ + # Note: this will be renamed to with-fapi in next release. + "--enable-fapi=no" + ]; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive makeWrapper patchelf ]; diff --git a/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch b/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch new file mode 100644 index 0000000000000..26712e9830c7d --- /dev/null +++ b/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch @@ -0,0 +1,51 @@ +From 2e3e3c0b0f4e0c19e411fd46358930bf158ad3f5 Mon Sep 17 00:00:00 2001 +From: Jonathan McDowell <noodles@earth.li> +Date: Wed, 1 Feb 2023 09:29:58 +0000 +Subject: [PATCH] Gracefully fail FAPI init when it's not compiled in + +Instead of emitting: + + WARNING: Getting tokens from fapi backend failed. + +errors when FAPI support is not compiled in gracefully fail the FAPI +init and don't log any warnings. We'll still produce a message +indicating this is what's happened in verbose mode, but normal operation +no longer gets an unnecessary message. + +Fixes #792 + +Signed-off-by: Jonathan McDowell <noodles@earth.li> +--- + src/lib/backend.c | 4 +++- + src/lib/backend_fapi.c | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/lib/backend.c b/src/lib/backend.c +index ca5e2ccf..128f58b9 100644 +--- a/src/lib/backend.c ++++ b/src/lib/backend.c +@@ -53,7 +53,9 @@ CK_RV backend_init(void) { + LOGE(msg); + return rv; + } +- LOGW(msg); ++ if (rv != CKR_FUNCTION_NOT_SUPPORTED) { ++ LOGW(msg); ++ } + } else { + fapi_init = true; + } +diff --git a/src/lib/backend_fapi.c b/src/lib/backend_fapi.c +index fe594f0e..3a203632 100644 +--- a/src/lib/backend_fapi.c ++++ b/src/lib/backend_fapi.c +@@ -977,7 +977,8 @@ CK_RV backend_fapi_token_changeauth(token *tok, bool user, twist toldpin, twist + + CK_RV backend_fapi_init(void) { + +- return CKR_OK; ++ LOGV("FAPI not enabled, failing init"); ++ return CKR_FUNCTION_NOT_SUPPORTED; + } + + CK_RV backend_fapi_destroy(void) { diff --git a/pkgs/misc/tpm2-pkcs11/version.patch b/pkgs/misc/tpm2-pkcs11/version.patch new file mode 100644 index 0000000000000..297a7bd537362 --- /dev/null +++ b/pkgs/misc/tpm2-pkcs11/version.patch @@ -0,0 +1,10 @@ +--- a/bootstrap ++++ b/bootstrap +@@ -4,7 +4,6 @@ + + # Generate a VERSION file that is included in the dist tarball to avoid needed git + # when calling autoreconf in a release tarball. +-git describe --tags --always --dirty > VERSION + + # generate list of source files for use in Makefile.am + # if you add new source files, you must run ./bootstrap again diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index 5cf92a41a6f83..d9a2b378134a2 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, fetchpatch, stdenv }: stdenv.mkDerivation { pname = "core-symbolication"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; + patches = [ + # C99 compilation fix + # https://github.com/matthewbauer/CoreSymbolication/pull/1 + (fetchpatch { + url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; + hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { diff --git a/pkgs/os-specific/darwin/DarwinTools/default.nix b/pkgs/os-specific/darwin/DarwinTools/default.nix index 72a3750284531..11e4c84395dab 100644 --- a/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation rec { ./sw_vers-CFPriv.patch ]; - postPatch = '' - substituteInPlace Makefile \ - --replace gcc cc - ''; - configurePhase = '' export SRCROOT=. export SYMROOT=. export DSTROOT=$out ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "STRIP=${stdenv.cc.targetPrefix}strip" + ]; + postInstall = '' mv $out/usr/* $out rmdir $out/usr diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 0c959695d7795..5484ba5acb189 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,9 +1,6 @@ -{ stdenv, fetchurl, libxml2, xar, cpio, pkgs, python3Minimal, pbzx, lib, darwin-stubs, print-reexports }: +{ stdenv, fetchurl, cpio, pbzx, pkgs, lib, darwin-stubs, print-reexports }: let - xarMinimal = xar.override { - libxml2 = libxml2.override { pythonSupport = false; }; - }; # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { pname = "MacOS_SDK"; @@ -19,27 +16,23 @@ let sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih"; }; - nativeBuildInputs = [ xarMinimal cpio python3Minimal pbzx ]; + nativeBuildInputs = [ cpio pbzx ]; outputs = [ "out" "dev" "man" ]; unpackPhase = '' - xar -x -f $src + pbzx $src | cpio -idm ''; + sourceRoot = "."; + installPhase = '' - start="$(pwd)" mkdir -p $out - cd $out - pbzx -n $start/Payload | cpio -idm - - mv usr/* . - rmdir usr - mv System/* . - rmdir System + cp -R System/Library $out + cp -R usr/* $out - pushd lib + pushd $out/lib cp ${darwin-stubs}/usr/lib/libcups*.tbd . ln -s libcups.2.tbd libcups.tbd ln -s libcupscgi.1.tbd libcupscgi.tbd diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix index 6e6712f375e65..931bebeae5dd4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix @@ -1,6 +1,13 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { + patches = [ + # The source release version of math.h is missing some symbols that are actually present + # in newer SDKs. Patch them into the header to avoid implicit function declaration errors + # when compiling with newer versions of clang. + ./missing-declarations.patch + ]; + installPhase = '' mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch b/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch new file mode 100644 index 0000000000000..e56934e59d4c4 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/missing-declarations.patch @@ -0,0 +1,292 @@ +--- a/Source/Intel/math.h 2023-10-20 09:43:42.640416006 -0400 ++++ b/Source/Intel/math.h 2023-10-20 09:47:59.743127003 -0400 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved. ++ * Copyright (c) 2002-2015 Apple Inc. All rights reserved. + * + * @APPLE_LICENSE_HEADER_START@ + * +@@ -27,14 +27,17 @@ + * Contains: typedefs, prototypes, and macros germane to C99 floating point.* + * * + *******************************************************************************/ ++#ifndef __MATH_H__ ++#define __MATH_H__ ++ + #ifndef __MATH__ + #define __MATH__ ++#endif + +-#include <sys/cdefs.h> /* For definition of __DARWIN_UNIX03 et al */ ++#include <sys/cdefs.h> ++#include <Availability.h> + +-#ifdef __cplusplus +-extern "C" { +-#endif ++__BEGIN_DECLS + + /****************************************************************************** + * Floating point data types * +@@ -87,14 +90,26 @@ + #define FP_SUBNORMAL 5 + #define FP_SUPERNORMAL 6 /* meaningful only on PowerPC */ + +-/* fma() *function call* is more costly than equivalent (in-line) multiply and add operations */ +-/* For single and double precision, the cost isn't too bad, because we can fall back on higher */ +-/* precision hardware, with the necessary range to handle infinite precision products. However, */ +-/* expect the long double fma to be at least an order of magnitude slower than a simple multiply */ +-/* and an add. */ +-#undef FP_FAST_FMA +-#undef FP_FAST_FMAF +-#undef FP_FAST_FMAL ++#if defined __arm64__ || defined __ARM_VFPV4__ ++/* On these architectures, fma(), fmaf( ), and fmal( ) are generally about as ++ fast as (or faster than) separate multiply and add of the same operands. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# define FP_FAST_FMAL 1 ++#elif (defined __i386__ || defined __x86_64__) && (defined __FMA__) ++/* When targeting the FMA ISA extension, fma() and fmaf( ) are generally ++ about as fast as (or faster than) separate multiply and add of the same ++ operands, but fmal( ) may be more costly. */ ++# define FP_FAST_FMA 1 ++# define FP_FAST_FMAF 1 ++# undef FP_FAST_FMAL ++#else ++/* On these architectures, fma( ), fmaf( ), and fmal( ) function calls are ++ significantly more costly than separate multiply and add operations. */ ++# undef FP_FAST_FMA ++# undef FP_FAST_FMAF ++# undef FP_FAST_FMAL ++#endif + + /* The values returned by `ilogb' for 0 and NaN respectively. */ + #define FP_ILOGB0 (-2147483647 - 1) +@@ -191,6 +206,23 @@ + static __inline__ int __inline_isnormalf( float __x ) { float fabsf = __builtin_fabsf(__x); if( __x != __x ) return 0; return fabsf < __builtin_inff() && fabsf >= __FLT_MIN__; } + static __inline__ int __inline_isnormald( double __x ) { double fabsf = __builtin_fabs(__x); if( __x != __x ) return 0; return fabsf < __builtin_inf() && fabsf >= __DBL_MIN__; } + static __inline__ int __inline_isnormal( long double __x ) { long double fabsf = __builtin_fabsl(__x); if( __x != __x ) return 0; return fabsf < __builtin_infl() && fabsf >= __LDBL_MIN__; } ++ ++#if defined __i386__ || defined __x86_64__ ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { ++ long double __ld; ++ struct{ unsigned long long __m; unsigned short __sexp; } __p; ++ } __u; ++ __u.__ld = __x; ++ return (int)(__u.__p.__sexp >> 15); ++} ++#else ++__header_always_inline int __inline_signbitl(long double __x) { ++ union { long double __f; unsigned long long __u;} __u; ++ __u.__f = __x; ++ return (int)(__u.__u >> 63); ++} ++#endif + + #else + +@@ -509,7 +541,112 @@ + extern long double __infl( void ); + extern float __nan( void ); /* 10.3 (and later) must retain in ABI for backward compatability */ + +-#if !defined(_ANSI_SOURCE) ++ ++/****************************************************************************** ++ * Apple extensions to the C standard * ++ ******************************************************************************/ ++ ++/* Because these functions are not specified by any relevant standard, they ++ are prefixed with __, which places them in the implementor's namespace, so ++ they should not conflict with any developer or third-party code. If they ++ are added to a relevant standard in the future, un-prefixed names may be ++ added to the library and they may be moved out of this section of the ++ header. ++ ++ Because these functions are non-standard, they may not be available on non- ++ Apple platforms. */ ++ ++/* __exp10(x) returns 10**x. Edge cases match those of exp( ) and exp2( ). */ ++extern float __exp10f(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __exp10(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++/* __sincos(x,sinp,cosp) computes the sine and cosine of x with a single ++ function call, storing the sine in the memory pointed to by sinp, and ++ the cosine in the memory pointed to by cosp. Edge cases match those of ++ separate calls to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp); ++ ++/* __sinpi(x) returns the sine of pi times x; __cospi(x) and __tanpi(x) return ++ the cosine and tangent, respectively. These functions can produce a more ++ accurate answer than expressions of the form sin(M_PI * x) because they ++ avoid any loss of precision that results from rounding the result of the ++ multiplication M_PI * x. They may also be significantly more efficient in ++ some cases because the argument reduction for these functions is easier ++ to compute. Consult the man pages for edge case details. */ ++extern float __cospif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __cospi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __sinpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __sinpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern float __tanpif(float) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++extern double __tanpi(double) __OSX_AVAILABLE_STARTING(__MAC_10_9, __IPHONE_7_0); ++ ++#if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090) || \ ++ (defined __IPHONE_OS_VERSION_MIN_REQUIRED && __IPHONE_OS_VERSION_MIN_REQUIRED < 70000) ++/* __sincos and __sincosf were introduced in OSX 10.9 and iOS 7.0. When ++ targeting an older system, we simply split them up into discrete calls ++ to sin( ) and cos( ). */ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ *__sinp = sinf(__x); ++ *__cosp = cosf(__x); ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ *__sinp = sin(__x); ++ *__cosp = cos(__x); ++} ++#else ++/* __sincospi(x,sinp,cosp) computes the sine and cosine of pi times x with a ++ single function call, storing the sine in the memory pointed to by sinp, ++ and the cosine in the memory pointed to by cosp. Edge cases match those ++ of separate calls to __sinpi( ) and __cospi( ), and are documented in the ++ man pages. ++ ++ These functions were introduced in OSX 10.9 and iOS 7.0. Because they are ++ implemented as header inlines, weak-linking does not function as normal, ++ and they are simply hidden when targeting earlier OS versions. */ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp); ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp); ++ ++/* Implementation details of __sincos and __sincospi allowing them to return ++ two results while allowing the compiler to optimize away unnecessary load- ++ store traffic. Although these interfaces are exposed in the math.h header ++ to allow compilers to generate better code, users should call __sincos[f] ++ and __sincospi[f] instead and allow the compiler to emit these calls. */ ++struct __float2 { float __sinval; float __cosval; }; ++struct __double2 { double __sinval; double __cosval; }; ++ ++extern struct __float2 __sincosf_stret(float); ++extern struct __double2 __sincos_stret(double); ++extern struct __float2 __sincospif_stret(float); ++extern struct __double2 __sincospi_stret(double); ++ ++__header_always_inline void __sincosf(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincosf_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincos(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincos_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospif(float __x, float *__sinp, float *__cosp) { ++ const struct __float2 __stret = __sincospif_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++ ++__header_always_inline void __sincospi(double __x, double *__sinp, double *__cosp) { ++ const struct __double2 __stret = __sincospi_stret(__x); ++ *__sinp = __stret.__sinval; *__cosp = __stret.__cosval; ++} ++#endif ++ ++/****************************************************************************** ++ * POSIX/UNIX extensions to the C standard * ++ ******************************************************************************/ ++ ++#if __DARWIN_C_LEVEL >= 199506L + extern double j0 ( double ); + + extern double j1 ( double ); +@@ -543,14 +680,32 @@ + extern int signgam; /* required for unix 2003 */ + + +-#endif /* !defined(_ANSI_SOURCE) */ ++#endif /* __DARWIN_C_LEVEL >= 199506L */ + +-#if !defined(__NOEXTENSIONS__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#define __WANT_EXTENSIONS__ +-#endif ++/* Long-double versions of M_E, etc for convenience on Intel where long- ++ double is not the same as double. Define __MATH_LONG_DOUBLE_CONSTANTS ++ to make these constants available. */ ++#if defined __MATH_LONG_DOUBLE_CONSTANTS ++#define M_El 0xa.df85458a2bb4a9bp-2L ++#define M_LOG2El 0xb.8aa3b295c17f0bcp-3L ++#define M_LOG10El 0xd.e5bd8a937287195p-5L ++#define M_LN2l 0xb.17217f7d1cf79acp-4L ++#define M_LN10l 0x9.35d8dddaaa8ac17p-2L ++#define M_PIl 0xc.90fdaa22168c235p-2L ++#define M_PI_2l 0xc.90fdaa22168c235p-3L ++#define M_PI_4l 0xc.90fdaa22168c235p-4L ++#define M_1_PIl 0xa.2f9836e4e44152ap-5L ++#define M_2_PIl 0xa.2f9836e4e44152ap-4L ++#define M_2_SQRTPIl 0x9.06eba8214db688dp-3L ++#define M_SQRT2l 0xb.504f333f9de6484p-3L ++#define M_SQRT1_2l 0xb.504f333f9de6484p-4L ++#endif /* defined __MATH_LONG_DOUBLE_CONSTANTS */ + +-#ifdef __WANT_EXTENSIONS__ ++/****************************************************************************** ++ * Legacy BSD extensions to the C standard * ++ ******************************************************************************/ + ++#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL + #define FP_SNAN FP_NAN + #define FP_QNAN FP_NAN + +@@ -560,11 +715,6 @@ + /* Legacy API: please use C99 lround() instead. */ + extern long int roundtol ( double ); + +-/* +- * XOPEN/SVID +- */ +-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) + #if !defined(__cplusplus) + /* used by matherr below */ + struct exception { +@@ -592,19 +742,12 @@ + #define TLOSS 5 + #define PLOSS 6 + +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#if !defined( __STRICT_ANSI__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + /* Legacy API: please use C99 isfinite() instead. */ + extern int finite ( double ); + + /* Legacy API: please use C99 tgamma() instead. */ + extern double gamma ( double ); + +-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE)) +- + #if !defined(__cplusplus) + extern int matherr ( struct exception * ); + #endif +@@ -633,14 +776,8 @@ + extern double lgamma_r ( double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + extern long double lgammal_r ( long double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER; + #endif /* _REENTRANT */ +- +-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */ +-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */ +- +-#endif /* __WANT_EXTENSIONS__ */ + +-#ifdef __cplusplus +-} +-#endif ++#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */ + +-#endif /* __MATH__ */ ++__END_DECLS ++#endif /* __MATH_H__ */ diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix index 38b13f784a328..998bc867e757f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, appleDerivation', launchd, bootstrap_cmds, xnu, xpc, ppp, IOKit, eap8021x, Security +{ lib, stdenv, runCommand, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security , headersOnly ? false }: +let + privateHeaders = runCommand "swift-corelibs-foundation-private" { } '' + mkdir -p $out/include/CoreFoundation + + cp ${swift-corelibs-foundation}/Library/Frameworks/CoreFoundation.framework/PrivateHeaders/* \ + $out/include/CoreFoundation + ''; +in appleDerivation' stdenv { meta.broken = stdenv.cc.nativeLibc; nativeBuildInputs = lib.optionals (!headersOnly) [ bootstrap_cmds ]; - buildInputs = lib.optionals (!headersOnly) [ launchd ppp xpc IOKit eap8021x ]; + buildInputs = lib.optionals (!headersOnly) [ privateHeaders launchd ppp xpc IOKit eap8021x ]; propagatedBuildInputs = lib.optionals (!headersOnly) [ Security ]; @@ -13,7 +21,6 @@ appleDerivation' stdenv { NIX_CFLAGS_COMPILE = toString [ "-ISystemConfiguration.framework/Headers" "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders" - "-D_DNS_SD_LIBDISPATCH" # Needed for DNSServiceSetDispatchQueue to be available ]; }; @@ -23,11 +30,6 @@ appleDerivation' stdenv { substituteInPlace SystemConfiguration.fproj/SCNetworkReachability.c \ --replace ''$'#define\tHAVE_VPN_STATUS' "" - - # Our neutered CoreFoundation doesn't have this function, but I think we'll live... - substituteInPlace SystemConfiguration.fproj/SCNetworkConnectionPrivate.c \ - --replace 'CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' \ - --replace 'CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID)' 'FALSE' ''; dontBuild = headersOnly; diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix index 30d123ab804c8..e4431c68c9aad 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix @@ -5,12 +5,17 @@ let xnu-src = if stdenv.isAarch64 then macosPackages_11_0_1.xnu.src else xnu.src; arch = if stdenv.isAarch64 then "arm" else "i386"; in appleDerivation { + patches = [ + # Fixes a build failure with newer versions of clang that make implicit int an error. + ./fix-implicit-int.patch + ]; + nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libutil ]; env.NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-lutil"; - patchPhase = '' + prePatch = '' # ugly hacks for missing headers # most are bsd related - probably should make this a drv unpackFile ${Libc.src} diff --git a/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch new file mode 100644 index 0000000000000..df0fff930daf1 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/fix-implicit-int.patch @@ -0,0 +1,11 @@ +diff -ur a/diskdev_cmds.xcodeproj/project.pbxproj b/diskdev_cmds.xcodeproj/project.pbxproj +--- a/quota.tproj/quota.c 2021-10-06 01:13:40.000000000 -0400 ++++ b/quota.tproj/quota.c 2023-10-27 08:24:05.960965958 -0400 +@@ -115,6 +115,7 @@ + + int + main(argc, argv) ++ int argc; + char *argv[]; + { + int ngroups; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 72ef086f59909..6a3bddc211e95 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -32,6 +32,7 @@ appleDerivation { ]; meta = { + mainProgram = "iconv"; platforms = lib.platforms.darwin; }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 4082f5b760cf8..0ba4caee6289a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -4,6 +4,9 @@ appleDerivation' stdenvNoCC { dontBuild = true; installPhase = '' mkdir -p $out/include - cp mDNSShared/dns_sd.h $out/include + # TODO: Do this only for 765.50.9 once there is a way to apply version-specific + # logic in a source-release derivation. + substitute mDNSShared/dns_sd.h $out/include/dns_sd.h \ + --replace '#define _DNS_SD_LIBDISPATCH 0' '#define _DNS_SD_LIBDISPATCH 1' ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index c99523d6c8616..c6fc009430374 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -20,7 +20,12 @@ appleDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it + env.NIX_CFLAGS_COMPILE = toString [ + # hardeningDisable doesn't cut it + "-Wno-error=format-security" + # Required to build with clang 16 + "-Wno-error=deprecated-non-prototype" + ]; meta = { platforms = lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index 41f929fe90ff6..2293720d7fabe 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { -configuration Release \ -project MoltenVKShaderConverter.xcodeproj \ -scheme MoltenVKShaderConverter \ - -arch ${stdenv.targetPlatform.darwinArch} + -arch ${stdenv.hostPlatform.darwinArch} declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) for product in "''${!products[@]}"; do cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product" @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { -configuration Release \ -project MoltenVK.xcodeproj \ -scheme MoltenVK-macOS \ - -arch ${stdenv.targetPlatform.darwinArch} + -arch ${stdenv.hostPlatform.darwinArch} cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib" popd ''; diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 060fa90abdb45..9b3ef924dd07a 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.19.2"; + version = "2.19.4"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-nuK1Ip/B1yGMtKwtRIiQ4ATJU5JEDfpQyq6+WR46EMw="; + hash = "sha256-6MqTyCqFv5suQgQ5a9t1mDA2njjFFgk67Kp7xO5OXoA="; }; buildInputs = [ diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index fa6e1aa01e9f4..f979f7ec020e7 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { "BUILD_PATH=$(out)/bin" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + postInstall = '' mkdir -p $out/Library/LaunchDaemons cp ${./org.nixos.skhd.plist} $out/Library/LaunchDaemons/org.nixos.skhd.plist diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index d77976773c66d..5c593b1488e29 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, ninja, pkg-config, launchd, libdispatch, python3, libxml2, objc4, icu }: +{ lib, stdenv, fetchFromGitHub, fetchurl, makeSetupHook, cmake, pkg-config, launchd, libdispatch, python3Minimal, libxml2, objc4, icu }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z"; }; - nativeBuildInputs = [ cmake ninja pkg-config python3 ]; + nativeBuildInputs = [ cmake pkg-config python3Minimal ]; buildInputs = [ (lib.getDev launchd) libdispatch libxml2 objc4 icu ]; patches = [ diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 5474e8345c1a6..841746957c76b 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.0"; + version = "6.0.1"; 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-KeZ5srx9dfQN9u6Fgg9BtIhLhFWp975iz72m78bWINo="; + hash = "sha256-CXkGVoJcGSkooxe7eIhwaM6FkOI45NVw5jdLJAzgFBM="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-BQhFTn9KDBv9oG8kT2TFFpPZGHARg7DfN+IeQNNDE84="; + hash = "sha256-u+MkGd/rkT1RVkzC2IcAcFM9eClFdj3WBFnftUVwkwc="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/alsa-project/default.nix b/pkgs/os-specific/linux/alsa-project/default.nix deleted file mode 100644 index 15077cc8d77a1..0000000000000 --- a/pkgs/os-specific/linux/alsa-project/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, pkgs }: - -lib.makeScope pkgs.newScope (self: { - alsa-firmware = self.callPackage ./alsa-firmware { }; - alsa-lib = self.callPackage ./alsa-lib { }; - alsa-oss = self.callPackage ./alsa-oss { }; - alsa-plugins = self.callPackage ./alsa-plugins { }; - alsa-plugins-wrapper = self.callPackage ./alsa-plugins/wrapper.nix { }; - alsa-tools = self.callPackage ./alsa-tools { }; - alsa-topology-conf = self.callPackage ./alsa-topology-conf { }; - alsa-ucm-conf = self.callPackage ./alsa-ucm-conf { }; - alsa-utils = self.callPackage ./alsa-utils { fftw = pkgs.fftwFloat; }; -}) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index dc46c790c3af7..98487799aa8aa 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.4"; + tag = "0.3.5"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-EeVOrZtmKi5VfPerW9IntjRvdU3AbFPHG+pyAI4ciGk="; + hash = "sha256-rKz9a4Z+tx63rhknQIl/zu/WIMjxxM0+NGyaxnzxLk4="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index da5011e673734..3ce10735f1de8 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -5,7 +5,7 @@ let choosePlatform = - let pname = stdenv.targetPlatform.parsed.cpu.name; in + let pname = stdenv.hostPlatform.parsed.cpu.name; in pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}"); prebuilt_crt = choosePlatform { @@ -66,7 +66,7 @@ in stdenvNoCC.mkDerivation rec { pname = "bionic-prebuilt"; version = "ndk-release-r23"; - name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}"; + name = "${stdenv.hostPlatform.parsed.cpu.name}-${pname}-${version}"; src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index acb484ba6b6a7..c6c7d9d0f509b 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -23,11 +23,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.66"; + version = "5.70"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-Of6mS1kMlJKYSgwnqJ/CA+HNx0hmCG77j0aYZ3qytXQ="; + sha256 = "sha256-N+Ny6RaVXhRMuIL4iOS+QImPEK47fCE93N1V7pwAkng="; }; patches = [ diff --git a/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch b/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch new file mode 100644 index 0000000000000..bd639574f63f3 --- /dev/null +++ b/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch @@ -0,0 +1,25 @@ +From 3b047ab4271919856ae0a3dee3a03a24045c0016 Mon Sep 17 00:00:00 2001 +From: Paul Meyer <49727155+katexochen@users.noreply.github.com> +Date: Mon, 13 Nov 2023 20:24:54 +0000 +Subject: [PATCH] don't sanatize the environment + +--- + checksec | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/checksec b/checksec +index 4fc3c31..135223a 100755 +--- a/checksec ++++ b/checksec +@@ -2,9 +2,6 @@ + # Do not edit this file directly, this file is generated from the files + # in the src directory. Any updates to this file will be overwritten when generated + +-# sanitize the environment before run +-[[ "$(env | /bin/sed -r -e '/^(PWD|SHLVL|_)=/d')" ]] && exec -c "$0" "$@" +- + # --- Modified Version --- + # Name : checksec.sh + # Version : 1.7.0 +-- +2.42.0 diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1bdd4cf5f6779..07574722cd20d 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -1,14 +1,30 @@ { lib , stdenv +, fetchpatch , fetchFromGitHub , makeWrapper +, testers +, runCommand + + # dependencies +, binutils +, coreutils +, curl +, elfutils , file , findutils -, binutils-unwrapped +, gawk , glibc -, coreutils -, sysctl +, gnugrep +, gnused , openssl +, procps +, sysctl +, wget +, which + + # tests +, checksec }: stdenv.mkDerivation rec { @@ -24,6 +40,13 @@ stdenv.mkDerivation rec { patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch + # Tool would sanitize the environment, removing the PATH set by our wrapper. + ./0002-don-t-sanatize-the-environment.patch + # Fix the exit code of debug_report command. Check if PR 226 was merged when upgrading version. + (fetchpatch { + url = "https://github.com/slimm609/checksec.sh/commit/851ebff6972f122fde5507f1883e268bbff1f23d.patch"; + hash = "sha256-DOcVF+oPGIR9VSbqE+EqWlcNANEvou1gV8qBvJLGLBE="; + }) ]; nativeBuildInputs = [ @@ -33,22 +56,45 @@ stdenv.mkDerivation rec { installPhase = let path = lib.makeBinPath [ - findutils + binutils + coreutils + curl + elfutils file - binutils-unwrapped - sysctl + findutils + gawk + gnugrep + gnused openssl + procps + sysctl + wget + which ]; in '' mkdir -p $out/bin install checksec $out/bin - substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6 - substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" + substituteInPlace $out/bin/checksec \ + --replace "/bin/sed" "${gnused}/bin/sed" \ + --replace "/usr/bin/id" "${coreutils}/bin/id" \ + --replace "/lib/libc.so.6" "${glibc}/lib/libc.so.6" wrapProgram $out/bin/checksec \ --prefix PATH : ${path} ''; + passthru.tests = { + version = testers.testVersion { + package = checksec; + version = "v${version}"; + }; + debug-report = runCommand "debug-report" { buildInputs = [ checksec ]; } '' + checksec --debug_report || exit 1 + echo "OK" + touch $out + ''; + }; + meta = with lib; { description = "Tool for checking security bits on executables"; homepage = "https://www.trapkit.de/tools/checksec/"; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 7940ce060e4d0..00d46591c1361 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" "XMLTO=${buildPackages.xmlto}/bin/xmlto" - ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ - "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" - "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.hostPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.hostPlatform.config}-" ]); outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 296e4b79b3e08..cacef99afd748 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ moni ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index c85a75d1f17f4..789a59f751f50 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -3,20 +3,20 @@ , autoreconfHook , pkg-config , dbus -, fetchpatch , sysctl +, gitUpdater }: stdenv.mkDerivation rec { pname = "ell"; - version = "0.58"; + version = "0.59"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-CwUwwvyT541aIvypVMqRhHkVJLna121Cme+v7c0FLWo="; + hash = "sha256-uJcGYT+JSdz/XTyJb/VUyedmSKJW/4BbTM3fw3ebtIc="; }; nativeBuildInputs = [ @@ -30,19 +30,17 @@ stdenv.mkDerivation rec { sysctl ]; - patches = [ - # /proc/sys/net/core/somaxconn doesn't always exist in the nix build environment - (fetchpatch { - name = "skip-sysctl-test-if-sysfs-not-available.patch"; - url = "https://patchwork.kernel.org/project/ell/patch/526DA75D-01AB-4D85-BF5C-5F25E5C39480@kloenk.dev/raw/"; - hash = "sha256-YYGYWQ67cbMLt6RnqZmHt+tpvVIDKPbSCqPIouk6alU="; - }) - ]; enableParallelBuilding = true; # tests sporadically fail on musl doCheck = !stdenv.hostPlatform.isMusl; + passthru = { + updateScript = gitUpdater { + url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; + }; + }; + meta = with lib; { homepage = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; description = "Embedded Linux Library"; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index bbd871a1b9ae7..f4b8bfc5661a5 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -1,4 +1,4 @@ -{ version, sha256Hash }: +{ version, hash }: { lib, stdenv, fetchFromGitHub, fetchpatch , fusePackages, util-linux, gettext, shadow @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "libfuse"; repo = "libfuse"; rev = "${pname}-${version}"; - sha256 = sha256Hash; + inherit hash; }; preAutoreconf = "touch config.rpath"; @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { mesonFlags = lib.optionals isFuse3 [ "-Dudevrulesdir=/udev/rules.d" "-Duseroot=false" + "-Dinitscriptdir=" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 6aa3e46d4e1ae..f692c2fb41c78 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -7,11 +7,11 @@ let in { fuse_2 = mkFuse { version = "2.9.9"; - sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n"; + hash = "sha256-dgjM6M7xk5MHi9xPyCyvF0vq0KM8UCsEYBcMhkrdvfs="; }; fuse_3 = mkFuse { - version = "3.11.0"; - sha256Hash = "1wx80xxlvjn0wxhmkr1g91vwrgxssyzds1hizzxc2xrd4kjh9dfb"; + version = "3.16.2"; + hash = "sha256-QO9s+IkR0rkqIYNqt2IYST6AVBkCr56jcuuz5nKJuA4="; }; } diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch index 903f30325df2e..582d3eb0dec89 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -1,12 +1,13 @@ +diff --git a/lib/meson.build b/lib/meson.build --- a/lib/meson.build +++ b/lib/meson.build @@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), soversion: '3', include_directories: include_dirs, dependencies: deps, install: true, link_depends: 'fuse_versionscript', -- c_args: [ '-DFUSE_USE_VERSION=35', +- c_args: [ '-DFUSE_USE_VERSION=312', - '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], -+ c_args: [ '-DFUSE_USE_VERSION=35' ], ++ c_args: [ '-DFUSE_USE_VERSION=312' ], link_args: ['-Wl,--version-script,' + meson.current_source_dir() + '/fuse_versionscript' ]) diff --git a/pkgs/os-specific/linux/fuse/fuse3-install.patch b/pkgs/os-specific/linux/fuse/fuse3-install.patch index 147bcb439fb87..769e3088664cd 100644 --- a/pkgs/os-specific/linux/fuse/fuse3-install.patch +++ b/pkgs/os-specific/linux/fuse/fuse3-install.patch @@ -1,18 +1,20 @@ ---- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200 -+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200 -@@ -37,10 +37,10 @@ - fi +--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200 ++++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200 +@@ -39,12 +39,12 @@ - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ + if [ "${udevrulesdir}" != "" ]; then + install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}${udevrulesdir}/99-fuse3.rules" + "${sysconfdir}${udevrulesdir}/99-fuse3.rules" + fi - install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ -- "${DESTDIR}/etc/init.d/fuse3" -+ "${sysconfdir}/init.d/fuse3" - + if [ "$initscriptdir" != "" ]; then + install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \ +- "${DESTDIR}${initscriptdir}/fuse3" ++ "${sysconfdir}${initscriptdir}/fuse3" - if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then + /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true diff --git a/util/meson.build b/util/meson.build index aa0e734..06d4378 100644 --- a/util/meson.build diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index a64a0574d8ffb..5bfdf61dff6ba 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.374"; + version = "0.376"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-RvjYd8iD6JkGhh6TDy/Qo+UzLxbhPvIJvhl/Rw14lbk="; + hash = "sha256-M1uBamN09XepOembDAcHXO/UvnM9s/OiN+eNzChF5Tw="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 9d2848556eaf2..b82484514e5f7 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -2,31 +2,18 @@ , autoreconfHook, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , nftablesCompat ? true -, fetchpatch +, gitUpdater }: stdenv.mkDerivation rec { - version = "1.8.9"; + version = "1.8.10"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - sha256 = "72Y5pDvoMlpPjqaBI/+sI2y2lujHhQG2ToEGr7AIyH8="; + sha256 = "XMJVwYk1bjF9BwdVzpNx62Oht4PDRJj7jDAmTzzFnJw="; }; - patches = [ - (fetchpatch { - name = "format-security.patch"; - url = "https://git.netfilter.org/iptables/patch/?id=ed4082a7405a5838c205a34c1559e289949200cc"; - sha256 = "OdytFmHk+3Awu+sDQpGTl5/qip4doRblmW2vQzfNZiU="; - }) - (fetchurl { - name = "static.patch"; - url = "https://lore.kernel.org/netfilter-devel/20230402232939.1060151-1-hi@alyssa.is/raw"; - sha256 = "PkH+1HbJjBb3//ffBe0XUQok1lBwgj/STL8Ppu/28f4="; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ @@ -35,10 +22,6 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ]; - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl" - ''; - configureFlags = [ "--enable-bpf-compiler" "--enable-devel" @@ -47,6 +30,8 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optional (!nftablesCompat) "--disable-nftables"; + enableParallelBuilding = true; + postInstall = lib.optionalString nftablesCompat '' rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} ln -sv xtables-nft-multi $out/bin/iptables @@ -57,6 +42,13 @@ stdenv.mkDerivation rec { ln -sv xtables-nft-multi $out/bin/ip6tables-save ''; + passthru = { + updateScript = gitUpdater { + url = "https://git.netfilter.org/iptables"; + rev-prefix = "v"; + }; + }; + meta = with lib; { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = "https://www.netfilter.org/projects/iptables/index.html"; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 585c1661b8afb..df19771501369 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index ff40e585b1d8d..e0a3c4319b8b0 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -119,7 +119,10 @@ in { hash = "sha256-eldLvCCALqdrUsp/rwcmf3IEXoYbGJFcUnKpjCer+IQ="; }; patches = [ - ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms + + # Fix regression turning `struct sockaddr_ll` flexible size. + ./revert-af_packet-flex.patch ]; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch b/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch new file mode 100644 index 0000000000000..ed6c8861d2fb4 --- /dev/null +++ b/pkgs/os-specific/linux/kernel-headers/revert-af_packet-flex.patch @@ -0,0 +1,31 @@ +Revert commit https://github.com/torvalds/linux/commit/a0ade8404c3bc2bf2631cb0f20d372eed22d9d96 + +The change caused API regression by turning fixed size struct to +flexible size struct. It was an unintentional change, broke `udp2raw`: + https://github.com/NixOS/nixpkgs/pull/252587#issuecomment-1744427473 +--- a/include/uapi/linux/if_packet.h ++++ b/include/uapi/linux/if_packet.h +@@ -18,11 +18,7 @@ struct sockaddr_ll { + unsigned short sll_hatype; + unsigned char sll_pkttype; + unsigned char sll_halen; +- union { +- unsigned char sll_addr[8]; +- /* Actual length is in sll_halen. */ +- __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); +- }; ++ unsigned char sll_addr[8]; + }; + + /* Packet types */ +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -3607,7 +3607,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, + if (dev) { + sll->sll_hatype = dev->type; + sll->sll_halen = dev->addr_len; +- memcpy(sll->sll_addr_flex, dev->dev_addr, dev->addr_len); ++ memcpy(sll->sll_addr, dev->dev_addr, dev->addr_len); + } else { + sll->sll_hatype = 0; /* Bad: we have no ARPHRD_UNSPEC */ + sll->sll_halen = 0; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1ce9aa72a4841..2954ee8f78b90 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -845,6 +845,8 @@ let CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; + FSCACHE_STATS = yes; + DVB_DYNAMIC_MINORS = option yes; # we use udev EFI_STUB = yes; # EFI bootloader in the bzImage itself diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 74c47db625618..df67005dd8165 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -135,8 +135,6 @@ let platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig; - # e.g. "bzImage" - kernelTarget = stdenv.hostPlatform.linux-kernel.target; makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags ++ extraMakeFlags; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5201a4248f853..8b63f91f571ab 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,42 +1,38 @@ { "testing": { - "version": "6.7-rc1", - "hash": "sha256:1a071vvmm08sp48d0arqzcmqnz5xdb1vflfhxcqwmpzaabjrgadk" + "version": "6.7-rc2", + "hash": "sha256:026aqfblls4zl2j8rpnl7rjh9ma82jlwb6x00jryvv44kvwm0fgs" }, "6.5": { - "version": "6.5.11", - "hash": "sha256:06dmb4hbwrms0lp4axphwgj8wbnzsym70sx55lxr501b53wlmqif" - }, - "6.4": { - "version": "6.4.16", - "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" + "version": "6.5.12", + "hash": "sha256:17rmkzxszp2jg1zx2mmdcy30ffrsd0qms513sxd14klp5k9w2saa" }, "6.1": { - "version": "6.1.62", - "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" + "version": "6.1.63", + "hash": "sha256:13bmy22mi4ybl21kr3hdy6qiaawiqz2jgl2gl9hwqkyx04xh97f2" }, "5.15": { - "version": "5.15.138", - "hash": "sha256:1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g" + "version": "5.15.139", + "hash": "sha256:0kh4v1224a7p7ib64pnmc1qid3d1lvg3c14l5s4rpr8qzq6w2s4w" }, "5.10": { - "version": "5.10.200", - "hash": "sha256:012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx" + "version": "5.10.201", + "hash": "sha256:0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a" }, "5.4": { - "version": "5.4.260", - "hash": "sha256:1zpbaipd2j3idj8h9iznlj0ywcq5nkhwj707a1f9ixf82h3q4c4q" + "version": "5.4.261", + "hash": "sha256:1hsgnv2vcziflhzrrxiny2yp88ybdqda48fm60xhpaphhs0cgfii" }, "4.19": { - "version": "4.19.298", - "hash": "sha256:0mhgq6hdcls1af7nj999x1mds5b37s7vwin8nsb4q0lnx2y1da4x" + "version": "4.19.299", + "hash": "sha256:12p431p2jqjfsf0all3fgn47z9fr2cdqyxipfrf4s4mlw4hpbyy6" }, "4.14": { - "version": "4.14.329", - "hash": "sha256:1dvb4xf0b7snabznl7bg7gga7ffdmywy8vr8q65pzl9yf6fnhdny" + "version": "4.14.330", + "hash": "sha256:0rwgzyfmrns6zir0dpxkwz2hm3z8c0af3wy11lmxamaa5i2wq3k7" }, "6.6": { - "version": "6.6.1", - "hash": "sha256:0d42b1hbvv9w3y3q4wydr6il0g5a823n54a06p4p5vcpgkadf7ns" + "version": "6.6.2", + "hash": "sha256:0zmpk5ls6282j88xpnymkr8z5hxpk2495hjjxm0jmb6ninnzdm3k" } } diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 0763ffda26b99..c58c4e67e4d0c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -6,27 +6,32 @@ # bcachefs-tools stores the expected-revision in: # https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision # but this does not means that it'll be the latest-compatible revision -, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832" -, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw=" +, currentCommit ? "4d2faeb4fb58c389dc9f76b8d5ae991ef4497e04" +, diffHash ? "sha256-DtMc8P4lTRzvS6PVvD7WtWEPsfnxIXSpqMsKKWs+edI=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... } @ args: - # NOTE: bcachefs-tools should be updated simultaneously to preserve compatibility (kernel.override ( args // { - version = "${kernel.version}-bcachefs-unstable-${commitDate}"; - extraMeta = { - branch = "master"; - broken = stdenv.isAarch64; - maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius ]; - }; + argsOverride = { + version = "${kernel.version}-bcachefs-unstable-${commitDate}"; + modDirVersion = kernel.modDirVersion; + + extraMeta = { + homepage = "https://bcachefs.org/"; + branch = "master"; + maintainers = with lib.maintainers; [ davidak Madouura pedrohlc raitobezarius YellowOnion ]; + }; + } // argsOverride; structuredExtraConfig = with lib.kernel; { BCACHEFS_FS = module; BCACHEFS_QUOTA = option yes; BCACHEFS_POSIX_ACL = option yes; + # useful for bug reports + FTRACE = option yes; }; kernelPatches = [ { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d5b67b5efbe3c..2ba31fbc97892 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod +, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, kmod, ubootTools , fetchpatch }: @@ -120,10 +120,6 @@ let # Ensure that depmod gets resolved through PATH sed -i Makefile -e 's|= /sbin/depmod|= depmod|' - # fixup for pre-5.4 kernels using the $(cd $foo && /bin/pwd) pattern - # FIXME: remove when no longer needed - substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd - # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. # This way kernels can be bit-by-bit reproducible depending on settings # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). @@ -368,8 +364,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ] - ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal kmod ubootTools ] ++ optional (lib.versionOlder version "5.8") libelf ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 82b17d461d2b7..4f967734d5e0e 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,6 +2,9 @@ let # These names are how they are designated in https://xanmod.org. + + # 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.62"; hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw="; @@ -26,21 +29,10 @@ let }; structuredExtraConfig = with lib.kernel; { - # AMD P-state driver - X86_AMD_PSTATE = lib.mkOverride 60 yes; - # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; - - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - # WineSync driver for fast kernel-backed Wine WINESYNC = module; @@ -52,7 +44,7 @@ let extraMeta = { branch = lib.versions.majorMinor version; - maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 zzzsy ]; + maintainers = with lib.maintainers; [ moni lovesegfault atemu shawn8901 zzzsy ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 5e949a6f461ec..456a6c7c27dd5 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,8 +12,8 @@ let # ./update-zen.py lqx lqxVariant = { version = "6.5.11"; #lqx - suffix = "lqx1"; #lqx - sha256 = "02k4cfiygrfgyp3x6ivr7h6klknjzd5cwpszjnzcy2jc547512pd"; #lqx + suffix = "lqx2"; #lqx + sha256 = "0rak2ald95bwb5qlp8pf2g93a0gkv8rypiv5s8dpds3cilwmxrg9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 0843ca3556aea..3f971e7a6edb3 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "30"; + version = "31"; # autogen.sh is missing from the release tarball, # and we need to run it to regenerate gtk_doc.make, @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/.gitignore?id=61a93a043aa52ad62a11ba940d4ba93cb3254e78 src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/snapshot/kmod-${version}.tar.gz"; - sha256 = "sha256-/dih2LoqgRrAsVdHRwld28T8pXgqnzapnQhqkXnxbbc="; + hash = "sha256-FNR015/AoYBbi7Eb1M2TXH3yxUuddKICCu+ot10CdeQ="; }; outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index c489e746886fd..de51beb2cc180 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20230808"; + version = "20231114"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-xyb4FUV7vG2YSuN4H6eBaf8c4At70NZiUuepbgg2HNg="; + hash = "sha256-cZ7APDjwjarPCzk1HWxqIXdGwNOl6HG0KSCtffmEhx0="; }; nativeBuildInputs = [ iucode-tool libarchive ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.intel.com/"; + changelog = "https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/${src.rev}"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix new file mode 100644 index 0000000000000..6e29e27ccbf20 --- /dev/null +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, kernel, kmod, mstflint }: + +stdenv.mkDerivation rec { + pname = "mstflint_access"; + inherit (mstflint) version; + + src = fetchurl { + url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz"; + hash = "sha256-rfZts0m8x6clVazpbAa2xK+dYgRU9Us5rbcWa0uHJ1M="; + }; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "KVER=${kernel.modDirVersion}" + "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + enableParallelBuilding = true; + + preConfigure = lib.optionals (lib.versionAtLeast kernel.version "6.4") '' + sed -i "s/class_create(THIS_MODULE, dev->name)/class_create(dev->name)/g" mst_main.c + ''; + + installPhase = '' + runHook preInstall + + install -D ${pname}.ko $out/lib/modules/${kernel.modDirVersion}/extra/${pname}.ko + + runHook postInstall + ''; + + meta = with lib; { + description = "A kernel module for Nvidia NIC firmware update"; + homepage = "https://github.com/Mellanox/mstflint"; + license = [ licenses.gpl2Only ]; + maintainers = with maintainers; [ thillux ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/os-specific/linux/nmon/default.nix index 768e8e43edc95..30285f9c5b254 100644 --- a/pkgs/os-specific/linux/nmon/default.nix +++ b/pkgs/os-specific/linux/nmon/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; dontUnpack = true; buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ - with stdenv.targetPlatform; + with stdenv.hostPlatform; if isx86 then "X86" else if isAarch then "ARM" else if isPower then "POWER" diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index ad0138f18b751..f4995264b09ed 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -16,12 +16,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://github.com/intel/numatop/pull/54.patch"; + # https://github.com/intel/numatop/pull/54 + url = "https://github.com/intel/numatop/compare/eab0ac5253c5843aa0f0ac36e2eec7612207711b...c1001fd926c24eae2d40729492e07270ce133b72.patch"; sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; name = "fix-string-operations.patch"; }) (fetchpatch { - url = "https://github.com/intel/numatop/pull/64.patch"; + # https://github.com/intel/numatop/pull/64 + url = "https://github.com/intel/numatop/commit/635e2ce2ccb1ac793cc276a7fcb8a92b1ffefa5d.patch"; sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; name = "fix-format-strings-mvwprintw.patch"; }) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b7824f209776e..fbb116ab42adc 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup unpackManually() { diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index a6795c3fd5e77..0625985c908fe 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , kernel , nvidia_x11 , hash @@ -18,6 +19,13 @@ stdenv.mkDerivation ({ inherit hash; }; + patches = lib.optionals (nvidia_x11.version == "545.29.02")[ + (fetchpatch { + url = "https://github.com/NVIDIA/open-gpu-kernel-modules/files/13310810/0001-nvkms-initialize-brightnessType-in-_BACKLIGHT_BRIGHT.patch.txt"; + hash = "sha256-9N+DbyT4VmGNTHXWf23PJU4YWZS+0JK7yqkmkpnINPk="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 34f9b15794557..ed2c60da26121 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir -p $out/lib diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index b16bebbe3d606..a35f40be59550 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext, audit, libxcrypt +{ lib, stdenv, buildPackages, fetchurl +, fetchpatch +, flex, cracklib, db4, gettext, audit, libxcrypt , nixosTests +, autoreconfHook269, pkg-config-unwrapped }: stdenv.mkDerivation rec { @@ -11,12 +14,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; - patches = [ ./suid-wrapper-path.patch ]; + patches = [ + ./suid-wrapper-path.patch + # Pull support for localization on non-default --prefix: + # https://github.com/NixOS/nixpkgs/issues/249010 + # https://github.com/linux-pam/linux-pam/pull/604 + (fetchpatch { + name = "bind-locales.patch"; + url = "https://github.com/linux-pam/linux-pam/commit/77bd338125cde583ecdfb9fd69619bcd2baf15c2.patch"; + hash = "sha256-tlc9RcLZpEH315NFD4sdN9yOco8qhC6+bszl4OHm+AI="; + }) + ]; outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ flex ] + # autoreconfHook269 is needed for `suid-wrapper-path.patch` and + # `bind-locales.patch` above. + # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` + nativeBuildInputs = [ flex autoreconfHook269 pkg-config-unwrapped ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; buildInputs = [ cracklib db4 libxcrypt ] diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch index 71533c51a1902..a427ccf388162 100644 --- a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch +++ b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -1,6 +1,6 @@ It needs the SUID version during runtime, and that can't be in /nix/store/** ---- a/modules/pam_unix/Makefile.in -+++ b/modules/pam_unix/Makefile.in -@@ -651 +651 @@ +--- a/modules/pam_unix/Makefile.am ++++ b/modules/pam_unix/Makefile.am +@@ -21 +21 @@ - -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ + -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 8970f7ed62859..0a7e02f4ad819 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { patches = [ # fix with openssl 3.x + # https://github.com/OpenSC/pam_p11/pull/22 (fetchpatch { - url = "https://github.com/OpenSC/pam_p11/pull/22.patch"; + name = "OpenSC-pam_p11-pull-22.patch"; + url = "https://github.com/OpenSC/pam_p11/compare/cd4eba2e921e1c2f93cde71922a76af99376246c...debd4f7acfaf998cfe4002e0be5c35ad9a9591b5.patch"; excludes = [ ".github/build.sh" ]; hash = "sha256-bm/agnBgvrr8L8yoGK4gzBqOGgsNWf9NIgcNJG7proE="; }) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index e1f88469e04f2..314a95bd55483 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.1.0-54729"; + version = "19.1.1-54734"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-Qo/6EuILu5i3hjhxecf3qfoMFEJHJZVY19tDIXDJiag="; + hash = "sha256-02YxBkV9pZGfXuK6GvUDTgE9U5H2MOMk24h9qGJdFTM="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 67b839a1bd367..56a92ffa44ef6 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-RRiz56r9NOwH0AY9JQ/UdJmbILIAIYw65W9dIRPxQbQ="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + ./v3-CVE-2023-4016.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # NOTE: Starting from 4.x we will not need a patch anymore, but need to add # "--disable-w" to configureFlags instead to prevent the utmp errors (fetchpatch { diff --git a/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch b/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch new file mode 100644 index 0000000000000..2e260eaf7382a --- /dev/null +++ b/pkgs/os-specific/linux/procps-ng/v3-CVE-2023-4016.patch @@ -0,0 +1,63 @@ +This is https://gitlab.com/procps-ng/procps/-/commit/2c933ecba3bb1d3041a5a7a53a7b4078a6003413.diff +back-ported to procps 3.3.17. That commit changes xmalloc to xcalloc. This patch differs in two ways: + +* We modify it to change malloc (no x-) to xcalloc instead +* We pull in procps-4's definition of xcalloc + +Alternative considered: Also pull in commits that changed malloc to xmalloc and defined xcalloc. +This alternative is rejected because those commits contain many other unrelated changes. + +diff --git a/ps/parser.c b/ps/parser.c +index 4263a1fb..ee9a57d9 100644 +--- a/ps/parser.c ++++ b/ps/parser.c +@@ -36,6 +36,14 @@ + #include "common.h" + #include "c.h" + ++static void *xxcalloc(const size_t nelems, const size_t size) ++{ ++ void *ret = calloc(nelems, size); ++ if (!ret && size && nelems) ++ xerrx(EXIT_FAILURE, "cannot allocate %zu bytes", nelems*size); ++ return ret; ++} ++ + #define ARG_GNU 0 + #define ARG_END 1 + #define ARG_PGRP 2 +@@ -184,7 +192,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + const char *err; /* error code that could or did happen */ + /*** prepare to operate ***/ + node = malloc(sizeof(selection_node)); +- node->u = malloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */ + node->n = 0; + buf = strdup(arg); + /*** sanity check and count items ***/ +@@ -205,6 +212,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s + } while (*++walk); + if(need_item) goto parse_error; + node->n = items; ++ node->u = xxcalloc(items, sizeof(sel_union)); + /*** actually parse the list ***/ + walk = buf; + while(items--){ +@@ -1031,15 +1039,15 @@ static const char *parse_trailing_pids(void){ + thisarg = ps_argc - 1; /* we must be at the end now */ + + pidnode = malloc(sizeof(selection_node)); +- pidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ pidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + pidnode->n = 0; + + grpnode = malloc(sizeof(selection_node)); +- grpnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ grpnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + grpnode->n = 0; + + sidnode = malloc(sizeof(selection_node)); +- sidnode->u = malloc(i*sizeof(sel_union)); /* waste is insignificant */ ++ sidnode->u = xxcalloc(i, sizeof(sel_union)); /* waste is insignificant */ + sidnode->n = 0; + + while(i--){ diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index ecfd6a87e6b47..50793167a3498 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation { pname = "rtl8188eus-aircrack"; - version = "${kernel.version}-unstable-2022-03-19"; + version = "${kernel.version}-unstable-2023-09-21"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8188eus"; - rev = "0958f294f90b49d6bad4972b14f90676e5d858d3"; - sha256 = "sha256-dkCcwvOLxqU1IZ/OXTp67akjWgsaH1Cq4N8d9slMRI8="; + rev = "3fae7237ba121f1169e9a2ea55040dc123697d3b"; + sha256 = "sha256-ILSMEt9nMdg1ZbFeatWm8Yxf6a/E7Vm7KtKhN933KTc="; }; prePatch = '' @@ -18,13 +18,6 @@ stdenv.mkDerivation { --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - patches = [ - (fetchpatch { - url = "https://github.com/aircrack-ng/rtl8188eus/commit/daa3a2e12290050be3af956915939a55aed50d5f.patch"; - hash = "sha256-VsvaAhO74LzqUxbmdDT9qwVl6Y9lXfGfrHHK3SbnOVA="; - }) - ]; - hardeningDisable = [ "pic" ]; enableParallelBuilding = true; @@ -39,7 +32,7 @@ stdenv.mkDerivation { description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support"; homepage = "https://github.com/aircrack-ng/rtl8188eus"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; - broken = (lib.versionAtLeast kernel.version "5.17") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + maintainers = with maintainers; [ moni ]; + broken = (lib.versionAtLeast kernel.version "6.6") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; } diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 9646886a6de17..adc197a1166ec 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "https://github.com/morrownr/8812au-20210629"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 746f9b17a6981..38fec65b33344 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "shadow"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "shadow-maint"; repo = pname; rev = version; - hash = "sha256-zopJevCv7ot8RLp/rSQGKO05eF4FjkLaOEMo9aq9Afo="; + hash = "sha256-DzPPnttnJSOMQwXWyFcz6fEtjwBC3p2PpZpBAQ/Ew18="; }; outputs = [ "out" "su" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 01ec8ce96a03d..62db758c7aa75 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sssd"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "SSSD"; repo = "sssd"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-CxkEyx9X14x8x9tSSN9d0TBTPKJB2Ip7HTL98uqO0J4="; + hash = "sha256-WTVOt2TpTCyMmFYzWJMBQdwgmov7m1Sd8CwyL4ywPUY="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 98adb27d796fc..0311d46d1fc4a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -124,7 +124,7 @@ , withRemote ? !stdenv.hostPlatform.isMusl , withResolved ? true , withShellCompletions ? true -, withSysusers ? false # conflicts with the NixOS user management +, withSysusers ? true , withSysupdate ? true , withTimedated ? true , withTimesyncd ? true @@ -134,6 +134,8 @@ , withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false + # build only libudev and libsystemd +, buildLibsOnly ? false # name argument , pname ? "systemd" @@ -202,6 +204,14 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch + + # Fix for `RuntimeError: ELF .dynamic section is missing.` + # https://github.com/systemd/systemd/issues/29381 + # https://github.com/systemd/systemd/pull/29392 + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/cecbb162a3134b43d2ca160e13198c73ff34c3ef.patch"; + hash = "sha256-hWpUosTDA18mYm5nIb9KnjwOlnzbEHgzha/WpyHoC54="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -372,7 +382,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs tools test src/!(rpm|kernel-install|ukify) src/kernel-install/test-kernel-install.sh ''; - outputs = [ "out" "man" "dev" ]; + outputs = [ "out" "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); nativeBuildInputs = [ @@ -436,7 +446,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ])) ; - #dontAddPrefix = true; + mesonBuildType = "release"; mesonFlags = [ "-Dversion-tag=${version}" @@ -697,7 +707,9 @@ stdenv.mkDerivation (finalAttrs: { export DESTDIR=/ ''; - postInstall = '' + mesonInstallTags = lib.optionals buildLibsOnly [ "devel" "libudev" "libsystemd" ]; + + postInstall = lib.optionalString (!buildLibsOnly) '' mkdir -p $out/example/systemd mv $out/lib/{binfmt.d,sysctl.d,tmpfiles.d} $out/example mv $out/lib/systemd/{system,user} $out/example/systemd @@ -715,8 +727,10 @@ stdenv.mkDerivation (finalAttrs: { find $out -name "*kernel-install*" -exec rm {} \; '' + lib.optionalString (!withDocumentation) '' rm -rf $out/share/doc - '' + lib.optionalString withKmod '' + '' + lib.optionalString (withKmod && !buildLibsOnly) '' mv $out/lib/modules-load.d $out/example + '' + lib.optionalString withSysusers '' + mv $out/lib/sysusers.d $out/example ''; # Avoid *.EFI binary stripping. At least on aarch64-linux strip diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index 381a150066276..f6bb705258f1f 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -1,14 +1,14 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.56"; + version = "2.1.57"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - hash = "sha256-sWLwjfuy9WPnrGK0BxUGnNrhtGDoQyRFMY1OSlyxqs4="; + hash = "sha256-7JRNHKku9zTeSafL327hkM/E5EWTKqwPudCfmngvWuo="; }; propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ]; @@ -18,6 +18,10 @@ python3.pkgs.buildPythonApplication rec { install -D targetclid.8 -t $out/share/man/man8/ ''; + passthru.tests = { + inherit (nixosTests) iscsi-root; + }; + meta = with lib; { description = "A command shell for managing the Linux LIO kernel target"; homepage = "https://github.com/open-iscsi/targetcli-fb"; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index 09a2d8bf638d1..e0ab2b2802f1a 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "trinity"; - version = "1.9"; + version = "1.9-unstable-2023-07-10"; src = fetchFromGitHub { owner = "kernelslacker"; repo = "trinity"; - rev = "v${version}"; - sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; + rev = "e71872454d26baf37ae1d12e9b04a73d64179555"; + hash = "sha256-Zy+4L1CuB2Ul5iF+AokDkAW1wheDzoCTNkvRZFGRNps="; }; - patches = [ - # Pull upstream fix for -fno-common toolchains - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch"; - sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg"; - }) - ]; - postPatch = '' patchShebangs configure patchShebangs scripts @@ -27,12 +18,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; + installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { description = "A Linux System call fuzz tester"; - homepage = "https://codemonkey.org.uk/projects/trinity/"; - license = licenses.gpl2; + homepage = "https://github.com/kernelslacker/trinity"; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 9ce8c102c25a0..5ee485b09cf8a 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -11,12 +11,12 @@ let pname = "uhk-agent"; - version = "3.1.0"; + version = "3.2.1"; 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-KFuB1cbrEDfqeRyrhXZs4ClhdIjZqIT5a+rnvdi3kpA="; + sha256 = "sha256-qAZ92/iN5E+1KGPs6u9Bb6vLfi0Keog/yOcLtnRD7yc="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 20936fa7d4958..cfd94bf33c46a 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "015"; + version = "017"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - sha256 = "sha256-w7RRux9P+fY1bKxaaVaprI6F2BZRr1ainmiflPpv2m4="; + hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch b/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch new file mode 100644 index 0000000000000..068744d4f32d0 --- /dev/null +++ b/pkgs/os-specific/linux/util-linux/bcachefs-patch-set.patch @@ -0,0 +1,277 @@ +commit 68564ebb50f8afab5a9527c534417e247cca0b27 +Author: Filipe Manana <fdmanana@kernel.org> +Date: Thu Aug 17 10:20:13 2023 +0100 + + libmount: Fix regression when mounting with atime + + A regression was introduced in v2.39 that causes mounting with the atime + option to fail: + + $ mkfs.ext4 -F /dev/sdi + $ mount -o atime /dev/sdi /mnt/sdi + mount: /mnt/sdi: not mount point or bad option. + dmesg(1) may have more information after failed mount system call. + + The failure comes from the mount_setattr(2) call returning -EINVAL. This + is because we pass an invalid value for the attr_clr argument. From a + strace capture we have: + + mount_setattr(4, "", AT_EMPTY_PATH, {attr_set=0, attr_clr=MOUNT_ATTR_NOATIME, propagation=0 /* MS_??? */, userns_fd=0}, 32) = -1 EINVAL (Invalid argument) + + We can't pass MOUNT_ATTR_NOATIME to mount_setattr(2) through the attr_clr + argument because all atime options are exclusive, so in order to set atime + one has to pass MOUNT_ATTR__ATIME to attr_clr and leave attr_set as + MOUNT_ATTR_RELATIME (which is defined as a value of 0). + + This can be read from the man page for mount_setattr(2) and also from the + kernel source: + + $ cat fs/namespace.c + static int build_mount_kattr(const struct mount_attr *attr, size_t usize, + struct mount_kattr *kattr, unsigned int flags) + { + (...) + /* + * Since the MOUNT_ATTR_<atime> values are an enum, not a bitmap, + * users wanting to transition to a different atime setting cannot + * simply specify the atime setting in @attr_set, but must also + * specify MOUNT_ATTR__ATIME in the @attr_clr field. + * So ensure that MOUNT_ATTR__ATIME can't be partially set in + * @attr_clr and that @attr_set can't have any atime bits set if + * MOUNT_ATTR__ATIME isn't set in @attr_clr. + */ + if (attr->attr_clr & MOUNT_ATTR__ATIME) { + if ((attr->attr_clr & MOUNT_ATTR__ATIME) != MOUNT_ATTR__ATIME) + return -EINVAL; + + /* + * Clear all previous time settings as they are mutually + * exclusive. + */ + kattr->attr_clr |= MNT_RELATIME | MNT_NOATIME; + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: + kattr->attr_set |= MNT_RELATIME; + break; + case MOUNT_ATTR_NOATIME: + kattr->attr_set |= MNT_NOATIME; + break; + case MOUNT_ATTR_STRICTATIME: + break; + default: + return -EINVAL; + } + (...) + + So fix this by setting attr_clr MOUNT_ATTR__ATIME if we want to clear any + atime related option. + + Signed-off-by: Filipe Manana <fdmanana@kernel.org> + +diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c +index 1e962ec6d..0702adae7 100644 +--- a/libmount/src/optlist.c ++++ b/libmount/src/optlist.c +@@ -875,7 +875,18 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl + + if (opt->ent->mask & MNT_INVERT) { + DBG(OPTLIST, ul_debugobj(ls, " clr: %s", opt->ent->name)); +- *clr |= x; ++ /* ++ * All atime settings are mutually exclusive so *clr must ++ * have MOUNT_ATTR__ATIME set. ++ * ++ * See the function fs/namespace.c:build_mount_kattr() ++ * in the linux kernel source. ++ */ ++ if (x == MOUNT_ATTR_RELATIME || x == MOUNT_ATTR_NOATIME || ++ x == MOUNT_ATTR_STRICTATIME) ++ *clr |= MOUNT_ATTR__ATIME; ++ else ++ *clr |= x; + } else { + DBG(OPTLIST, ul_debugobj(ls, " set: %s", opt->ent->name)); + *set |= x; +diff --git a/tests/expected/libmount/context-mount-flags b/tests/expected/libmount/context-mount-flags +index 960641863..eb71323dd 100644 +--- a/tests/expected/libmount/context-mount-flags ++++ b/tests/expected/libmount/context-mount-flags +@@ -3,3 +3,6 @@ ro,nosuid,noexec + successfully mounted + rw,nosuid,noexec + successfully umounted ++successfully mounted ++rw,relatime ++successfully umounted +diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context +index f5b47185e..a5d2e81a3 100755 +--- a/tests/ts/libmount/context ++++ b/tests/ts/libmount/context +@@ -116,8 +116,15 @@ $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPU + + ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG +-ts_finalize_subtest + ++# Test that the atime option works after the migration to use the new kernel mount APIs. ++ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ++ ++ts_finalize_subtest + + ts_init_subtest "mount-loopdev" + mkdir -p $MOUNTPOINT &> /dev/null + +commit 1ec71634aa4ef5ddca23d65c8a296f3614231e8a +Author: Colin Gillespie <colin@cgillespie.xyz> +Date: Wed Aug 9 18:28:07 2023 +1000 + + libblkid: (bcachefs) fix not detecting large superblocks + + Probing does not detect bcachefs filesystems with a superblock larger + than 4KiB. Bcachefs superblocks grow in size and can become much larger + than this. + + Increase the superblock maximum size limit to 1MiB. + + Validate the superblock isn't larger than the maximum size defined in + the superblocks layout section. + + (cherry picked from commit 48d573797797650d96456979797c0155d58f61cb) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 40e702d75..236877042 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -102,6 +102,15 @@ union bcachefs_sb_csum { + uint8_t raw[16]; + } __attribute__((packed)); + ++struct bcachefs_sb_layout { ++ uint8_t magic[16]; ++ uint8_t layout_type; ++ uint8_t sb_max_size_bits; ++ uint8_t nr_superblocks; ++ uint8_t pad[5]; ++ uint64_t sb_offset[61]; ++} __attribute__((packed)); ++ + struct bcachefs_super_block { + union bcachefs_sb_csum csum; + uint16_t version; +@@ -123,7 +132,7 @@ struct bcachefs_super_block { + uint64_t flags[8]; + uint64_t features[2]; + uint64_t compat[2]; +- uint8_t layout[512]; ++ struct bcachefs_sb_layout layout; + struct bcachefs_sb_field _start[]; + } __attribute__((packed)); + +@@ -143,7 +152,7 @@ struct bcachefs_super_block { + /* granularity of offset and length fields within superblock */ + #define BCACHEFS_SECTOR_SIZE 512 + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 4096 ++#define BCACHEFS_SB_MAX_SIZE 0x100000 + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -302,6 +311,9 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); ++ if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ return BLKID_PROBE_NONE; ++ + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + + +commit acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 +Author: Karel Zak <kzak@redhat.com> +Date: Wed Aug 23 11:53:45 2023 +0200 + + libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] + + Addresses: https://github.com/util-linux/util-linux/pull/2427 + Signed-off-by: Karel Zak <kzak@redhat.com> + (cherry picked from commit 17873d38fc97913c0a31d4bd08cfbfe45c4de5be) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 236877042..6ab3fe9d4 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -311,7 +311,7 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits) ++ if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) + return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + +commit 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f +Author: Thomas Weißschuh <thomas@t-8ch.de> +Date: Wed Aug 23 11:58:33 2023 +0200 + + libblkid: (bcachefs) fix size validation + + Avoid signed shift out-of-bounds. + + Also mark the constants explitly as unsigned instead of casting. + + Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> + (cherry picked from commit befe455f59de8c7bc66b85ed52aae8cbc95325fa) + +diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c +index 6ab3fe9d4..28ac4b52b 100644 +--- a/libblkid/src/superblocks/bcache.c ++++ b/libblkid/src/superblocks/bcache.c +@@ -142,17 +142,19 @@ struct bcachefs_super_block { + /* magic string len */ + #define BCACHE_SB_MAGIC_LEN (sizeof(BCACHE_SB_MAGIC) - 1) + /* super block offset */ +-#define BCACHE_SB_OFF 0x1000 ++#define BCACHE_SB_OFF 0x1000U + /* supper block offset in kB */ + #define BCACHE_SB_KBOFF (BCACHE_SB_OFF >> 10) + /* magic string offset within super block */ + #define BCACHE_SB_MAGIC_OFF offsetof(struct bcache_super_block, magic) + /* start of checksummed data within superblock */ +-#define BCACHE_SB_CSUMMED_START 8 ++#define BCACHE_SB_CSUMMED_START 8U + /* granularity of offset and length fields within superblock */ +-#define BCACHEFS_SECTOR_SIZE 512 ++#define BCACHEFS_SECTOR_SIZE 512U ++/* maximum superblock size shift */ ++#define BCACHEFS_SB_MAX_SIZE_SHIFT 0x10U + /* maximum superblock size */ +-#define BCACHEFS_SB_MAX_SIZE 0x100000 ++#define BCACHEFS_SB_MAX_SIZE (1U << BCACHEFS_SB_MAX_SIZE_SHIFT) + /* fields offset within super block */ + #define BCACHEFS_SB_FIELDS_OFF offsetof(struct bcachefs_super_block, _start) + /* tag value for members field */ +@@ -311,12 +313,16 @@ static int probe_bcachefs(blkid_probe pr, const struct blkid_idmag *mag) + return BLKID_PROBE_NONE; + + sb_size = BCACHEFS_SB_FIELDS_OFF + BYTES(bcs); +- if (sb_size > ((uint64_t) BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) +- return BLKID_PROBE_NONE; + + if (sb_size > BCACHEFS_SB_MAX_SIZE) + return BLKID_PROBE_NONE; + ++ if (bcs->layout.sb_max_size_bits > BCACHEFS_SB_MAX_SIZE_SHIFT) ++ return BLKID_PROBE_NONE; ++ ++ if (sb_size > (BCACHEFS_SECTOR_SIZE << bcs->layout.sb_max_size_bits)) ++ return BLKID_PROBE_NONE; ++ + sb = blkid_probe_get_sb_buffer(pr, mag, sb_size); + if (!sb) + return BLKID_PROBE_NONE; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 45c0d57cbff4e..d710fabb7ace0 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch + ./bcachefs-patch-set.patch ]; # We separate some of the utilities into their own outputs. This diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 2c1b4fbb4f4f6..e17fda67218e1 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A kernel module to create V4L2 loopback devices"; homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; platforms = platforms.linux; outputsToInstall = [ "out" ]; }; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 7b7687bc30634..614831c057d2b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - maintainers = with maintainers; [ goibhniu fortuneteller2k ]; + maintainers = with maintainers; [ goibhniu moni ]; description = "Wacom digitizer driver for X11"; homepage = "https://linuxwacom.sourceforge.net"; license = licenses.gpl2Only; diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix index fbd2db4ec3f50..e37c357089f02 100644 --- a/pkgs/servers/bililiverecorder/default.nix +++ b/pkgs/servers/bililiverecorder/default.nix @@ -13,8 +13,8 @@ let aspnetcore_6_0 ]; - version = "2.10.0"; - hash = "sha256-RpcT2zneKbbZieI2Omf+fcfmU7/MnkpYGKhFj9tnKrs="; + version = "2.10.1"; + hash = "sha256-7F/Hgt0p73QY5Sa3MRP//x7EpfcHCbnAPKDf00XzUbw="; in stdenv.mkDerivation { diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index 4a28c4377ff6b..bd4ae38efaa87 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-10-15"; + version = "unstable-2023-10-25"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "67b13c71baea56eeb15532ca1b1377f6da8d18ac"; - hash = "sha256-h885uAuVjpVsp5cAAX9pIxfydcBiajBX3ZSmQUr3/4Q="; + rev = "f4881e72675e87a9eae716436c3ac18a788d596d"; + hash = "sha256-i6HjhGPPXKtQ7hVPECk9gZglFmjb/Fo9pFIq5ikw4Y8="; }; vendorHash = null; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 959b16ceac429..19a0b5e923408 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -6,12 +6,12 @@ , ninja , python3 , perl +, nasm , yasm , nixosTests , darwin , findutils -# currently for BLAKE3 hash function , rustSupport ? true , corrosion @@ -24,19 +24,19 @@ let inherit (llvmPackages) stdenv; mkDerivation = ( if stdenv.isDarwin - then darwin.apple_sdk_11_0.llvmPackages_15.stdenv + then darwin.apple_sdk_11_0.llvmPackages_16.stdenv else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.13.6"; + version = "23.10.3.5"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-lts"; + rev = "v${version}-stable"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-ryUjXN8UNGmkZTkqNHotB4C2E1MHZhx2teqXrlp5ySQ="; + hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -67,7 +67,9 @@ in mkDerivation rec { ninja python3 perl + llvmPackages.lld ] ++ lib.optionals stdenv.isx86_64 [ + nasm yasm ] ++ lib.optionals stdenv.isDarwin [ llvmPackages.bintools @@ -92,17 +94,11 @@ in mkDerivation rec { preBuild = "cd generator"; hash = "sha256-dhUgpwSjE9NZ2mCkhGiydI51LIOClA5wwk1O3mnnbM8="; } else null; - blake3Deps = if rustSupport then rustPlatform.fetchCargoTarball { + rustDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "blake3-deps"; - preBuild = "cd rust/BLAKE3"; - hash = "sha256-lDMmmsyjEbTfI5NgTgT4+8QQrcUE/oUWfFgj1i19W0Q="; - } else null; - skimDeps = if rustSupport then rustPlatform.fetchCargoTarball { - inherit src; - name = "skim-deps"; - preBuild = "cd rust/skim"; - hash = "sha256-gEWB+U8QrM0yYyMXpwocszJZgOemdTlbSzKNkS0NbPk="; + name = "rust-deps"; + preBuild = "cd rust"; + hash = "sha256-fWDAGm19b7uZv8aBdBoieY5c6POd8IxFXbGdtONpZbw="; } else null; dontCargoSetupPostUnpack = true; @@ -117,14 +113,12 @@ in mkDerivation rec { corrosionDepsCopy="$cargoDepsCopy" popd - pushd rust/BLAKE3 - cargoDeps="$blake3Deps" cargoSetupPostUnpackHook - blake3DepsCopy="$cargoDepsCopy" - popd - - pushd rust/skim - cargoDeps="$skimDeps" cargoSetupPostUnpackHook - skimDepsCopy="$cargoDepsCopy" + pushd rust + cargoDeps="$rustDeps" cargoSetupPostUnpackHook + rustDepsCopy="$cargoDepsCopy" + cat .cargo/config >> .cargo/config.toml.in + cat .cargo/config >> skim/.cargo/config.toml.in + rm .cargo/config popd popd @@ -152,15 +146,15 @@ in mkDerivation rec { cargoDepsCopy="$corrosionDepsCopy" cargoSetupPostPatchHook popd - pushd rust/BLAKE3 - cargoDepsCopy="$blake3DepsCopy" cargoSetupPostPatchHook - popd - - pushd rust/skim - cargoDepsCopy="$skimDepsCopy" cargoSetupPostPatchHook + pushd rust + cargoDepsCopy="$rustDepsCopy" cargoSetupPostPatchHook popd cargoSetupPostPatchHook() { true; } + '' + lib.optionalString stdenv.isDarwin '' + # Make sure Darwin invokes lld.ld64 not lld. + substituteInPlace cmake/tools.cmake \ + --replace '--ld-path=''${LLD_PATH}' '-fuse-ld=lld' ''; cmakeFlags = [ @@ -169,6 +163,12 @@ in mkDerivation rec { "-DENABLE_EMBEDDED_COMPILER=ON" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and + # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. + NIX_CFLAGS_COMPILE = "-Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; + }; + # https://github.com/ClickHouse/ClickHouse/issues/49988 hardeningDisable = [ "fortify" ]; diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch deleted file mode 100644 index ec726c68d438d..0000000000000 --- a/pkgs/servers/code-server/build-vscode-nogit.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh -index a72549fb..3aed1ad5 100755 ---- a/ci/build/build-vscode.sh -+++ b/ci/build/build-vscode.sh -@@ -58,7 +58,6 @@ main() { - # telemetry available; telemetry can still be disabled by flag or setting). - # This needs to be done before building as Code will read this file and embed - # it into the client-side code. -- git checkout product.json # Reset in case the script exited early. - cp product.json product.original.json # Since jq has no inline edit. - jq --slurp '.[0] * .[1]' product.original.json <( - cat << EOF -@@ -105,7 +104,6 @@ EOF - # Reset so if you develop after building you will not be stuck with the wrong - # commit (the dev client will use `oss-dev` but the dev server will still use - # product.json which will have `stable-$commit`). -- git checkout product.json - - popd - diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix deleted file mode 100644 index 0c5cb23108520..0000000000000 --- a/pkgs/servers/code-server/default.nix +++ /dev/null @@ -1,327 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildGoModule -, makeWrapper -, cacert -, moreutils -, jq -, git -, rsync -, pkg-config -, yarn -, python3 -, esbuild -, nodejs -, node-gyp -, libsecret -, xorg -, ripgrep -, AppKit -, Cocoa -, CoreServices -, Security -, cctools -, xcbuild -, quilt -, nixosTests -}: - -let - system = stdenv.hostPlatform.system; - - python = python3; - yarn' = yarn.override { inherit nodejs; }; - defaultYarnOpts = [ ]; - - esbuild' = esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.16.17"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - }; - - # replaces esbuild's download script with a binary from nixpkgs - patchEsbuild = path: version: '' - mkdir -p ${path}/node_modules/esbuild/bin - jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild - ''; - - # Comment from @code-asher, the code-server maintainer - # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617 - # - # If the commit is missing it will break display languages (Japanese, Spanish, - # etc). For some reason VS Code has a hard dependency on the commit being set - # for that functionality. - # The commit is also used in cache busting. Without the commit you could run - # into issues where the browser is loading old versions of assets from the - # cache. - # Lastly, it can be helpful for the commit to be accurate in bug reports - # especially when they are built outside of our CI as sometimes the version - # numbers can be unreliable (since they are arbitrarily provided). - # - # To compute the commit when upgrading this derivation, do: - # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src` - # Example: `$ git rev-parse v4.16.1` - commit = "94ef3776ad7bebfb5780dfc9632e04d20d5c9a6c"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "code-server"; - version = "4.16.1"; - - src = fetchFromGitHub { - owner = "coder"; - repo = "code-server"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-h4AooHHKV/EfN2S1z7CQKqnYW3uA3sKhSW4senlzjxI="; - }; - - yarnCache = stdenv.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache"; - inherit (finalAttrs) src; - - nativeBuildInputs = [ yarn' git cacert ]; - - buildPhase = '' - runHook preBuild - - export HOME=$PWD - export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt" - - yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile - - yarn config set yarn-offline-mirror $out - find "$PWD" -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --frozen-lockfile --ignore-scripts --ignore-platform \ - --ignore-engines --no-progress --non-interactive - - find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --ignore-scripts --ignore-engines - - runHook postBuild - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-vkju+oxEYrEXFAnjz/Mf1g0ZhxBALLAaRuWE0swSWwM="; - }; - - nativeBuildInputs = [ - nodejs - yarn' - python - pkg-config - makeWrapper - git - rsync - jq - moreutils - quilt - ]; - - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ (with xorg; [ libX11 libxkbfile ]) - ++ lib.optionals stdenv.isDarwin [ - AppKit - Cocoa - CoreServices - Security - cctools - xcbuild - ]; - - patches = [ - # Remove all git calls from the VS Code build script except `git rev-parse - # HEAD` which is replaced in postPatch with the commit. - ./build-vscode-nogit.patch - ]; - - postPatch = '' - export HOME=$PWD - - patchShebangs ./ci - - # inject git commit - substituteInPlace ./ci/build/build-vscode.sh \ - --replace '$(git rev-parse HEAD)' "${commit}" - substituteInPlace ./ci/build/build-release.sh \ - --replace '$(git rev-parse HEAD)' "${commit}" - ''; - - configurePhase = '' - runHook preConfigure - - # run yarn offline by default - echo '--install.offline true' >> .yarnrc - - # set default yarn opts - ${lib.concatMapStrings (option: '' - yarn --offline config set ${option} - '') defaultYarnOpts} - - # set offline mirror to yarn cache we created in previous steps - yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}" - - # skip unnecessary electron download - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - - # set nodedir to prevent node-gyp from downloading headers - # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific - 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} - - # use updated node-gyp. fixes the following error on Darwin: - # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil' - export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - # install code-server dependencies - yarn --offline --ignore-scripts - - # apply patches - quilt push -a - - # patch shebangs of everything to allow binary packages to build - patchShebangs . - - export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 - export SKIP_SUBMODULE_DEPS=1 - export NODE_OPTIONS=--openssl-legacy-provider - - # rebuild binary packages now that scripts have been patched - echo "----- NPM rebuild" - npm rebuild --prefer-offline - - # Replicate ci/dev/postinstall.sh - echo "----- Replicate ci/dev/postinstall.sh" - yarn --cwd "./vendor" install --modules-folder modules --offline --ignore-scripts --frozen-lockfile - - # remove all built-in extensions, as these are 3rd party extensions that - # get downloaded from vscode marketplace - jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <( - cat << EOF - { - "builtInExtensions": [] - } - EOF - ) | sponge ./lib/vscode/product.json - - # disable automatic updates - sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ - lib/vscode/src/vs/platform/update/common/update.config.contribution.ts - - # Patch out remote download of nodejs from build script - patch -p1 -i ${./remove-node-download.patch} - - # Fetch packages for vscode - find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} yarn --cwd {} \ - --frozen-lockfile --ignore-scripts --ignore-engines - - # patch shebangs of everything to allow binary packages to build - patchShebangs . - - ${patchEsbuild "./lib/vscode/build" "0.12.6"} - ${patchEsbuild "./lib/vscode/extensions" "0.11.23"} - '' + lib.optionalString stdenv.isDarwin '' - # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+ - # (see issue #101229) - pushd ./lib/vscode/remote/node_modules/@parcel/watcher - mkdir -p ./build/Release - mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node - jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json - popd - '' + '' - - # put ripgrep binary into bin, so postinstall does not try to download it - find -name ripgrep -type d \ - -execdir mkdir -p {}/bin \; \ - -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; - - # run postinstall scripts after patching - find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \ - -and -type f -name "yarn.lock" -printf "%h\n" | \ - xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true' - - # build code-server - yarn build - - # build vscode - VERSION=${finalAttrs.version} yarn build:vscode - - # inject version into package.json - jq --slurp '.[0] * .[1]' ./package.json <( - cat << EOF - { - "version": "${finalAttrs.version}" - } - EOF - ) | sponge ./package.json - - # create release - yarn release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/libexec/code-server $out/bin - - # copy release to libexec path - cp -R -T release "$out/libexec/code-server" - - # install only production dependencies - yarn --offline --cwd "$out/libexec/code-server" --production - - # create wrapper - makeWrapper "${nodejs}/bin/node" "$out/bin/code-server" \ - --add-flags "$out/libexec/code-server/out/node/entry.js" - - runHook postInstall - ''; - - passthru = { - prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: { - outputHash = lib.fakeSha256; - }); - tests = { - inherit (nixosTests) code-server; - }; - # vscode-with-extensions compatibility - executableName = "code-server"; - longName = "Visual Studio Code Server"; - }; - - meta = { - description = "Run VS Code on a remote server"; - longDescription = '' - code-server is VS Code running on a remote server, accessible through the - browser. - ''; - homepage = "https://github.com/coder/code-server"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ offline henkery code-asher ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - mainProgram = "code-server"; - }; -}) diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch deleted file mode 100644 index 95a74748189d9..0000000000000 --- a/pkgs/servers/code-server/playwright.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -+++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -@@ -14,6 +14,4 @@ - * limitations under the License. - */ - --const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); -- --installDefaultBrowsersForNpmInstall(); -+process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/code-server/remove-node-download.patch b/pkgs/servers/code-server/remove-node-download.patch deleted file mode 100644 index d19d4a2b5bf78..0000000000000 --- a/pkgs/servers/code-server/remove-node-download.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./lib/vscode/build/gulpfile.reh.js -+++ ./lib/vscode/build/gulpfile.reh.js -@@ -268,9 +268,6 @@ - .pipe(util.stripSourceMappingURL()) - .pipe(jsFilter.restore); - -- const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`; -- const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true }); -- - let web = []; - if (type === 'reh-web') { - web = [ -@@ -287,7 +284,6 @@ - license, - sources, - deps, -- node, - ...web - ); - -@@ -385,7 +381,6 @@ - const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`; - - const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series( -- gulp.task(`node-${platform}-${arch}`), - util.rimraf(path.join(BUILD_ROOT, destinationFolderName)), - packageTask(type, platform, arch, sourceFolderName, destinationFolderName) - )); diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix index a5806a20d4113..1d15bddc09f7e 100644 --- a/pkgs/servers/dante/default.nix +++ b/pkgs/servers/dante/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = if !stdenv.isDarwin then [ "--with-libc=libc.so.6" ] - else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ]; + else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ]; dontAddDisableDepTrack = stdenv.isDarwin; diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/servers/db-rest/default.nix new file mode 100644 index 0000000000000..7fda8f978f1d4 --- /dev/null +++ b/pkgs/servers/db-rest/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nodejs_18 +, nix-update-script +, fetchpatch +}: +buildNpmPackage rec { + pname = "db-rest"; + version = "6.0.3"; + + nodejs = nodejs_18; + + src = fetchFromGitHub { + owner = "derhuerst"; + repo = pname; + rev = version; + hash = "sha256-kHT8/8ivqcP6YRBvkZ4jpJ/xBMM1PddLgV1Z/MFmSTM="; + }; + + patches = [ + # add files and bin property to package.json + # keep until https://github.com/derhuerst/db-rest/pull/37 is merged and released + (fetchpatch { + url = "https://github.com/derhuerst/db-rest/commit/7d2c8bebdd5e8152b181748e3c36683ecf9e71c9.patch"; + hash = "sha256-KyNcvSJLQrX8BO/4814wefeeC+s0pvM2ng44q6diU24="; + }) + ]; + + npmDepsHash = "sha256-d/Qs194TU4ooy6GsBsZhrf5H1iPCUnlieBgtuqfAtkQ="; + + preConfigure = '' + patchShebangs ./build/index.js + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A clean REST API wrapping around the Deutsche Bahn API"; + homepage = "https://v6.db.transport.rest/"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ marie ]; + }; +} diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index d722f6beb0ab1..4dfe4b33318c5 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,5 +1,12 @@ -{ lib, buildGoModule, fetchFromGitHub, nix-update-script -, nixosTests, postgresql, postgresqlTestHook }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, nix-update-script +, nixosTests +, postgresql +, postgresqlTestHook +}: buildGoModule rec { pname = "matrix-dendrite"; @@ -44,6 +51,9 @@ buildGoModule rec { rm roomserver/internal/input/input_test.go ''; + # PostgreSQL's request for a shared memory segment exceeded your kernel's SHMALL parameter + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + passthru.tests = { inherit (nixosTests) dendrite; }; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 8df8b1807f093..28fe866dfdcc6 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -83,7 +83,7 @@ unwrapped = stdenv.mkDerivation rec { postInstall = '' rm "$out"/lib/libkres.a rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS - '' + optionalString stdenv.targetPlatform.isLinux '' + '' + optionalString stdenv.hostPlatform.isLinux '' rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 0abc196d8db7e..eab68fb93dbfa 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "6.1"; + version = "6.2"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8="; + sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; }; # utmp.h is deprecated on aarch64-darwin diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index f6c86c06312a3..5e7de83467263 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.11.1"; + version = "0.12.2"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-xPdSwsXjyjodgEHlwl4X32Pb6TniwM9Q+u56xAoY7SQ="; + hash = "sha256-vEjL9pZFBSt32ZqWZGvG112HA5nqkwY6uOQY3hBUWN4="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-qsgrHPQae1+LKF2y6e256ZfYR+a9ffe7oq1W3GJA1do="; + hash = "sha256-ufxedg3SSHqYf5g1GXXSWA0pmb305kpjkjyjwCX126A="; }; vendorHash = null; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index 3ec3c396a7e86..84a8b98b6dfc9 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,47 +1,45 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: -stdenv.mkDerivation rec { +{ lib, maven, fetchFromGitHub, jre, makeWrapper, nix-update-script }: + +maven.buildMavenPackage rec { pname = "h2"; - version = "2.2.220"; + version = "2.2.224"; + + outputs = [ "out" "doc" ]; - src = fetchzip { - url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2023-07-04.zip"; - hash = "sha256-nSOkCZuHcy0GR4SRjx524+MLqxJyO1PRkImPOFR1yts="; + src = fetchFromGitHub { + owner = "h2database"; + repo = "h2database"; + rev = "refs/tags/version-${version}"; + hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g="; }; - outputs = [ "out" "doc" ]; + mvnParameters = "-f h2/pom.xml -DskipTests"; + mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; nativeBuildInputs = [ makeWrapper ]; - installPhase = - let - h2ToolScript = '' - #!/usr/bin/env bash - dir=$(dirname "$0") - - if [ -n "$1" ]; then - ${jre}/bin/java -cp "$dir/h2-${version}.jar:$H2DRIVERS:$CLASSPATH" $1 "''${@:2}" - else - echo "You have to provide the full java class path for the h2 tool you want to run. E.g. 'org.h2.tools.Server'" - fi - ''; - in '' - mkdir -p $out $doc/share/doc/ - cp -R bin $out/ - cp -R docs $doc/share/doc/h2 + installPhase = '' + mkdir -p $out/share/java + install -Dm644 h2/target/h2-${version}.jar $out/share/java - echo '${h2ToolScript}' > $out/bin/h2tool.sh + makeWrapper ${jre}/bin/java $out/bin/h2 \ + --add-flags "-cp \"$out/share/java/h2-${version}.jar:\$H2DRIVERS:\$CLASSPATH\" org.h2.tools.Console" - substituteInPlace $out/bin/h2.sh --replace "java" "${jre}/bin/java" + mkdir -p $doc/share/doc/h2 + cp -r h2/src/docsrc/* $doc/share/doc/h2 + ''; - chmod +x $out/bin/*.sh - ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^version-([0-9.]+)$" ]; + }; meta = with lib; { description = "The Java SQL database"; - homepage = "http://www.h2database.com/html/main.html"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + homepage = "https://h2database.com/html/main.html"; + changelog = "https://h2database.com/html/changelog.html"; license = licenses.mpl20; - platforms = lib.platforms.linux; - maintainers = with maintainers; [ mahe ]; + platforms = lib.platforms.unix; + maintainers = with maintainers; [ mahe anthonyroussel ]; + mainProgram = "h2"; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7b856c0b25358..5c2a067b3f28c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4145,7 +4145,8 @@ subarulink ]; "suez_water" = ps: with ps; [ - ]; # missing inputs: pysuez + pysuez + ]; "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 08d005313915c..04485f013993d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -40,6 +40,16 @@ let }; }); + # https://github.com/home-assistant/core/pull/101913 + aiohttp = super.aiohttp.overridePythonAttrs (old: rec { + version = "3.8.5"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + }; + }); + aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -279,35 +289,6 @@ let }; }); - python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec { - version = "13.15"; - src = fetchFromGitHub { - owner = "python-telegram-bot"; - repo = "python-telegram-bot"; - rev = "v${version}"; - hash = "sha256-EViSjr/nnuJIDTwV8j/O50hJkWV3M5aTNnWyzrinoyg="; - }; - propagatedBuildInputs = [ - self.apscheduler - self.cachetools - self.certifi - self.cryptography - self.decorator - self.future - self.tornado - self.urllib3 - ]; - setupPyGlobalFlags = [ "--with-upstream-urllib3" ]; - postPatch = '' - rm -r telegram/vendor - substituteInPlace requirements.txt \ - --replace "APScheduler==3.6.3" "APScheduler" \ - --replace "cachetools==4.2.2" "cachetools" \ - --replace "tornado==6.1" "tornado" - ''; - doCheck = false; - }); - # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -319,16 +300,6 @@ let }; }); - websockets = super.websockets.overridePythonAttrs (oldAttrs: rec { - version = "11.0.1"; - src = fetchFromGitHub { - owner = "aaugustin"; - repo = "websockets"; - rev = "refs/tags/${version}"; - hash = "sha256-cD8pC7n2OGS8AjG0VdjNXi8jXxvN7yKkadNR0GCqc90="; - }; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -489,7 +460,6 @@ in python.pkgs.buildPythonApplication rec { pytestCheckHook requests-mock respx - stdlib-list syrupy tomli # required through tests/auth/mfa_modules/test_otp.py diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index e4561cdcc3ed5..63cd9558a69dc 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -49,6 +49,10 @@ let # tries to retrieve file from github "test_non_text_stdout_capture" ]; + sma = [ + # missing operating_status attribute in entity + "test_sensor_entities" + ]; vesync = [ # homeassistant.components.vesync:config_validation.py:863 The 'vesync' option has been removed, please remove it from your configuration "test_async_get_config_entry_diagnostics__single_humidifier" @@ -128,6 +132,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ + # pinned version incompatible with urllib3>=2.0 + "telegram_bot" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 87b60d0682c54..650b0c0c6c535 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "evcc"; - version = "0.122.0"; + version = "0.122.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-CgLMDztU5FRqYndNMsncJmc7B5pcBhoO58cVoLGERJM="; + hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; }; - vendorHash = "sha256-rVzogKzURZWQSc8q9VRUKUe/eeo2R1YGbjUDUKm1fOI="; + vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; npmDeps = fetchNpmDeps { inherit src; diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 89058fd2171c5..8713ee3539951 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.36.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-WZ+tyrx4ayFyPmDJq6dGaTRiR6bSQq5k5iOfb+ETe/I="; + hash = "sha256-Q5t3FUT/ukGME+ZJXpLWnii2XCPrBVDAlbjW8FrpOZs="; }; - cargoHash = "sha256-HZiWmqIh21b12DP+hnx1pWBWgSa5j71kp6GCRKGMHv0="; + cargoHash = "sha256-6ybYfeufHr3ulTbKe27CDS5m1mCluPwS/5GYemYXat8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix new file mode 100644 index 0000000000000..3196b24d74856 --- /dev/null +++ b/pkgs/servers/http/jetty/11.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "11.0.18"; + hash = "sha256-HxtO2r6YWo6+MAYUgk7dNSPDqQZoyO9t/8NdI5pPkL4="; +} diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix new file mode 100644 index 0000000000000..4dba445b6b90e --- /dev/null +++ b/pkgs/servers/http/jetty/12.x.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "12.0.3"; + hash = "sha256-Z/jJKKzoqTPZnoFOMwbpSd/Kd1w+rXloKH+aw6aNrKs="; +} diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/common.nix index 1ebd33f51d6f4..83adac4ddd0d3 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,11 +1,15 @@ +{ version, hash }: + { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.2"; + + inherit version; + src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; + inherit hash; }; dontBuild = true; @@ -17,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Web server and javax.servlet container"; - homepage = "https://www.eclipse.org/jetty/"; + homepage = "https://eclipse.dev/jetty/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; - maintainers = with maintainers; [ emmanuelrosa ]; + maintainers = with maintainers; [ emmanuelrosa anthonyroussel ]; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 6194548a6a99d..4ca4bd75d6b6f 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -124,7 +124,11 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optionals stdenv.isDarwin [ + "-Wno-error=deprecated-declarations" + "-Wno-error=gnu-folding-constant" + "-Wno-error=unused-but-set-variable" + ]); configurePlatforms = []; diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 60c6b4caef887..3e3bf55c757e4 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -1,10 +1,9 @@ -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index d334ab6f927f4..de8e225456b42 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup unzip $src diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 4bca9a37a9ce2..5cee9020b8aa9 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "axis2"; - version = "1.7.9"; + version = "1.8.2"; src = fetchurl { - url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; - sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; + url = "mirror://apache/axis/axis2/java/core/${version}/${pname}-${version}-bin.zip"; + hash = "sha256-oilPVFFpl3F61nVDxcYx/bc81FopS5fzoIdXzeP8brk="; }; nativeBuildInputs = [ unzip ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { meta = { description = "Web Services / SOAP / WSDL engine, the successor to the widely used Apache Axis SOAP stack"; + homepage = "https://axis.apache.org/axis2/java/core/"; + changelog = "https://axis.apache.org/axis2/java/core/release-notes/${version}.html"; + maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index ede01d350d4b1..0b1d4115c895a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, nixosTests, testers, jre }: let - common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { + common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; inherit sha256; }; @@ -20,11 +20,19 @@ let mv $out/webapps $webapps/ ''; + passthru.tests = { + inherit (nixosTests) tomcat; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh"; + }; + }; + meta = with lib; { homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ anthonyroussel ]; license = [ licenses.asl20 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; @@ -33,13 +41,13 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.75"; - sha256 = "sha256-VWfKg789z+ns1g3hDsCZFYQ+PsdqUEBeBHCihkGZelk="; + versionMinor = "0.82"; + sha256 = "sha256-xvRGXDUkYaHFYacUPg81Xf0xyTbdsc1XP/PmqMR8bQc="; }; tomcat10 = common { versionMajor = "10"; - versionMinor = "0.27"; - sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc="; + versionMinor = "1.15"; + sha256 = "sha256-cqQW3Dc3sC/1zoidMIGDBNw4G5bnxYvhmHz7U7K6Djg="; }; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 5d1da4c470602..6f75352796cdd 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -5,7 +5,6 @@ , withPHP82 ? false, php82 , withPerl536 ? false, perl536 , withPerl538 ? true, perl538 -, withRuby_3_0 ? false, ruby_3_0 , withRuby_3_1 ? true, ruby_3_1 , withRuby_3_2 ? false, ruby_3_2 , withSSL ? true, openssl ? null @@ -47,7 +46,6 @@ in stdenv.mkDerivation rec { ++ optional withPHP82 php82-unit ++ optional withPerl536 perl536 ++ optional withPerl538 perl538 - ++ optional withRuby_3_0 ruby_3_0 ++ optional withRuby_3_1 ruby_3_1 ++ optional withRuby_3_2 ruby_3_2 ++ optional withSSL openssl; @@ -70,7 +68,6 @@ in stdenv.mkDerivation rec { ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} - ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} ''; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e7df0fb7190f6..c6ae81e77321f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1096"; + version = "0.21.1234"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-j9PQa54Gv6kdCHZ9/WPnKYkxD4N0eu0KtMPpATSYVDo0mP9pXdQxSoCrKdmW2gOveuo5Z/wPW4BB4r3gvFxcOg=="; + hash = "sha512-kI5HxBCx9moxnw90tqRLJ/muULEUOqIGcfWlFmgFwuOsOIoLc3arY1HDjRzeBDLYuz8BiG99lXUeAa5eHB3+Wg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/servers/jellyseerr/default.nix index 3f35cdebabecb..7c361f580d894 100644 --- a/pkgs/servers/jellyseerr/default.nix +++ b/pkgs/servers/jellyseerr/default.nix @@ -1,14 +1,10 @@ { lib -, stdenv , fetchFromGitHub , makeWrapper , mkYarnPackage , nodejs -, sqlite , fetchYarnDeps , python3 -, pkg-config -, glib }: let diff --git a/pkgs/servers/jellyseerr/package.json b/pkgs/servers/jellyseerr/package.json index dd5fb6cf187e8..6892a3bd80858 100644 --- a/pkgs/servers/jellyseerr/package.json +++ b/pkgs/servers/jellyseerr/package.json @@ -1,6 +1,6 @@ { "name": "jellyseerr", - "version": "1.4.1", + "version": "1.7.0", "private": true, "scripts": { "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", @@ -8,6 +8,7 @@ "build:next": "next build", "build": "yarn build:next && yarn build:server", "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache", + "lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix", "start": "NODE_ENV=production node dist/index.js", "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"", "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts", @@ -29,17 +30,17 @@ }, "license": "MIT", "dependencies": { - "@formatjs/intl-displaynames": "6.2.3", - "@formatjs/intl-locale": "3.0.11", - "@formatjs/intl-pluralrules": "5.1.8", + "@formatjs/intl-displaynames": "6.2.6", + "@formatjs/intl-locale": "3.1.1", + "@formatjs/intl-pluralrules": "5.1.10", "@formatjs/intl-utils": "3.8.4", - "@headlessui/react": "1.7.7", - "@heroicons/react": "2.0.13", + "@headlessui/react": "1.7.12", + "@heroicons/react": "2.0.16", "@supercharge/request-ip": "1.2.0", "@svgr/webpack": "6.5.1", - "@tanem/react-nprogress": "5.0.22", - "ace-builds": "1.14.0", - "axios": "1.2.2", + "@tanem/react-nprogress": "5.0.30", + "ace-builds": "1.15.2", + "axios": "1.3.4", "axios-rate-limit": "1.3.0", "bcrypt": "5.1.0", "bowser": "2.11.0", @@ -47,7 +48,7 @@ "cookie-parser": "1.4.6", "copy-to-clipboard": "3.3.3", "country-flag-icons": "1.5.5", - "cronstrue": "2.21.0", + "cronstrue": "2.23.0", "csurf": "1.11.0", "date-fns": "2.29.3", "dayjs": "1.11.7", @@ -64,23 +65,22 @@ "next": "12.3.4", "node-cache": "5.1.2", "node-gyp": "9.3.1", - "node-schedule": "2.1.0", - "nodemailer": "6.8.0", - "openpgp": "5.5.0", + "node-schedule": "2.1.1", + "nodemailer": "6.9.1", + "openpgp": "5.7.0", "plex-api": "5.3.2", "pug": "3.0.2", - "pulltorefreshjs": "0.1.22", "react": "18.2.0", "react-ace": "10.1.0", "react-animate-height": "2.1.2", - "react-aria": "3.22.0", + "react-aria": "3.23.0", "react-dom": "18.2.0", - "react-intersection-observer": "9.4.1", - "react-intl": "6.2.5", - "react-markdown": "8.0.4", + "react-intersection-observer": "9.4.3", + "react-intl": "6.2.10", + "react-markdown": "8.0.5", "react-popper-tooltip": "4.4.2", "react-select": "5.7.0", - "react-spring": "9.6.1", + "react-spring": "9.7.1", "react-tailwindcss-datepicker-sct": "1.3.4", "react-toast-notifications": "2.5.1", "react-truncate-markup": "5.1.2", @@ -89,42 +89,41 @@ "secure-random-password": "0.2.3", "semver": "7.3.8", "sqlite3": "5.1.4", - "swagger-ui-express": "4.6.0", - "swr": "2.0.0", - "typeorm": "0.3.11", + "swagger-ui-express": "4.6.2", + "swr": "2.0.4", + "typeorm": "0.3.12", "web-push": "3.5.0", "winston": "3.8.2", "winston-daily-rotate-file": "4.7.1", "xml2js": "0.4.23", "yamljs": "0.3.0", "yup": "0.32.11", - "zod": "3.20.2" + "zod": "3.20.6" }, "devDependencies": { - "@babel/cli": "7.20.7", - "@commitlint/cli": "17.4.0", - "@commitlint/config-conventional": "17.4.0", + "@babel/cli": "7.21.0", + "@commitlint/cli": "17.4.4", + "@commitlint/config-conventional": "17.4.4", "@semantic-release/changelog": "6.0.2", "@semantic-release/commit-analyzer": "9.0.2", "@semantic-release/exec": "6.0.3", "@semantic-release/git": "10.0.1", "@tailwindcss/aspect-ratio": "0.4.2", "@tailwindcss/forms": "0.5.3", - "@tailwindcss/typography": "0.5.8", + "@tailwindcss/typography": "0.5.9", "@types/bcrypt": "5.0.0", "@types/cookie-parser": "1.4.3", "@types/country-flag-icons": "1.2.0", "@types/csurf": "1.11.2", "@types/email-templates": "8.0.4", - "@types/express": "4.17.15", - "@types/express-session": "1.17.5", + "@types/express": "4.17.17", + "@types/express-session": "1.17.6", "@types/lodash": "4.14.191", "@types/node": "17.0.36", "@types/node-schedule": "2.1.0", "@types/nodemailer": "6.4.7", - "@types/pulltorefreshjs": "0.1.5", - "@types/react": "18.0.26", - "@types/react-dom": "18.0.10", + "@types/react": "18.0.28", + "@types/react-dom": "18.0.11", "@types/react-transition-group": "4.4.5", "@types/secure-random-password": "0.2.1", "@types/semver": "7.3.13", @@ -133,45 +132,46 @@ "@types/xml2js": "0.4.11", "@types/yamljs": "0.2.31", "@types/yup": "0.29.14", - "@typescript-eslint/eslint-plugin": "5.48.0", - "@typescript-eslint/parser": "5.48.0", + "@typescript-eslint/eslint-plugin": "5.54.0", + "@typescript-eslint/parser": "5.54.0", "autoprefixer": "10.4.13", "babel-plugin-react-intl": "8.2.25", "babel-plugin-react-intl-auto": "3.3.0", - "commitizen": "4.2.6", + "commitizen": "4.3.0", "copyfiles": "2.4.1", "cy-mobile-commands": "0.3.0", - "cypress": "12.3.0", + "cypress": "12.7.0", "cz-conventional-changelog": "3.3.0", - "eslint": "8.31.0", + "eslint": "8.35.0", "eslint-config-next": "12.3.4", "eslint-config-prettier": "8.6.0", - "eslint-plugin-formatjs": "4.3.9", - "eslint-plugin-jsx-a11y": "6.6.1", + "eslint-plugin-formatjs": "4.9.0", + "eslint-plugin-jsx-a11y": "6.7.1", "eslint-plugin-no-relative-import-paths": "1.5.2", "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-react": "7.31.11", + "eslint-plugin-react": "7.32.2", "eslint-plugin-react-hooks": "4.6.0", "extract-react-intl-messages": "4.1.1", "husky": "8.0.3", - "lint-staged": "13.1.0", + "lint-staged": "13.1.2", "nodemon": "2.0.20", - "postcss": "8.4.20", - "prettier": "2.8.1", - "prettier-plugin-organize-imports": "3.2.1", - "prettier-plugin-tailwindcss": "0.2.1", + "postcss": "8.4.21", + "prettier": "2.8.4", + "prettier-plugin-organize-imports": "3.2.2", + "prettier-plugin-tailwindcss": "0.2.3", "semantic-release": "19.0.5", "semantic-release-docker-buildx": "1.0.1", - "tailwindcss": "3.2.4", + "tailwindcss": "3.2.7", "ts-node": "10.9.1", "tsc-alias": "1.8.2", "tsconfig-paths": "4.1.2", - "typescript": "4.9.4" + "typescript": "4.9.5" }, "resolutions": { "sqlite3/node-gyp": "8.4.1", - "@types/react": "18.0.26", - "@types/react-dom": "18.0.10" + "@types/react": "18.0.28", + "@types/react-dom": "18.0.11", + "@types/express-session": "1.17.6" }, "config": { "commitizen": { diff --git a/pkgs/servers/jellyseerr/pin.json b/pkgs/servers/jellyseerr/pin.json index 0c658a506c454..7905d006ee849 100644 --- a/pkgs/servers/jellyseerr/pin.json +++ b/pkgs/servers/jellyseerr/pin.json @@ -1,5 +1,5 @@ { - "version": "1.4.1", - "srcHash": "sha256-LDqlQfy1bm2xMNn1oulImfanQmJX57P48VaZn0Jxwpk=", - "yarnSha256": "162aip7r5vcpfj1sn42qwwdlwnaii32bd2k0gp9py1z0zmw0lwlf" + "version": "1.7.0", + "srcHash": "sha256-9ILP2HH7p8ELwrQOBnqPbvHdUnNrqEkA4OmxOuhNbEc=", + "yarnSha256": "1ygb8pmwra570wmdkn7mxv9j90cgjh063b9cl0wl9hsmg687sk9h" } diff --git a/pkgs/servers/jellyseerr/update.sh b/pkgs/servers/jellyseerr/update.sh index ec1dd0879edd4..719fc622a6e4c 100755 --- a/pkgs/servers/jellyseerr/update.sh +++ b/pkgs/servers/jellyseerr/update.sh @@ -19,7 +19,7 @@ if [ -z "$tag" ]; then fi src="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/$tag" -src_hash=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .hash) +src_hash=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .sha256) tmpdir=$(mktemp -d) trap 'rm -rf "$tmpdir"' EXIT @@ -33,7 +33,7 @@ curl -O "$src/package.json" cat > pin.json << EOF { "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcHash": "$src_hash", + "srcHash": "sha256-$src_hash", "yarnSha256": "$yarn_sha256" } EOF diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/servers/jitsi-excalidraw/default.nix new file mode 100644 index 0000000000000..bb8bb6c2dfa7e --- /dev/null +++ b/pkgs/servers/jitsi-excalidraw/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, nodejs +, python3 +}: + +buildNpmPackage rec { + pname = "jitsi-excalidraw-backend"; + version = "17"; + + src = fetchFromGitHub { + owner = "jitsi"; + repo = "excalidraw-backend"; + rev = "x${version}"; + hash = "sha256-aQePkVA8KRL06VewiD0ePRpj88pAItcV7B2SBnRRtCs="; + }; + + npmDepsHash = "sha256-BJqjaqTeg5i+ECGMuiBYVToK2i2XCOVP9yeDFz6nP4k="; + + nativeBuildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/share + cp -r {node_modules,dist} $out/share + ''; + + postFixup = '' + makeWrapper ${nodejs}/bin/node $out/bin/jitsi-excalidraw-backend \ + --add-flags dist/index.js \ + --chdir $out/share + ''; + + meta = with lib; { + description = "Excalidraw collaboration backend for Jitsi"; + homepage = "https://github.com/jitsi/excalidraw-backend"; + license = licenses.mit; + maintainers = with maintainers; [ camillemndn ]; + }; +} diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 0a6f0f1391e27..13fa39fe828c8 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-10-21"; + version = "unstable-2023-11-16"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "f7567a0db954eabe4c6b8da3f73ce68693698646"; - sha256 = "sha256-zOXoHTySTtq2fR7ujU6aiKAgvw11ogM8K+HJF1RoWEQ="; + rev = "187cc2f1b89e3870d694f8db6a64b116992106b7"; + sha256 = "sha256-CmnWgX8MvQs/5jQuAR8+1bKM4VsFXF2pV/jme75WJLY="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg index 4dc19b1e40ffb..6a4122ce3aa5f 100644 --- a/pkgs/servers/klipper/simulator.cfg +++ b/pkgs/servers/klipper/simulator.cfg @@ -4,8 +4,10 @@ # CONFIG_MACH_ATSAMD is not set # CONFIG_MACH_LPC176X is not set # CONFIG_MACH_STM32 is not set +# CONFIG_MACH_HC32F460 is not set # CONFIG_MACH_RP2040 is not set # CONFIG_MACH_PRU is not set +# CONFIG_MACH_AR100 is not set # CONFIG_MACH_LINUX is not set CONFIG_MACH_SIMU=y CONFIG_BOARD_DIRECTORY="simulator" @@ -16,6 +18,12 @@ CONFIG_SERIAL_BAUD=250000 CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y CONFIG_HAVE_GPIO_SPI=y diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index 69a2dc7ce6f25..ba31137812aef 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -7,17 +7,18 @@ , npmHooks , fetchFromGitHub , fetchNpmDeps +, testers +, mailpit }: let - - version = "1.9.9"; + version = "1.10.1"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-WPfr1LHOgOFsF2g3junJ0km0gOk/LC52jekJ8BXlqP0="; + hash = "sha256-6nACvAhmFsZGWOqa3pwFqJLnh6Cueq2eYeg4Ns8gCmk="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -29,7 +30,13 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-RaXD+WfNywItveKzc+KWOw38H1EZ2yukgbMrtOfPSJc="; + hash = "sha256-DlklRc9Mt4bMAOm/dZnvWPU74oGkc8RLof37Q/977Tk="; + }; + + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; }; nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; @@ -49,7 +56,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-akt72aBoiQKp1Hxf3NgzSmfgmsnjpheIh62lPCTyHBs="; + vendorHash = "sha256-COkJF6JX4NnlPtCeGjaTLYvAKgXEhh+AJC0R9V7J4CM="; CGO_ENABLED = 0; @@ -59,6 +66,12 @@ buildGoModule { cp -r ${ui} server/ui/dist ''; + passthru.tests.version = testers.testVersion { + inherit version; + package = mailpit; + command = "mailpit version"; + }; + meta = with lib; { description = "An email and SMTP testing tool with API for developers"; homepage = "https://github.com/axllent/mailpit"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 3bac9e0c6ef60..f93bc857116fc 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, libressl, db, pam, libxcrypt, nixosTests +{ lib +, stdenv +, fetchurl +, autoreconfHook +, autoconf-archive +, pkgconf +, libtool +, bison +, libasr +, libevent +, zlib +, libressl +, db +, pam +, libxcrypt +, nixosTests }: stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.8.0p2"; + version = "7.4.0p0"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib libressl db pam libxcrypt ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconf libtool bison ]; + buildInputs = [ libevent zlib libressl db pam libxcrypt ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"; + hash = "sha256-wYHMw0NKEeWDYZ4AAoUg1Ff+Bi403AO+6jWAeCIM43Q="; }; patches = [ ./proc_path.diff # TODO: upstream to OpenSMTPD, see https://github.com/NixOS/nixpkgs/issues/54045 - ./cross_fix.diff # TODO: remove when https://github.com/OpenSMTPD/OpenSMTPD/pull/1177 will have made it into a release ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` - # requirement postPatch = '' substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" - sh bootstrap ''; configureFlags = [ @@ -43,9 +53,6 @@ stdenv.mkDerivation rec { "--with-table-db" ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 - makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; - installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -59,7 +66,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog vifino ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 180554acd7281..7bd0b01dd60e0 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -28,13 +28,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.7.3"; + version = "3.7.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-TqsY0AUDEpFOGIAH6jDdofIJAYQYtj8Uk4djk5hYemo="; + hash = "sha256-Bg0EFgxk/sRwE8/7a/m8J4cTgooR4fobQil8pbWtkoc="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index 31a092359cfc1..0fa099881d967 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, nodejs-slim, bundlerEnv, nixosTests -, yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript +, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript , fetchYarnDeps, fixup_yarn_lock , brotli # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" , version ? srcOverride.version +, patches ? [] # src is a package -, srcOverride ? callPackage ./source.nix {} +, srcOverride ? callPackage ./source.nix { inherit patches; } , gemset ? ./. + "/gemset.nix" , yarnHash ? srcOverride.yarnHash }: @@ -19,8 +20,7 @@ stdenv.mkDerivation rec { mastodonGems = bundlerEnv { name = "${pname}-gems-${version}"; - inherit version gemset; - ruby = ruby_3_0; + inherit version gemset ruby; gemdir = src; # This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem # symlinks with directories, resolving this error when running rake: diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 1d5fbcc6dbefb..384302458470c 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,32 +5,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10y18l67i6ry7v9w0qwh26477g4gm0qrjjpa87pa5a42hzkglnc7"; + sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ihayijdgasf0rp10x6h335k3y1hgqr6c9s8lxqmhm4gpczajaac"; + sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03557cskby5alpncnhgm1j1kq43xqq75sdd6r2x22q3j2jv68pj5"; + sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,21 +38,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7ffyan8sbv4ywjghiyiv077vfxyf6i6y0h4k0mfpdmf76l0i86"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g5gw9ywirw7814wn8cdnnv1df58x5gplgpb15gaw5gzkw9cgvd8"; + sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmzc2c00lsdr5hpmsgs8axs5pbhv5xyqiyi69wf81pqypd2cy3l"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -76,48 +76,38 @@ }; version = "0.10.13"; }; - active_record_query_trace = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19888wjdpqvr2kaci6v6jyjw9pjf682zb1iyx2lz12mpdmy3500n"; - type = "gem"; - }; - version = "1.8"; - }; activejob = { dependencies = ["activesupport" "globalid"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153z9lmkip3v243xxa5rcc8am82ma73ar46q4vxbmzi850a5yjj2"; + sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpr0zspih2rf2ppzjxaw8sq6gfqg9vss5h0fs4r85p03579swin"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; - groups = ["default" "development"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06403rkjnyr80yj4g05lb5hn04yfzipa7bm0gplbqrrykr3hvh5r"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,21 +115,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094kvh8bp792xccql54kky8prmvqvfzwwv9xas2pnh8s4v3avbzl"; + sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -147,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; }; aes_key_wrap = { groups = ["default"]; @@ -195,7 +185,7 @@ version = "3.2.0"; }; ast = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -210,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; + sha256 = "034x6mbrv9apd83v99v9pm8vl3d17w5bbwws26gr4wv95fylmgnc"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.0"; }; attr_required = { groups = ["default"]; @@ -250,10 +240,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nz23laxgrxbv5svswi3bksmbhz86j691n4099qp4049i5a5cx91"; + sha256 = "0m2kha6ip4ynhvl1l8z4vg0j96ngq4f2v6jl4j2y27m2kzmgcxz5"; type = "gem"; }; - version = "1.701.0"; + version = "1.809.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -261,10 +251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r"; + sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; type = "gem"; }; - version = "3.170.0"; + version = "3.181.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -272,10 +262,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070s86pxrbq98iddq6shdq7g0lrzgsdqnsnc5l4kygvqimliq4dr"; + sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; type = "gem"; }; - version = "1.62.0"; + version = "1.71.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -283,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sg212jsj6ydyrr6r284mgqcl83kln2hfd9nlyisf3pj5lbdjd1c"; + sha256 = "0yymj15nwnvam95lw5fxwxx7b6xm4hkj8z7byzvjmx9aji1x245m"; type = "gem"; }; - version = "1.119.0"; + version = "1.133.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -294,35 +284,67 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + type = "gem"; + }; + version = "1.6.0"; + }; + azure-storage-blob = { + dependencies = ["azure-storage-common" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qq3knsy7nj7a0r8m19spg2bgzns9b3j5vjbs9mpg49whhc63dv1"; + type = "gem"; + }; + version = "2.0.3"; + }; + azure-storage-common = { + dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0swmsvvpmy8cdcl305p3dl2pi7m3dqjd7zywfcxmhsz0n2m4v3v0"; + type = "gem"; + }; + version = "2.0.4"; + }; + base64 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cydk9p2cv25qysm0sn2pb97fcpz1isa7n3c8xm1gd99li8x6x8c"; type = "gem"; }; - version = "1.5.2"; + version = "0.1.1"; }; bcrypt = { groups = ["default" "pam_authentication"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rakdhrnlclrpy7sihi9ipwdh7fjkkvzga171464lq6rzp07cf65"; + sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; type = "gem"; }; - version = "3.1.17"; + version = "3.1.18"; }; better_errors = { - dependencies = ["coderay" "erubi" "rack"]; + dependencies = ["erubi" "rack" "rouge"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.1"; }; better_html = { dependencies = ["actionview" "activesupport" "ast" "erubi" "parser" "smart_properties"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -336,10 +358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mz9hz5clknznw8i5f3l2zb9103mlgh96djdhlvlfpf2chkr0s1z"; + sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; type = "gem"; }; - version = "2.4.14"; + version = "2.4.15"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -378,20 +400,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds"; + sha256 = "1gliwnyma9f1mpr928c79i36q51yl68dwjd3jgwvsyr4piiiqr1r"; type = "gem"; }; - version = "5.4.0"; + version = "6.0.1"; }; browser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; type = "gem"; }; - version = "4.2.0"; + version = "5.3.1"; }; brpoplpush-redis_script = { dependencies = ["concurrent-ruby" "redis"]; @@ -414,17 +436,6 @@ }; version = "3.2.4"; }; - bullet = { - dependencies = ["activesupport" "uniform_notifier"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hyz68j0z0j24vcrs43swmlykhzypayv34kzrsbxda5lbi83gynm"; - type = "gem"; - }; - version = "7.0.7"; - }; bundler-audit = { dependencies = ["thor"]; groups = ["development"]; @@ -436,26 +447,16 @@ }; version = "0.9.1"; }; - byebug = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; - type = "gem"; - }; - version = "11.1.3"; - }; capistrano = { dependencies = ["airbrussh" "i18n" "rake" "sshkit"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1673k8yzy4gl96f1xjj6zf1r2pgm2h042vdsiw03wqx4ygbq2las"; + sha256 = "14pflh85rrs2l8k0m286j4vaab5vad2sfqq9dncqb31z05vy29mn"; type = "gem"; }; - version = "3.17.1"; + version = "3.17.3"; }; capistrano-bundler = { dependencies = ["capistrano"]; @@ -463,10 +464,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168kyi0gv2s84jm533m8rg0dii50flr06n6s2ci6kzsib3n9n8dr"; + sha256 = "09rndb1fa9r7mhb2sc6p3k0pcarhg8mv0kfmvd1zdb0ciwwp7514"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; capistrano-rails = { dependencies = ["capistrano" "capistrano-bundler"]; @@ -474,10 +475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iyhs77bff09g18dlz0li5f44khjwpqc09gk5hzcnf5v9yvijpg9"; + sha256 = "05lk7y4qyzadzzshjyhgfgx00ggqliq7n561wkx8m331wljv7kx7"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; capistrano-rbenv = { dependencies = ["capistrano" "sshkit"]; @@ -507,10 +508,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.38.0"; + version = "3.39.2"; }; case_transform = { dependencies = ["activesupport"]; @@ -549,10 +550,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jfdz0z27p839m09xmw5anrw5jp3jd5hd5gnx4vlk6kk520cy6sf"; + sha256 = "0zca6v8i66jkxfdfjnn9xwg21pk95qn4ic8vzfvrx49d6sb8319y"; type = "gem"; }; - version = "7.2.4"; + version = "7.3.4"; }; chunky_png = { groups = ["default"]; @@ -584,16 +585,6 @@ }; version = "1.2.15"; }; - coderay = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; - type = "gem"; - }; - version = "1.1.3"; - }; color_diff = { groups = ["default"]; platforms = []; @@ -619,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -630,10 +621,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; crack = { dependencies = ["rexml"]; @@ -662,10 +653,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; + sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.0"; + }; + database_cleaner-active_record = { + dependencies = ["activerecord" "database_cleaner-core"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hdsqnws9gyc9sxiyc8pjiwr0xa7136m1qbhmd1pk3vsrrvk13k"; + type = "gem"; + }; + version = "2.1.0"; + }; + database_cleaner-core = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; + type = "gem"; + }; + version = "2.0.1"; }; date = { groups = ["default" "development"]; @@ -682,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lswmjwxf1clzaimikhiwd9s1n07qkyz7a9xwng64j4fxsajykqp"; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; devise = { dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; @@ -693,10 +705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gl0b4jqf7ysv3rg99sgxa5y9va2k13p0si3a88pr7m8g6z8pm7x"; + sha256 = "0vpd7d61d4pfmyb2plnnv82wmczzlhw4k4gjhd2fv4r6vq8ilqqi"; type = "gem"; }; - version = "4.8.1"; + version = "4.9.2"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -704,10 +716,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f5rb8fg4cvzm32v413z3h53wc0fgxg927q8rqd546hdrlx4j35"; + sha256 = "1nk43p339zyp4y5vab3w3s0zbjd4xfs8qn0ymxdnz6d961dbbdm8"; type = "gem"; }; - version = "4.0.2"; + version = "4.1.0"; }; devise_pam_authenticatable2 = { dependencies = ["devise" "rpam2"]; @@ -883,13 +895,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08idrrnpwzr87wc5yhyv6id1f6zigr3nfn45mff01605b0zghdby"; + sha256 = "08r6qgbpkxxsihjmlspk3l1sr69q5hx35p1l4wp7rmkbzys89867"; type = "gem"; }; - version = "0.95.0"; + version = "0.100.0"; }; fabrication = { - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -904,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; + sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.1"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -915,10 +927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.9.3"; + version = "1.10.3"; }; faraday-em_http = { groups = ["default"]; @@ -966,10 +978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -1021,6 +1033,17 @@ }; version = "1.0.3"; }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + type = "gem"; + }; + version = "1.2.0"; + }; fast_blank = { groups = ["default"]; platforms = []; @@ -1036,10 +1059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr"; + sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx"; type = "gem"; }; - version = "2.2.6"; + version = "2.2.7"; }; ffi = { groups = ["default"]; @@ -1111,14 +1134,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7m38n4f5cjqa4gf4fycw6fqvf6m5hhsx4jawryv3bi4hls07d1"; + sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1127,49 +1150,49 @@ }; version = "2.5.1"; }; - gitlab-omniauth-openid-connect = { - dependencies = ["addressable" "omniauth" "openid_connect"]; - groups = ["default"]; + globalid = { + dependencies = ["activesupport"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pp9cf6b68pky9bndmals070kibab525wjn9igx9pc5h8z1jv5bd"; + sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; type = "gem"; }; - version = "0.10.1"; + version = "1.1.0"; }; - globalid = { - dependencies = ["activesupport"]; + haml = { + dependencies = ["temple" "thor" "tilt"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqm5ndzaybpnpxqiqkc41k4ksyxl41ln8qqr6kb130cdxsf2dxk"; + sha256 = "154svzqlkdq7gslv3p8mfih28gbw4gsj4pd8wr1wpwz6nyzmhh8m"; type = "gem"; }; - version = "1.1.0"; + version = "6.1.2"; }; - hamlit = { - dependencies = ["temple" "thor" "tilt"]; + haml-rails = { + dependencies = ["actionpack" "activesupport" "haml" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06imnwpzvpagwn0b9a8kwv7hncii32flmafz20z95hd77hhr6ab7"; + sha256 = "1sjrdwc4azzfpsp2xk0365z031482gcrs0c54d5wx0igkqca0fr7"; type = "gem"; }; - version = "2.13.0"; + version = "2.1.0"; }; - hamlit-rails = { - dependencies = ["actionpack" "activesupport" "hamlit" "railties"]; - groups = ["default"]; + haml_lint = { + dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v75yd6x0nwky83smd9hw5ym9h0pi32jrzbnvq55pzj0rc95gg2p"; + sha256 = "1qics7sll6yw7fm499q4b1frfr5f3gav94ach0fwy49zprl9yk33"; type = "gem"; }; - version = "0.2.3"; + version = "0.50.0"; }; hashdiff = { groups = ["default" "test"]; @@ -1191,15 +1214,26 @@ }; version = "5.0.0"; }; + hcaptcha = { + dependencies = ["json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fh6391zlv2ikvzqj2gymb70k1avk1j9da8bzgw0scsz2wqq98m2"; + type = "gem"; + }; + version = "7.1.0"; + }; highline = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.0"; }; hiredis = { groups = ["default"]; @@ -1300,14 +1334,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; i18n-tasks = { dependencies = ["activesupport" "ast" "better_html" "erubi" "highline" "i18n" "parser" "rails-i18n" "rainbow" "terminal-table"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1347,7 +1381,7 @@ version = "1.6.2"; }; json = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1361,10 +1395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "179h6jfdsp9dmzyma7s7ykv1ia43r6z8x96j335q99p6mc5sk5qv"; + sha256 = "1rvsalsrs8njk2gqxgq0ydg5cd02jqdawskbq2ccz663qxz8wwq5"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.2"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -1383,10 +1417,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aq71is278w69brhg4yp0f4ldxmy2nyj45c1rfbf73qi945mrbln"; + sha256 = "1z3kqacjmqs02vwwqm9di7sw7f7nchxx99v84myrrzmh64c6zfcq"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.5"; }; json-ld-preloaded = { dependencies = ["json-ld" "rdf"]; @@ -1405,10 +1439,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; + sha256 = "155rygs093i8i04i38a97hs5icmqk2jkkhx76w31yxyr3bxfbgx3"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; jsonapi-renderer = { groups = ["default"]; @@ -1425,10 +1459,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.1"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -1479,10 +1513,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ngapld22knlkyn0dhhddkfm4vfj0lgmwj4y6x4mhi2hzfwxcxr"; + sha256 = "14gnkcp924v8sbay7q6vz4kn37jylbnvrhi4y5c5jcffd51fbwid"; type = "gem"; }; - version = "7.1.1"; + version = "7.2.1"; + }; + language_server-protocol = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x"; + type = "gem"; + }; + version = "3.17.0.3"; }; launchy = { dependencies = ["addressable"]; @@ -1490,10 +1534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -1544,10 +1588,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15pjm9pa5m3mbv9xvfgfr16q4jyaznsg8y63jz9x4jqr8npw0vx3"; + sha256 = "01kdw5dbzimb89rq4zf44zf8990czb5qxvib0hzja1l4hrha8cki"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1555,10 +1599,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.19.1"; + version = "2.21.3"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1571,17 +1615,6 @@ }; version = "2.8.1"; }; - makara = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a6x6w1ij484s1z0wp667d6v0zb8bylhhr3av10yz60a2nz4r1l7"; - type = "gem"; - }; - version = "0.5.1"; - }; marcel = { groups = ["default"]; platforms = []; @@ -1613,8 +1646,19 @@ }; version = "0.4.2"; }; + md-paperclip-azure = { + dependencies = ["addressable" "azure-storage-blob" "hashie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hb1a06x3i8zrhl715jf46ha8r4iy0srcpdhnmp9l14qnnhzn0l5"; + type = "gem"; + }; + version = "2.2.0"; + }; memory_profiler = { - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1639,60 +1683,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2023.0808"; }; mini_mime = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.5"; }; mini_portile2 = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.17.0"; + version = "5.19.0"; }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; + sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.1"; }; multi_json = { groups = ["default"]; @@ -1709,10 +1753,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; type = "gem"; }; - version = "2.1.1"; + version = "2.3.0"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y55ib1v2b8prqfi9ij7hca60b1j94s2bzr6vskwi3i5735472wq"; + type = "gem"; + }; + version = "0.3.2"; + }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i1as2lgnw7b4jid0gw5glv5hnxz36nmfsbr9rmxbcap72ijgy03"; + type = "gem"; + }; + version = "4.0.2"; }; net-imap = { dependencies = ["date" "net-protocol"]; @@ -1720,20 +1786,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1763,10 +1829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4kxfvx1v4awv8kgincishi7h16dj9sn74gz8x92i81668j1wgm"; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; type = "gem"; }; - version = "4.0.0.rc1"; + version = "4.0.0"; }; net-smtp = { dependencies = ["net-protocol"]; @@ -1784,10 +1850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr"; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; nio4r = { groups = ["default"]; @@ -1805,19 +1871,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g6wvxab4qwnbny983n9bckc0afy6y6s3g5v3csdbsp8n7g9vxi3"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.14.5"; + version = "1.15.4"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jzs1n71pi6najhs9h8jx156gzgk3h9bwjr60vazizwdz3mm69ia"; - type = "gem"; + fetchSubmodules = false; + rev = "e020fcc3a54d993ab45b7194d89ab720296c111b"; + sha256 = "18pbm9qkancy38v0gpb6f5k0xd8r347jl4xvj4jn98ihfhzgwygj"; + type = "git"; + url = "https://github.com/jhawthorn/nsa.git"; }; version = "0.2.8"; }; @@ -1826,30 +1894,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90"; + sha256 = "0m4vsd6i093kmyz9gckvzpnws997laldaiaf86hg5lza1ir82x7n"; type = "gem"; }; - version = "3.13.23"; + version = "3.16.1"; }; omniauth = { - dependencies = ["hashie" "rack"]; + dependencies = ["hashie" "rack" "rack-protection"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; + sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; type = "gem"; }; - version = "1.9.2"; + version = "2.1.1"; }; omniauth-cas = { dependencies = ["addressable" "nokogiri" "omniauth"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kzlh1nac4yz70917cdcsk0r23gy5h7i0x5kbmkvkpbgk6gvrb0z"; - type = "gem"; + fetchSubmodules = false; + rev = "4211e6d05941b4a981f9a36b49ec166cecd0e271"; + sha256 = "1zs0xp062f6wk7xxy8w81838qr855kp7idbgpbrhpl319xzc1xkc"; + type = "git"; + url = "https://github.com/stanhu/omniauth-cas.git"; }; version = "2.0.0"; }; @@ -1859,10 +1929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + sha256 = "1kwswnkyl8ym6i4wv65qh3qchqbf2n0c6lbhfgbvkds3gpmnlm7w"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.1"; }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; @@ -1870,10 +1940,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; type = "gem"; }; - version = "1.10.3"; + version = "2.1.0"; + }; + omniauth_openid_connect = { + dependencies = ["omniauth" "openid_connect"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08yl0x203k6nrshc70zawfqh79ap1c3fyka9zwwy61cvn7sih4sz"; + type = "gem"; + }; + version = "0.6.1"; }; openid_connect = { dependencies = ["activemodel" "attr_required" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; @@ -1891,10 +1972,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1902,10 +1983,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; + sha256 = "103yjl68wqhl5kxaciir5jdnyi7iv9yckishdr52s5knh9g0pd53"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; orm_adapter = { groups = ["default" "pam_authentication"]; @@ -1922,31 +2003,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9ivy30jx7hjl8l3il47dmc9xgla8dj762v5cw0mgzpd9rq6vr4"; + sha256 = "1yq0h1niimm8z6z8p1yxb104kxqw69bvbrax84598zfjxifcxhxz"; type = "gem"; }; - version = "2.14.14"; + version = "2.14.17"; }; parallel = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; + dependencies = ["ast" "racc"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.3"; }; parslet = { groups = ["default"]; @@ -1974,10 +2055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.4.5"; + version = "1.5.4"; }; pghero = { dependencies = ["activerecord"]; @@ -1985,20 +2066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi1mls8r6r43dy5m6dsdqk28q564164h97pp7a111pgkbdmxf83"; - type = "gem"; - }; - version = "3.1.0"; - }; - pkg-config = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651"; + sha256 = "0gzbgq392b0z7ma1jrdnzzfppdlgjdl9akc4iajq4g46raqd4899"; type = "gem"; }; - version = "1.5.1"; + version = "3.3.4"; }; posix-spawn = { groups = ["default"]; @@ -2016,10 +2087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dfknfwwlzmb594acgi6v080ngxbnhshn3gzvdh5x2vx1aqvwc5r"; + sha256 = "10rzwdz43yy20lwzsr2as6aivhvwjvqh4nd48sa0ga57sizf1fb4"; type = "gem"; }; - version = "1.18.0"; + version = "1.21.0"; }; premailer-rails = { dependencies = ["actionmailer" "net-smtp" "premailer"]; @@ -2033,7 +2104,7 @@ version = "1.12.0"; }; private_address_check = { - groups = ["production" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2042,48 +2113,15 @@ }; version = "0.5.0"; }; - pry = { - dependencies = ["coderay" "method_source"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; - type = "gem"; - }; - version = "0.14.1"; - }; - pry-byebug = { - dependencies = ["byebug" "pry"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; - type = "gem"; - }; - version = "3.10.1"; - }; - pry-rails = { - dependencies = ["pry"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; - type = "gem"; - }; - version = "0.3.9"; - }; public_suffix = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -2091,10 +2129,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "5.6.5"; + version = "6.3.1"; }; pundit = { dependencies = ["activesupport"]; @@ -2122,20 +2160,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.1"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-attack = { dependencies = ["rack"]; @@ -2143,10 +2181,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; type = "gem"; }; - version = "6.6.1"; + version = "6.7.0"; }; rack-cors = { dependencies = ["rack"]; @@ -2154,10 +2192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw"; type = "gem"; }; - version = "1.1.1"; + version = "2.0.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -2170,6 +2208,17 @@ }; version = "1.21.3"; }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + type = "gem"; + }; + version = "3.0.5"; + }; rack-proxy = { dependencies = ["rack"]; groups = ["default"]; @@ -2187,21 +2236,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ympjpkhz06xqsay18hskpbs64nh05hzrsckx8va6ikrxhs2ksq"; + sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2215,62 +2264,64 @@ version = "1.0.5"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { - dependencies = ["loofah"]; + dependencies = ["loofah" "nokogiri"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mcgv748vppnm3fnml37wjy3dw61wj8vfw14ldaj1yx1bmkhb07"; + sha256 = "1bbh5gsw46djmrgddwaq3wsjmj9rsh5dk13wkclwxf1rg9jpkn3g"; type = "gem"; }; - version = "6.0.0"; + version = "7.0.7"; }; rails-settings-cached = { dependencies = ["rails"]; groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wyhyls0aqb1iw7mnaldg39w3mnbi3anmpbvb52rjwkpj2mchhnc"; - type = "gem"; + fetchSubmodules = false; + rev = "86328ef0bd04ce21cc0504ff5e334591e8c2ccab"; + sha256 = "06r637gimh5miq2i6ywxn9gp7nqk8n8555yw8239mykalbzda69h"; + type = "git"; + url = "https://github.com/mastodon/rails-settings-cached.git"; }; version = "0.6.6"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g92if3cxxysl9h6x6ibs7y9dsbcniiwgcldvg00kib02b3pxkbb"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "6.1.7.4"; + version = "7.0.8"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2295,10 +2346,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0799a5hqh7rjkqnbfb5cq62m2dx4zlnnag3xy1l4jyjywsk7v5kv"; + sha256 = "1jx4xyip4inrhr099zac8ah5232g70rv39mm19p85sgpwg80a6ip"; type = "gem"; }; - version = "3.2.9"; + version = "3.2.11"; }; rdf-normalize = { dependencies = ["rdf"]; @@ -2306,10 +2357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dngmsk9wg1vws56pl87dys0ns4bcn9arf8ip6zxa0gypr3ifq3m"; + sha256 = "12slrdq6xch5rqj1m79k1wv09264pmhs76nm300j1jsjpcfmdg0r"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.1"; }; redcarpet = { groups = ["default"]; @@ -2326,10 +2377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw"; + sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; type = "gem"; }; - version = "4.5.1"; + version = "4.8.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -2337,10 +2388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; redlock = { dependencies = ["redis"]; @@ -2358,10 +2409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; + sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3"; type = "gem"; }; - version = "2.6.2"; + version = "2.8.1"; }; request_store = { dependencies = ["rack"]; @@ -2380,30 +2431,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; + sha256 = "0m9s0mkkprrz02gxhq0ijlwjy0nx1j5yrjf8ssjnhyagnx03lyrx"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; rexml = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rotp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3"; + sha256 = "10mmzc85y7andsich586ndykw678qn1ns2wpjxrg0sc0gr4w3pig"; type = "gem"; }; - version = "6.2.0"; + version = "6.2.2"; + }; + rouge = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; + type = "gem"; + }; + version = "4.1.2"; }; rpam2 = { groups = ["default" "pam_authentication"]; @@ -2421,10 +2482,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; + sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.0"; }; rqrcode_core = { groups = ["default"]; @@ -2442,10 +2503,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2453,10 +2514,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2464,10 +2525,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.5"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -2475,118 +2536,138 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "5.1.2"; + version = "6.0.3"; }; rspec-sidekiq = { - dependencies = ["rspec-core" "sidekiq"]; + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks" "sidekiq"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spzw3sc2p0n9qfb89y1v8igd60y7c5z9w2hjqqbbgbyjvy0agp8"; + sha256 = "0dijmcwjn8k6lrld3yqbqfrqb5g73l57yx98y5frx54p5qxjzbzy"; type = "gem"; }; - version = "3.1.0"; + version = "4.0.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.1"; }; - rspec_junit_formatter = { - dependencies = ["rspec-core"]; + rspec_chunked = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "059bnq1gcwl9g93cqf13zpz38zk7jxaa43anzz06qkmfwrsfdpa0"; + sha256 = "0h4bsj3m7vb47qnx5bry4v0xscrb3lhg1f1vyxl524znb3i2qqzv"; type = "gem"; }; - version = "0.6.0"; + version = "0.6"; }; rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; + dependencies = ["base64" "json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4n844yr2jrbddf79cam8qg41k2gkpyjjgd4zgbd8df1ijbld6p"; + sha256 = "1i3571gchdj3c28znr5kisj0fkppy57208g9j1kv23rhk3p5q5p2"; type = "gem"; }; - version = "1.44.1"; + version = "1.56.3"; }; rubocop-ast = { dependencies = ["parser"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.24.1"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; - groups = ["default" "development" "test"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; + type = "gem"; + }; + version = "2.18.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; type = "gem"; }; - version = "2.17.0"; + version = "2.23.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "1v3a2g3wk3aqa0k0zzla10qkxlc625zkj3yf4zcsybs86r5bm4xn"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; - groups = ["development" "test"]; + groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; type = "gem"; }; - version = "2.17.4"; + version = "2.20.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ylwy4afnxhbrvlaf8an9nrizj78axnzggiyfcp8v531cv8six5f"; + type = "gem"; + }; + version = "2.23.2"; + }; + ruby-prof = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "13fsfw43zx9pcix1fzxb95g09yadqjvc8971k74krrjz81vbyh51"; type = "gem"; }; - version = "2.18.1"; + version = "1.6.3"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby-saml = { dependencies = ["nokogiri" "rexml"]; @@ -2594,10 +2675,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k"; + sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; ruby2_keywords = { groups = ["default"]; @@ -2609,16 +2690,26 @@ }; version = "0.0.5"; }; + rubyzip = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; rufus-scheduler = { dependencies = ["fugit"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1as4yrb8y5lq49div8p3vqgwrrhdgwnvx4m73y3712nmnlpx6cws"; + sha256 = "14lr8c2sswn0sisvrfi4448pmr34za279k3zlxgh581rl1y0gjjz"; type = "gem"; }; - version = "3.8.2"; + version = "3.9.1"; }; safety_net_attestation = { dependencies = ["jwt"]; @@ -2653,6 +2744,17 @@ }; version = "1.7.0"; }; + selenium-webdriver = { + dependencies = ["rexml" "rubyzip" "websocket"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac"; + type = "gem"; + }; + version = "4.11.0"; + }; semantic_range = { groups = ["default"]; platforms = []; @@ -2669,10 +2771,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z2fx4fzgnw4rzj3h1h4sk6qbkp7p2rdr58b2spxgkcsdzg0i5hh"; + sha256 = "0w9a1cwv86c9zb3hj1m42gbjk6r7rgs5ismalr9c9nx365yyj90i"; type = "gem"; }; - version = "6.5.8"; + version = "6.5.10"; }; sidekiq-bulk = { dependencies = ["sidekiq"]; @@ -2686,15 +2788,15 @@ version = "0.2.0"; }; sidekiq-scheduler = { - dependencies = ["redis" "rufus-scheduler" "sidekiq" "tilt"]; + dependencies = ["rufus-scheduler" "sidekiq" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ij0m4m4zi3ffn1csdrj4g96l4vpqlsw3rrgjxda9yqsq4ylf624"; + sha256 = "0p5jjs3x2pa2fy494xs39xbq642pri13809dcr1l3hjsm56qvp1h"; type = "gem"; }; - version = "4.0.3"; + version = "5.0.3"; }; sidekiq-unique-jobs = { dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "redis" "sidekiq" "thor"]; @@ -2761,7 +2863,7 @@ version = "0.1.4"; }; smart_properties = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2798,20 +2900,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1szshiw7bzizi380z1hkdbwhjdaixb5bgbx7c3wf7970mjdashkd"; + sha256 = "14a717mr2cmpgld5fcdd124cvlc5b634f96rhwlnmmc4m8bbkcp9"; type = "gem"; }; - version = "1.21.2"; + version = "1.21.5"; }; stackprof = { - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; + sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; type = "gem"; }; - version = "0.2.23"; + version = "0.2.25"; }; statsd-ruby = { groups = ["default"]; @@ -2829,10 +2931,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rmhhqvvrn7874r9cjf4wpv36vnxvxsrgb1kfgdk3dalg4rig7q6"; + sha256 = "1vhqx7q8qpq3x9ba504n7bp0r9dxcck0r0hd73cac2iqkix6khlv"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; strong_migrations = { dependencies = ["activerecord"]; @@ -2840,10 +2942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yk45ri2rnp00x4mdsvwdzdd9yziqxj5v9sjk74nzw0y927y3m1w"; + sha256 = "0wz4zhsp4xia8zcpi98v4sgjlv2prd515l8jz4f7j0wk45dfkjs1"; type = "gem"; }; - version = "0.7.9"; + version = "0.8.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -2856,19 +2958,29 @@ }; version = "1.3.0"; }; + sysexits = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; + type = "gem"; + }; + version = "1.2.0"; + }; temple = { - groups = ["default"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; + sha256 = "09p32vp94sa1mbr0if0adf02yzc4ns00lsmpwns2xbkncwpzrqm4"; type = "gem"; }; - version = "0.8.2"; + version = "0.10.2"; }; terminal-table = { dependencies = ["unicode-display_width"]; - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2888,6 +3000,16 @@ }; version = "0.6.0"; }; + test-prof = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mhzw33lv7h8d7pyh65lis5svnmm8m6fnszbsfg3j3xk9hcl0an5"; + type = "gem"; + }; + version = "1.2.3"; + }; thor = { groups = ["default" "development" "pam_authentication" "production" "test"]; platforms = []; @@ -2899,24 +3021,24 @@ version = "1.2.2"; }; tilt = { - groups = ["default"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.0.11"; + version = "2.2.0"; }; timeout = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -2924,10 +3046,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kyq8z36953snxksv2xmc71znw7zykzis5r23hx3k06dij71vxsy"; + sha256 = "0v8y5dibsyskv1ncdgszhxwzq0gzmvb0zl7sgmx0xvsgy86dhcz1"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; tty-color = { groups = ["default"]; @@ -3009,10 +3131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drm9pygji01pyimxq65ngdvgpn228g7fhffmrqw0xn7l2rdhclp"; + sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; type = "gem"; }; - version = "1.2022.7"; + version = "1.2023.3"; }; unf = { dependencies = ["unf_ext"]; @@ -3036,7 +3158,7 @@ version = "0.0.8.2"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -3045,15 +3167,15 @@ }; version = "2.4.2"; }; - uniform_notifier = { - groups = ["default" "development"]; + uri = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; + sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; type = "gem"; }; - version = "1.16.0"; + version = "0.12.2"; }; validate_email = { dependencies = ["activemodel" "mail"]; @@ -3094,10 +3216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gs21q8krknb3db4s87l7xhzihp46ldsf6ql6689g2j0489l6da1"; + sha256 = "1ri09bf640kkw4v6k2g90q2nw1mx2hsghhngaqgb7958q8id8xrz"; type = "gem"; }; - version = "2.5.2"; + version = "3.0.0"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; @@ -3116,10 +3238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; webpacker = { dependencies = ["activesupport" "rack-proxy" "railties" "semantic_range"]; @@ -3145,16 +3267,26 @@ }; version = "0.3.8"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -3202,10 +3334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.11"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index fc6c899e75691..4f39e350a0f03 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,16 +1,18 @@ # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.1.9"; + version = "4.2.1"; in -applyPatches { +( + applyPatches { + src = fetchFromGitHub { + owner = "mastodon"; + repo = "mastodon"; + rev = "v${version}"; + hash = "sha256-SM9WdD+xpxo+gfBft9DARV6QjwNbF2Y9McVrrdDT3fw="; + }; + patches = patches ++ []; + }) // { inherit version; - src = fetchFromGitHub { - owner = "mastodon"; - repo = "mastodon"; - rev = "v${version}"; - hash = "sha256-xpE/mg2AeioW6NThUjLS+SBxGavG4w1xtp3BOMADfYo="; - }; - patches = []; - yarnHash = "sha256-e3rl/WuKXaUdeDEYvo1sSubuIwtBjkbguCYdAijwXOA="; + yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; } diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index b79e8d3063100..8e8350431e211 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -53,9 +53,10 @@ fi if [[ -z "$REVISION" ]]; then REVISION="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/$OWNER/$REPO/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" - VERSION="$(echo "$REVISION" | cut -c2-)" fi +VERSION="$(echo "$REVISION" | cut -c2-)" + rm -f gemset.nix source.nix cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 @@ -81,19 +82,21 @@ HASH=$(echo "$JSON" | jq -r .hash) cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. -{ fetchFromGitHub, applyPatches }: +{ fetchFromGitHub, applyPatches, patches ? [] }: let version = "$VERSION"; in -applyPatches { +( + applyPatches { + src = fetchFromGitHub { + owner = "$OWNER"; + repo = "$REPO"; + rev = "v\${version}"; + hash = "$HASH"; + }; + patches = patches ++ [$PATCHES]; + }) // { inherit version; - src = fetchFromGitHub { - owner = "$OWNER"; - repo = "$REPO"; - rev = "v\${version}"; - hash = "$HASH"; - }; - patches = [$PATCHES]; yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; } EOF diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4b7c6d21f30d5..ef8ff520c072b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , python3 , openssl +, libiconv , cargo , rustPlatform , rustc @@ -57,6 +58,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + libiconv ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index 99b28a4defa4f..f784036075c89 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -5,7 +5,6 @@ , makeWrapper , matrix-sdk-crypto-nodejs , mkYarnPackage -, rust , cargo , rustPlatform , rustc @@ -60,7 +59,7 @@ mkYarnPackage rec { buildPhase = '' runHook preBuild cd deps/${pname} - napi build --target ${rust.toRustTargetSpec stdenv.targetPlatform} --dts ../src/libRs.d.ts --release ./lib + napi build --target ${stdenv.hostPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib yarn run build:app:fix-defs yarn run build:app yarn run build:web diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 8d201624a6420..566f7d1cabfab 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-lBseLxxk+3/eoJMdq4muOrA0TgEhwIReGtQO1OzqBFc="; + hash = "sha256-uouxOXvVbUNRHM83JearPhMTZQtMPEBfWvsVb7QJSO8="; }; buildInputs = [ olm ]; - vendorHash = "sha256-QUZ9x9BDlhoWLvdt8BTIKxHcsclT6arGICeJnOafs1g="; + vendorHash = "sha256-dgaI/gpngCcVRVK8SK6ac1hmc7/aYLJCnW2CCYRDXy0="; doCheck = false; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 10143c60ee58e..29397ad3c8555 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-7kEwP9ohDtFaA1J+IYEspwJ208tFN2es/ubCmBYlEuA="; + hash = "sha256-Upm/fiW3hXzBS+IpwzE3C6h6Z7ZpA2k+j2UqAWT8hF0="; }; - vendorHash = "sha256-fcDyXWy/MzDIvJYfzZZyYLfYkl9tGpyeOsTT2zHxobI="; + vendorHash = "sha256-uaOfULtZ+BdbX1TmDyZtYnoXV8579RSW6eocmPsXyP8="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/microbin/default.nix b/pkgs/servers/microbin/default.nix index 3d75a7ff8c7cd..163b4ba7d800f 100644 --- a/pkgs/servers/microbin/default.nix +++ b/pkgs/servers/microbin/default.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform +{ darwin , fetchFromGitHub -, pkg-config +, fetchpatch +, lib , oniguruma , openssl +, pkg-config +, rustPlatform , stdenv -, darwin }: rustPlatform.buildRustPackage rec { @@ -21,6 +22,44 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7GSgyh2aJ2f8pozoh/0Yxzbk8Wg3JYuqSy/34ywAc2s="; + patches = [ + # Prefix some URLs with args.public_path_as_str() by PeterUpfold + # https://github.com/szabodanika/microbin/pull/194 + # MicroBin returns wrong URLs on deployments with non-root URLs. + (fetchpatch { + name = "0001-fixup-explicit-urls.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..df062134cbaf3fd0ebcb67af8453a4c66844cd13.patch"; + hash = "sha256-h13FBuzu2O4AwdhRHF5EX5LaKyPeWJAcaV6SGTaYzTg="; + }) + + # Minor fixups by LuK1337 + # https://github.com/szabodanika/microbin/pull/211 + # Fixup styling, password protected and private pastas. + (fetchpatch { + name = "0002-minor-fixups.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..3b0c025e9b6dc1ca69269541940bdb53032a048a.patch"; + hash = "sha256-cZB/jx5d6F+C4xOn49TQ1at/Z4ov26efo9PTtWEdCHw="; + }) + + # Fix MICROBIN_ETERNAL_PASTA by SouthFox-D + # https://github.com/szabodanika/microbin/pull/215 + # MICROBIN_ETERNAL_PASTA config doesn't work without this. + (fetchpatch { + name = "0003-fix-microbin-eternal-pasta.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..c7c846c64344b8d51500aa9a4b2e9a92de8d09d8.patch"; + hash = "sha256-gCio73Jt0F7YCFtQxtf6pPBDLNcyOAcfSsiyjLFzEzY="; + }) + + # Fix raw pastes returning 404 by GizmoTjaz + # https://github.com/szabodanika/microbin/pull/218 + # Existing pastas return code 404 even when they exist. + (fetchpatch { + name = "0004-fix-raw-pastas-returning-404.patch"; + url = "https://github.com/szabodanika/microbin/compare/b8a0c5490d681550d982ad02d67a1aaa0897f503..e789901520824d4bf610d28923097affe85ead7d.patch"; + hash = "sha256-R47ozwu/FD1kCu5nx4Gf1cOFeLVFdS67K8RNDygwoZM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index b59dbafd409a4..88244b78e220b 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.49"; + version = "2.0.50"; in buildGo121Module { inherit pname version; @@ -11,10 +11,10 @@ in buildGo121Module { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-MGKQSlpTLqQPmvhACl9fbQkz2Uil8V8btjTwJIcY7g0="; + sha256 = "sha256-+oNF/Zwc1Z/cu3SQC/ZTekAW5Qef9RKrdszunLomGII="; }; - vendorHash = "sha256-J3WHFfmjgE71hK58WP3dq+Px4XxLbluJSGv+eJiIB0E="; + vendorHash = "sha256-jLyjQ+w/QS9uA0pGWF2X6dEfOifcI2gC2sgi1STEzpU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 732f145cc5a0d..70e93501e12cd 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -17,23 +17,23 @@ buildGoModule rec { pname = "navidrome"; - version = "0.49.3"; + version = "0.50.0"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-JBvY+0QAouEc0im62aVSJ27GAB7jt0qVnYtc6VN2qTA="; + hash = "sha256-NcAyr0X4a4dG9KAUW5oV2hR/uT0o1pZx7z2LRMm8RDY="; }; - vendorHash = "sha256-C8w/qCts8VqNDTQVXtykjmSbo5uDrvS9NOu3SHpAlDE="; + vendorHash = "sha256-aAJjDFnacY6A0fdODSJiFkeA8Gb9VCirUB3RcKatx0w="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit src; sourceRoot = "${src.name}/ui"; - hash = "sha256-qxwTiXLmZnTnmTSBmWPjeFCP7qzvTFN0xXp5lFkWFog="; + hash = "sha256-hOLGReiC/mgVefpJ0NDM86FbJ/PbLu91JuJoJZ7NwT0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 5a62a8a154b69..562a6c83ae3f1 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -10,20 +10,20 @@ mkYarnPackage rec { pname = "mjolnir"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - hash = "sha256-/vnojWLpu/fktqPUhAdL1QTESxDwFrBVYAkyF79Fj9w="; + hash = "sha256-xejFKz2MmdjMFU0X0SdI+qXTBRAwIvkcfZPQqXB9LV0="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-B4s0CYr5Ihoh4gkckwZ3z0Nb4LMET48WvRXuhk3fpQM="; + hash = "sha256-RpvdyxJj92k4wFjBBmWCnEpFVOXVWlHEm0SmEBUlnTM="; }; packageResolutions = { diff --git a/pkgs/servers/mjolnir/package.json b/pkgs/servers/mjolnir/package.json index f7ed5aba81e60..4b24df828031c 100644 --- a/pkgs/servers/mjolnir/package.json +++ b/pkgs/servers/mjolnir/package.json @@ -1,6 +1,6 @@ { "name": "mjolnir", - "version": "1.6.3", + "version": "1.6.5", "description": "A moderation tool for Matrix", "main": "lib/index.js", "repository": "git@github.com:matrix-org/mjolnir.git", @@ -30,7 +30,7 @@ "@types/jsdom": "^16.2.11", "@types/mocha": "^9.0.0", "@types/nedb": "^1.8.12", - "@types/node": "^16.7.10", + "@types/node": "^18.0.0", "@types/pg": "^8.6.5", "@types/request": "^2.48.8", "@types/shell-quote": "1.7.1", @@ -55,15 +55,15 @@ "humanize-duration-ts": "^2.1.1", "js-yaml": "^4.1.0", "jsdom": "^16.6.0", - "matrix-appservice-bridge": "8.0.0", + "matrix-appservice-bridge": "8.1.2", "parse-duration": "^1.0.2", "pg": "^8.8.0", "prom-client": "^14.1.0", "shell-quote": "^1.7.3", "ulidx": "^0.3.0", - "yaml": "^2.1.1" + "yaml": "^2.2.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" } } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 7894e759b168c..09fed144e57a4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -1,7 +1,7 @@ { stdenvNoCC, fetchurl, unzip, lib }: { pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args: -let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({ +let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({ inherit pname version; src = if lib.isAttrs zipHash then diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index c6761f41383e1..9cddb34ffc749 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "threathunters-io"; repo = pname; - rev = "v${version}"; - hash = "sha256-4SOnBIi45g2hYo+nFLI5soS+qRPzjkSYwmyMfVZCyVo="; + rev = "refs/tags/v${version}"; + hash = "sha256-O1EdIEgg+QfOnnhcTpI1nwYjdLOWcdt90SQegn68AJI="; }; - cargoHash = "sha256-yrk3frsR8AQGDVFgP2fCIWmhw+dTZwvga1hF0IAwzjQ="; + cargoHash = "sha256-wseysbjMkjPgKk7X9PpBck/IuafIFXfbRy+fPfR1CEY="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 83e6d38c82d84..78d611cd3f927 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.6.1"; + version = "1.7.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "sha256-BCZLMSJP/63N+pZsK8er87Zem7IFGdkyruDs6UVDZSM="; + sha256 = "sha256-+KY/YXEqT/40QzODOk8lKAo0zMcNuiMvj6ippbJE9ho="; }; - vendorHash = "sha256-hn2cMKhLl5qsm4sZErs6PXTs8yajowxw9a9vtHe5cAk="; + vendorHash = "sha256-HrlzDupZP9+GxB58Lg62tvku1Sl2zo2iV0KnBNwkM58="; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 90207be3343a9..213b2285c5e7d 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -13,6 +13,13 @@ buildGoModule rec { vendorHash = "sha256-ER0vK0xYUbQT3bqUosQMFT7HBycb3U8oI4Eak72myzs="; + ldflags = [ "-s" "-w" ]; + + checkFlags = [ + # Disable flaky tests on Darwin + "-skip=TestWholeApp|TestExporter" + ]; + meta = with lib; { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 88d5befb19d4d..8dcee384d6da8 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.28.3"; + version = "1.28.5"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-9BwAsLk8pz1QharomkuQdsoNVQYzw+fSU3nDkw053JE="; + hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU="; }; - vendorHash = "sha256-EJ6NSc7vTnK6brhsBBplyuAjoTDSItswLA/2U1MrmFU="; + vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 37814a4174918..156bd4a6ec239 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,24 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib +, buildGoModule +, fetchFromGitHub +, go +, nix-update-script +, nixosTests +, testers +, thanos +}: + buildGoModule rec { pname = "thanos"; - version = "0.31.0"; + version = "0.32.5"; src = fetchFromGitHub { - rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-A4bDCyvctHmDBYzvWpeEO4u6KhoICN7BbRQK4aZCbIA="; }; - patches = [ - # https://github.com/thanos-io/thanos/pull/6126 - (fetchpatch { - url = "https://github.com/thanos-io/thanos/commit/a4c218bd690259fc0c78fe67e0739bd33d38541e.patch"; - hash = "sha256-Hxc1s5IXAyw01/o4JvOXuyYuOFy0+cBUv3OkRv4DCXs="; - }) - ]; - - vendorHash = "sha256-8+MUMux6v/O2syVyTx758yUBfJkertzibz6yFB05nWk="; + vendorHash = "sha256-ZjkMvbWq96Rte9WoxAWzeouVA/6mBqanvY9yHr9F5MM="; doCheck = true; @@ -30,12 +31,26 @@ buildGoModule rec { "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) prometheus; + version = testers.testVersion { + command = "thanos --version"; + package = thanos; + }; + }; + }; + meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; + changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; + mainProgram = "thanos"; + maintainers = with maintainers; [ basvandijk anthonyroussel ]; }; } diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 917343ffecd11..572b83ba9cef1 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.3"; + version = "1.23.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-YffkCFws/61uX6BwYqTeuAq5vqLOC+FeUt6rtQG6xws="; + hash = "sha256-E/iyusAZnEnfXQ63LZA+9dgE0MvhFOKmrIXCEZ+LGi8="; }; - npmDepsHash = "sha256-USyLvC6ior1YhiZz6YySaG7xiYziHB01SHC9BPwuvJo="; + npmDepsHash = "sha256-AeN6+0DKd+Q2g3I960PeL3IBla5S7X0od9J244HiwLU="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index aa781f7e26fb8..df166ad0ff04b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -148,7 +148,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 2042629fe9f5c..bd96f550554b2 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index bb86f5f48c4a9..566e3f0802bd6 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "nats-streaming-server"; - version = "0.25.5"; + version = "0.25.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-rx6H3YXyg53th81w1SsKg5h9wj2vswnArDO0TNUlvpE="; + sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc="; }; - vendorHash = "sha256-erTxz3YpE64muc9OgP38BrPNH5o3tStSYsCbBd++kFU="; + vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U="; # tests fail and ask to `go install` doCheck = false; diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/servers/networkaudiod/default.nix index 5a09c7933d148..dacd315aba343 100644 --- a/pkgs/servers/networkaudiod/default.nix +++ b/pkgs/servers/networkaudiod/default.nix @@ -6,7 +6,7 @@ , alsa-lib }: let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 10146a318324f..82d03843ad9a8 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1827l5hxsvfnyc2m78rs95cnb2fwi14nl7ricpl25ndh1j0a7ccz", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.2/calendar-v4.5.2.tar.gz", - "version": "4.5.2", + "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", + "version": "4.5.3", "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": [ @@ -29,6 +29,16 @@ "agpl" ] }, + "cookbook": { + "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", + "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", + "version": "0.10.2", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "cospend": { "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", @@ -40,9 +50,9 @@ ] }, "deck": { - "sha256": "0j228lbf0zrm2sq45f9abgkln1qzgrkw8ac5r6fhyi0qfxcpmm0m", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.3/deck-v1.9.3.tar.gz", - "version": "1.9.3", + "sha256": "15hir3fssvzyysazbaad8qiz0bv00x73c2wfdj5aviz9h0gp4x4v", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.4/deck-v1.9.4.tar.gz", + "version": "1.9.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": [ @@ -93,7 +103,7 @@ "sha256": "0imddmyg9s1v3d20spr26g7mbyz2mwl3v2l1a4nz5kaxl3a6fsr2", "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.13.1/impersonate-v1.13.1.tar.gz", "version": "1.13.1", - "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", "homepage": "https://github.com/nextcloud/impersonate", "licenses": [ "agpl" @@ -110,10 +120,10 @@ ] }, "mail": { - "sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz", - "version": "3.4.3", - "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)!", + "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", + "version": "3.4.4", + "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": [ "agpl" @@ -130,15 +140,25 @@ ] }, "memories": { - "sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd", - "url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz", - "version": "6.0.1", + "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", + "version": "6.1.0", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ "agpl" ] }, + "music": { + "sha256": "06w82v34csx4scl5n4k4fpdxiivrzjb3yvj3hh4bc15gdz68cis9", + "url": "https://github.com/owncloud/music/releases/download/v1.9.1/music_1.9.1_for_nextcloud.tar.gz", + "version": "1.9.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "homepage": "https://github.com/owncloud/music", + "licenses": [ + "agpl" + ] + }, "news": { "sha256": "1bkh73h0ibxyjpy3cmvhnlr7isvgqkcxdw2dw15mxksj2cln9wki", "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz", @@ -160,9 +180,9 @@ ] }, "notify_push": { - "sha256": "0hdxnkar2ibis5p0gp3yr1i6894la9wxq4pzrbqdrq2cgvsj6a18", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.3/notify_push-v0.6.3.tar.gz", - "version": "0.6.3", + "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", + "version": "0.6.5", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -180,9 +200,9 @@ ] }, "polls": { - "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", - "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", - "version": "5.3.2", + "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", + "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", + "version": "5.4.2", "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 +260,9 @@ ] }, "twofactor_nextcloud_notification": { - "sha256": "03fp8wcwhyp8ivrcf20klgg17sxc9fia5sa44rbrv3cicmwmw50b", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.7.0/twofactor_nextcloud_notification-v3.7.0.tar.gz", - "version": "3.7.0", + "sha256": "0gaqgzbryim580dxarak7p4g3wd8wp3w6lw9jhl84jh46wrsbrj8", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.8.0/twofactor_nextcloud_notification-v3.8.0.tar.gz", + "version": "3.8.0", "description": "Allows using any of your logged in devices as second factor", "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", "licenses": [ @@ -250,9 +270,9 @@ ] }, "twofactor_webauthn": { - "sha256": "1lqcw74rsnl8c4sirw9208ra3c8zl8zp93scs7y8fv2n4n60l465", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.2.0/twofactor_webauthn-v1.2.0.tar.gz", - "version": "1.2.0", + "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", + "version": "1.3.0", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -270,9 +290,9 @@ ] }, "user_saml": { - "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", - "version": "5.2.2", + "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", + "version": "5.2.4", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 257a773ecb76f..6ecb1f3f522bc 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "1827l5hxsvfnyc2m78rs95cnb2fwi14nl7ricpl25ndh1j0a7ccz", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.2/calendar-v4.5.2.tar.gz", - "version": "4.5.2", + "sha256": "1iq8np72pjw2bn4zmbp2rmrh12n4z62rwrz2bb94xjza1fws7b2v", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.3/calendar-v4.5.3.tar.gz", + "version": "4.5.3", "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": [ @@ -29,6 +29,16 @@ "agpl" ] }, + "cookbook": { + "sha256": "18rzvdqd99nlkk3p0y9y8b17ihw5c4c9wsx8psq6xadspm97002y", + "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz", + "version": "0.10.2", + "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.", + "homepage": "", + "licenses": [ + "agpl" + ] + }, "cospend": { "sha256": "1rg9k33yapbl8chpxx3bjyzc9h4krjavksbxsvw14kpm01rss3j9", "url": "https://github.com/julien-nc/cospend-nc/releases/download/v1.5.10/cospend-1.5.10.tar.gz", @@ -40,9 +50,9 @@ ] }, "deck": { - "sha256": "060im5zlj7w6x9d5jpxsziqc8ym6fk573dynvdz231jx360s52g6", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.0/deck-v1.11.0.tar.gz", - "version": "1.11.0", + "sha256": "18gscc95zay7nrzdm1h5b52r4bpmpzc1h1xb00214qnb59mydiwr", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.1/deck-v1.11.1.tar.gz", + "version": "1.11.1", "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": [ @@ -93,7 +103,7 @@ "sha256": "1rpqi7yqzhmdqfl2hq326zv91gn246bgqjzcimsiap20f22z169j", "url": "https://github.com/nextcloud-releases/impersonate/releases/download/v1.14.0/impersonate-v1.14.0.tar.gz", "version": "1.14.0", - "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.", + "description": "By installing the impersonate app of your Nextcloud you enable administrators to impersonate other users on the Nextcloud server. This is especially useful for debugging issues reported by users.\n\nTo impersonate a user an administrator has to simply follow the following four steps:\n\n1. Login as administrator to Nextcloud.\n2. Open users administration interface.\n3. Select the impersonate button on the affected user.\n4. Confirm the impersonation.\n\nThe administrator is then logged-in as the user, to switch back to the regular user account they simply have to press the logout button.\n\n**Note:**\n\n- This app is not compatible with instances that have encryption enabled.\n- While impersonate actions are logged note that actions performed impersonated will be logged as the impersonated user.\n- Impersonating a user is only possible after their first login.\n- You can limit which users/groups can use impersonation in Administration settings > Additional settings.", "homepage": "https://github.com/nextcloud/impersonate", "licenses": [ "agpl" @@ -110,10 +120,10 @@ ] }, "mail": { - "sha256": "0mr3npd48j444lalkph1z8rsz5jllpgdrcqsjdrqgmf70y0g55mh", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.3/mail-v3.4.3.tar.gz", - "version": "3.4.3", - "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)!", + "sha256": "0ascail3vfkv3mm5s4s3ma74d6qxai76kdqxknmljnw56xb19qfv", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.4.4/mail-v3.4.4.tar.gz", + "version": "3.4.4", + "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": [ "agpl" @@ -130,15 +140,25 @@ ] }, "memories": { - "sha256": "0i146mlg27phs407clclksn1wjkyl0c5fb2zw0npbx5dvqnpglcd", - "url": "https://github.com/pulsejet/memories/releases/download/v6.0.1/memories.tar.gz", - "version": "6.0.1", + "sha256": "1yn1wkv4jxpc8faf4rl46yfddyplnryrkws3jz0x1wcr9zlxdkng", + "url": "https://github.com/pulsejet/memories/releases/download/v6.1.0/memories.tar.gz", + "version": "6.1.0", "description": "# Memories: Photo Management for Nextcloud\n\nMemories is a *batteries-included* photo management solution for Nextcloud with advanced features including:\n\n- **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.\n- **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.\n- **🤖 AI Tagging**: Group photos by people and objects, powered by [recognize](https://github.com/nextcloud/recognize) and [facerecognition](https://github.com/matiasdelellis/facerecognition).\n- **🖼️ Albums**: Create albums to group photos and videos together. Then share these albums with others.\n- **🫱🏻🫲🏻 External Sharing**: Share photos and videos with people outside of your Nextcloud instance.\n- **📱 Mobile Support**: Work from any device, of any shape and size through the web app.\n- **✏️ Edit Metadata**: Edit dates and other metadata on photos quickly and in bulk.\n- **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.\n- **📹 Video Transcoding**: Transcode videos and use HLS for maximal performance.\n- **🗺️ Map**: View your photos on a map, tagged with accurate reverse geocoding.\n- **📦 Migration**: Migrate easily from Nextcloud Photos and Google Takeout.\n- **⚡️ Performance**: Do all this very fast.\n\n## 🚀 Installation\n\n1. Install the app from the Nextcloud app store (try a demo [here](https://demo.memories.gallery/apps/memories/)).\n1. Perform the recommended [configuration steps](https://memories.gallery/config/).\n1. Run `php occ memories:index` to generate metadata indices for existing photos.\n1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.", "homepage": "https://memories.gallery", "licenses": [ "agpl" ] }, + "music": { + "sha256": "06w82v34csx4scl5n4k4fpdxiivrzjb3yvj3hh4bc15gdz68cis9", + "url": "https://github.com/owncloud/music/releases/download/v1.9.1/music_1.9.1_for_nextcloud.tar.gz", + "version": "1.9.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "homepage": "https://github.com/owncloud/music", + "licenses": [ + "agpl" + ] + }, "news": { "sha256": "1bkh73h0ibxyjpy3cmvhnlr7isvgqkcxdw2dw15mxksj2cln9wki", "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz", @@ -160,9 +180,9 @@ ] }, "notify_push": { - "sha256": "0hdxnkar2ibis5p0gp3yr1i6894la9wxq4pzrbqdrq2cgvsj6a18", - "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.3/notify_push-v0.6.3.tar.gz", - "version": "0.6.3", + "sha256": "0lwyy1pnyfw464vab1v5k8q0rgarrj5w12cf1nsywjaafb8y1ym0", + "url": "https://github.com/nextcloud-releases/notify_push/releases/download/v0.6.5/notify_push-v0.6.5.tar.gz", + "version": "0.6.5", "description": "Push update support for desktop app.\n\nOnce the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions", "homepage": "", "licenses": [ @@ -180,9 +200,9 @@ ] }, "polls": { - "sha256": "1v5zb164f60qskfiv02l9x2v0d4rayacg5qivd70dawmyqnz4vmd", - "url": "https://github.com/nextcloud/polls/releases/download/v5.3.2/polls.tar.gz", - "version": "5.3.2", + "sha256": "1dmws4ybv3pzxz5g9c7ghblx0nfal2ssmsg7hjcs1n4xcjc6585p", + "url": "https://github.com/nextcloud/polls/releases/download/v5.4.2/polls.tar.gz", + "version": "5.4.2", "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 +260,9 @@ ] }, "twofactor_nextcloud_notification": { - "sha256": "03fp8wcwhyp8ivrcf20klgg17sxc9fia5sa44rbrv3cicmwmw50b", - "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.7.0/twofactor_nextcloud_notification-v3.7.0.tar.gz", - "version": "3.7.0", + "sha256": "0gaqgzbryim580dxarak7p4g3wd8wp3w6lw9jhl84jh46wrsbrj8", + "url": "https://github.com/nextcloud-releases/twofactor_nextcloud_notification/releases/download/v3.8.0/twofactor_nextcloud_notification-v3.8.0.tar.gz", + "version": "3.8.0", "description": "Allows using any of your logged in devices as second factor", "homepage": "https://github.com/nextcloud/twofactor_nextcloud_notification", "licenses": [ @@ -250,9 +270,9 @@ ] }, "twofactor_webauthn": { - "sha256": "1lqcw74rsnl8c4sirw9208ra3c8zl8zp93scs7y8fv2n4n60l465", - "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.2.0/twofactor_webauthn-v1.2.0.tar.gz", - "version": "1.2.0", + "sha256": "0z6m2chq5kxc8f10g6n1lh51yi10svy2qp5gp0v8xs71apqcc2wx", + "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v1.3.0/twofactor_webauthn-v1.3.0.tar.gz", + "version": "1.3.0", "description": "A two-factor provider for WebAuthn devices", "homepage": "https://github.com/nextcloud/twofactor_webauthn#readme", "licenses": [ @@ -270,9 +290,9 @@ ] }, "user_saml": { - "sha256": "1gsq5mcn5nnxd56jlp4j2610gqq2gk3ma9yvhgy74wl0sqil98jd", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.2/user_saml-v5.2.2.tar.gz", - "version": "5.2.2", + "sha256": "04ivgqdls72p6x5yrh5p5ycbbfmxhzd0dqin1grblm6cbl7b4s2k", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v5.2.4/user_saml-v5.2.4.tar.gz", + "version": "5.2.4", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index bbbe556f6cbef..8b6f49c524c5c 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -2,6 +2,7 @@ "bookmarks": "agpl3Plus" , "calendar": "agpl3Plus" , "contacts": "agpl3Plus" +, "cookbook": "agpl3Plus" , "cospend": "agpl3Plus" , "deck": "agpl3Plus" , "files_texteditor": "agpl3Plus" @@ -13,6 +14,7 @@ , "mail": "agpl3Plus" , "maps": "agpl3Plus" , "memories": "agpl3Plus" +, "music": "agpl3Plus" , "news": "agpl3Plus" , "notes": "agpl3Plus" , "notify_push": "agpl3Plus" diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 36c978e364fea..52b9125e99d5d 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -15,12 +15,12 @@ , lzo , which , targetArchitecture ? null -, asmOptimizations ? gcc10Stdenv.targetPlatform.isx86 +, asmOptimizations ? gcc10Stdenv.hostPlatform.isx86 }: let defaultTargetArchitecture = - if gcc10Stdenv.targetPlatform.isx86 + if gcc10Stdenv.hostPlatform.isx86 then "haswell" else "core"; @@ -72,7 +72,7 @@ gcc10Stdenv.mkDerivation rec { "-DTARGET_ARCHITECTURE=${targetArch}" ] ++ lib.optionals asmOptimizations [ "-DASM_OPTIMIZATIONS=ON" - "-DHAVE_SSE42=${if gcc10Stdenv.targetPlatform.sse4_2Support then "ON" else "OFF"}" + "-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" ]; meta = with lib; { diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 4f683b83a5719..ba46d7f01289d 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-D1iMYh76a9H38tiZWByuJZrABWfjQFCkyxtbtLM/DMw="; + hash = "sha256-x5In8cBRki3rHaAB+iSglL19UCD8DtITr5gjb8KKuAw="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-WrnACseWo+bLn0IJhGY/DFsrMFAyy7J02cjO4FvE2xA="; + vendorHash = "sha256-0DFNDfJmBFpgzarg9FaGb8GV11LhA1N8oq0kSXIWxi8="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 180f226845788..11579a7ad51e6 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }: let - libflux_version = "0.170.1"; + libflux_version = "0.188.0"; # This is copied from influxdb2 with flux version matching the needed by thi flux = rustPlatform.buildRustPackage rec { @@ -11,20 +11,21 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - sha256 = "sha256-P3SpleOVbL+nGWdscwjj9yWqRdck/9JsAwuJtGOO7N8="; + hash = "sha256-4Z6Vfdyh0zimQlE47plSIjTWBYiju0Qu09M+MgMQOL4="; }; patches = [ - # https://github.com/influxdata/flux/pull/5273 - # fix compile error with Rust 1.64 + # https://github.com/influxdata/flux/pull/5440 + # fix compile error with Rust 1.72.0 (fetchpatch { - url = "https://github.com/influxdata/flux/commit/20ca62138a0669f2760dd469ca41fc333e04b8f2.patch"; + url = "https://github.com/influxdata/flux/commit/8d1d6c8b485eb7e15b6a5f57762d1f766b17defd.patch"; stripLen = 2; extraPrefix = ""; - sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; + hash = "sha256-BDBmGKsC2RWMyObDm7dPwFq/3cVIdBKF8ZVaCL+uftw="; + includes = [ "flux/src/lib.rs" ]; }) ]; sourceRoot = "${src.name}/libflux"; - cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; + cargoHash = "sha256-925U9weBOvMuyApsTOjtQxik3nqT2UpK+DPM64opc7c="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -47,16 +48,16 @@ let in buildGoModule rec { pname = "influxdb"; - version = "1.10.0"; + version = "1.10.5"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BMHR9EdYC+8oA0he7emzBRmNnHn15nO/5NqsLcr+R0k="; + hash = "sha256-FvKGNqy27q6/X2DI/joJXfGVrax6hQcNcx5nJDeSLm0="; }; - vendorHash = "sha256-AY04cmfg7vbrWR4+LBuCFYqBgQJBXlPpO+2oj0qqjM4="; + vendorHash = "sha256-1jeZBVmNOxF5NPlTKg+YRw6VqIIZDcT3snnoMLX3y4g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 5be49f18891f9..df7efb33b68ee 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, sconsPackages +, scons_3_1_2 , boost , gperftools , pcre-cpp @@ -31,7 +31,8 @@ with lib; let variants = - if versionAtLeast version "6.0" then rec { + if versionAtLeast version "6.0" + then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -41,12 +42,13 @@ let pymongo ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; - } else rec { + } + else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 @@ -54,7 +56,7 @@ let setuptools ]); - scons = sconsPackages.scons_3_1_2; + scons = scons_3_1_2; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; @@ -84,7 +86,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ variants.scons ] - ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; + ++ lib.optionals (versionAtLeast version "4.4") [ xz ]; buildInputs = [ boost @@ -147,7 +149,7 @@ in stdenv.mkDerivation rec { "--disable-warnings-as-errors" "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ] - ++ map (lib: "--use-system-${lib}") system-libraries; + ++ map (lib: "--use-system-${lib}") system-libraries; # This seems to fix mongodb not able to find OpenSSL's crypto.h during build hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 95435b4ea7769..25517c0b437b8 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.93.5"; + version = "1.93.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs="; + hash = "sha256-MGIFM7PhKTeu7hnE9M2fj4EsJQv5AIDhFbypEJjYNwc="; }; vendorHash = null; diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix index 85985584c8277..83ebe99c11292 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.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-N9qMMAIgmBUEscydJKBQneLcX8odOEXY+560lJJz52g="; + hash = "sha256-QpPZDh++WHIvIgml32UWtAe3tzh2x7lFUu2xdioNGW4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 1c07a56a7e3ae..2f99d6f562329 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.3.0"; + version = "1.4.0"; src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - hash = "sha256-JetfcA7Pn6nsCxCkgxP4jS6tijx89any/0GrmLa+DR0="; + hash = "sha256-pCT74nAbtULvyS2BQ+XQU3LzF/q05wLaEeSa9j3DoAo="; }; - cargoSha256 = "sha256-QUr0IHmzbhFNd6rBDEX8RZul/d1TLv0t+ySCQYMlpmE="; + cargoHash = "sha256-WFI7eyr7fdQ6ePXQ+n/VrtPQ2eMZpVR68nGRBBlq3JU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index ce5deb19de5bc..c86c97157c794 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-QL2bWIHT0FM3KohjtihWQhg/SqSGmOR/j/QNuL5cFls="; - arm64-linux_hash = "sha256-FDDt6to7PUEn4dhy13YtHIhW/KeEXNJjK9VXrzRJ+WM="; - x64-osx_hash = "sha256-uT4GuyIyIcodYHcqfmBkQ3PBqdQAsxc5Lk6XR3HHSR0="; - arm64-osx_hash = "sha256-cAt0pN/ak/0gl2OqDPp2vh5l5TyQvFWnQlGRQjknyC8="; + x64-linux_hash = "sha256-SwlEbkhTjlnECK3Z3MYzHOQQvU1byipPM7whPQaJiDk="; + arm64-linux_hash = "sha256-gFlB/GaEXJIFXLG2zf/r6iqa8Uw98bjeAezc5UCXUz4="; + x64-osx_hash = "sha256-2ypOaHGsK4KEZAZzVEZuMRxcn16hINMQDyw92eSKy7g="; + arm64-osx_hash = "sha256-1tO7XYy0AoGOAgO+HkBb6Z2BIsBGDZ59rIy93CT7Fxg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.0.3.8127"; + version = "5.1.3.8246"; 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/redpanda/server.nix b/pkgs/servers/redpanda/server.nix index 27e6343a42a21..ec4250820d3a6 100644 --- a/pkgs/servers/redpanda/server.nix +++ b/pkgs/servers/redpanda/server.nix @@ -16,7 +16,7 @@ , p11-kit , pkg-config , procps -, protobuf3_21 +, protobuf_21 , python3 , snappy , src @@ -100,7 +100,7 @@ llvmPackages_14.stdenv.mkDerivation rec { dpdk hdr-histogram p11-kit - protobuf3_21 + protobuf_21 rapidjson seastar snappy diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index a7e71c722fb5c..959c9bf4633ee 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; + sha256 = "sha256-Fktyy3jeidEEdB7pCQ9AJOY7+tpDlJA0hENl8/pwtf0="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4665402361d56..4dfa8657224d3 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -51,11 +51,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.1"; + version = "4.19.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-zjt/DRi/kapf1kbouzhaOzU3W3A8blEjsCuFoavIGHk="; + hash = "sha256-nmPwUF4cYx8dsLepNJpR6SXAJsoDrz/V2BIii7WX05M="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 7b7717828e17e..fbf9f06cff72e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { optional zlibSupport "--with-zlib" ++ optional lz4Support "--with-lz4"; + env = lib.optionalAttrs stdenv.cc.isClang { + # Prevent warning about using a GNU extension from being promoted to an error. + NIX_CFLAGS_COMPILE = "-Wno-error=gnu-folding-constant"; + }; + doInstallCheck = true; installCheckPhase = "$out/bin/groonga --version"; diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index b9316756b193f..a5b17b9825b61 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.4.7"; + version = "0.4.9"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zincsearch"; rev = "v${version}"; - hash = "sha256-6ZwEH9Xm+iIZ0SDa8qb82lIN3KU6DMe2wt0q9doKgkE="; + hash = "sha256-NIrLhbtpk1mFbWRFPxkH1r4mBiwT488MYBjRgIV7igE="; }; webui = buildNpmPackage { @@ -40,7 +40,7 @@ buildGoModule rec { cp -r ${webui}/share/zinc-ui web/dist ''; - vendorHash = "sha256-/uZh50ImKWW7vYMfRqTbTAMUoRTZ9jXMbc3K16wYJkE="; + vendorHash = "sha256-kP7QlES7VpZrOS4TGOFB9qciXGBEUVqzVLhz+2KiK98="; subPackages = [ "cmd/zincsearch" ]; ldflags = [ diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index f7d1fd77b04b2..7ca94e4e402c2 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-AmTJfjLpnPHtPMKP9djKTZozNPkojPqRJ3eoypY53bA="; + hash = "sha256-OFj9lYwI42zEcyUtsAwnkNUAaa6J4Ids4pMXquUcpJA="; }; passthru = { diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index f561eec0bac8f..08d9dbe97e6f7 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -5,13 +5,18 @@ , lib , makeWrapper , monkeysAudio -, perlPackages +, nixosTests +, perl538Packages , sox , stdenv , wavpack , zlib +, enableUnfreeFirmware ? false }: +let + perlPackages = perl538Packages; +in perlPackages.buildPerlPackage rec { pname = "slimserver"; version = "8.3.1"; @@ -25,10 +30,99 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perlPackages.CryptOpenSSLRSA perlPackages.IOSocketSSL ]; + buildInputs = with perlPackages; [ + AnyEvent + ArchiveZip + AsyncUtil + AudioScan + CarpClan + CGI + ClassAccessor + ClassAccessorChained + ClassC3 + # ClassC3Componentised # Error: DBIx::Class::Row::throw_exception(): DBIx::Class::Relationship::BelongsTo::belongs_to(): Can't infer join condition for track + ClassDataInheritable + ClassInspector + ClassISA + ClassMember + ClassSingleton + ClassVirtual + ClassXSAccessor + CompressRawZlib + CryptOpenSSLRSA + DataDump + DataPage + DataURIEncode + DBDSQLite + DBI + # DBIxClass # https://github.com/Logitech/slimserver/issues/138 + DigestSHA1 + EncodeDetect + EV + ExporterLite + FileBOM + FileCopyRecursive + FileNext + FileReadBackwards + FileSlurp + FileWhich + HTMLParser + HTTPCookies + HTTPDaemon + HTTPMessage + ImageScale + IOAIO + IOInterface + IOSocketSSL + IOString + JSONXS + JSONXSVersionOneAndTwo + # LogLog4perl # Internal error: Root Logger not initialized. + LWP + LWPProtocolHttps + MP3CutGapless + NetHTTP + NetHTTPSNB + PathClass + ProcBackground + # SQLAbstract # DBI Exception: DBD::SQLite::db prepare_cached failed: no such function: ARRAY + SQLAbstractLimit + SubName + TemplateToolkit + TextUnidecode + TieCacheLRU + TieCacheLRUExpires + TieRegexpHash + TimeDate + URI + URIFind + UUIDTiny + XMLParser + XMLSimple + YAMLLibYAML + ] + # ++ (lib.optional stdenv.isDarwin perlPackages.MacFSEvents) + ++ (lib.optional stdenv.isLinux perlPackages.LinuxInotify2); prePatch = '' + # remove vendored binaries rm -rf Bin + + # remove most vendored modules, keeping necessary ones + mkdir -p CPAN_used/Class/C3/ CPAN_used/SQL + rm -r CPAN/SQL/Abstract/Limit.pm + cp -rv CPAN/Class/C3/Componentised.pm CPAN_used/Class/C3/ + cp -rv CPAN/DBIx CPAN_used/ + cp -rv CPAN/Log CPAN_used/ + cp -rv CPAN/SQL/* CPAN_used/SQL/ + rm -r CPAN + mv CPAN_used CPAN + + ${lib.optionalString (!enableUnfreeFirmware) '' + # remove unfree firmware + rm -rf Firmware + ''} + touch Makefile.PL ''; @@ -38,18 +132,26 @@ perlPackages.buildPerlPackage rec { cp -r . $out wrapProgram $out/slimserver.pl \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \ - --prefix PATH : "${lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" + --prefix PATH : "${lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio))}" + mkdir $out/bin + ln -s $out/slimserver.pl $out/bin/slimserver ''; outputs = [ "out" ]; + passthru.tests = { + inherit (nixosTests) slimserver; + }; + meta = with lib; { homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; - # the firmware is not under a free license! + # the firmware is not under a free license, but not included in the default package # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt - license = licenses.unfree; + license = if enableUnfreeFirmware then licenses.unfree else licenses.gpl2Only; + mainProgram = "slimserver"; maintainers = with maintainers; [ adamcstephens jecaro ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 197e9b48d18b8..312629fc3b62a 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.29.1"; + version = "2.29.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-ZE17VCrpHlZ4GMc7+DaUyuehKtYWMr7NJFV1hGQ+UsA="; + sha256 = "sha256-f7xjjYy7uPSgssEftXPrfEcNrU6OFlXgwoTTWXgHfUU="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 2cfd41f7caf8b..6ee1980f08027 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.6.2"; + version = "0.7.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - hash = "sha256-gmgIuQk+8MRkuFZaJq82hHNdUMSqrylwgk6vi/Q0OQ0="; + hash = "sha256-4ckMLne/T0wurcXKBCDqpEycBCt/+nsNdoj83MA4UmY="; }; - vendorHash = "sha256-7lzdngj6xBpEe2nZdPW1GLbarPBdCHMnf+Dyxuq2Ikw="; + vendorHash = "sha256-t2Ciulzs/7dYFCpiX7bo0hwwImJBkRV2I1aTT2lQm+M="; doCheck = false; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index d7ff34951c8b5..63f94093a84cf 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.13"; + version = "0.15.15"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-egxeKwIgjpzF19ZunK9o2F/pjHWP8wva4KhGreXvR1w="; + hash = "sha256-zxGP2SWrq8beb+mJpgB39T7B1HpE76YP6se01vMewuw="; }; - cargoHash = "sha256-q61HLKsF6h9/JPmggXHrCHXiFLYnWHtKayC/O0BAtA8="; + cargoHash = "sha256-KqCDOWCMRYpBMsESTdhMEgTu6qAxcg4RHe252JBggqs="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 7500c0ca4ff2b..73c826e968ad8 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.21.4"; + version = "1.24.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc="; + sha256 = "sha256-bft4fa/ZABodrm7uwl7o2whqWhxuL7l3nLqCuTv4V0k="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M="; + vendorHash = "sha256-0UNIPwFiQisWDRFaCA3JuS9R0byhWcCDQb54DZXQJ2w="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea50fc371981e..07c81ec1007c2 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -245,36 +245,29 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.22"; - hash = "sha256-PiOGu17iWo3c0hz/xIx2CX5cpBpuSgmPay7kASsNY44="; + version = "10.5.23"; + hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.15"; - hash = "sha256-sva9uhfq1NkcTSVPr8NKcorGsCfdHXF4vCZ1jc5pQzU="; - inherit (self.darwin) cctools; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; - mariadb_1010 = self.callPackage generic { - # Supported until 2023-11-17. TODO: remove ahead of 23.11 branchoff - version = "10.10.6"; - hash = "sha256-4eUwEZedKfDsJuE6uMr2E0gb8ClSBWb7loF1RhA5ONU="; + version = "10.6.16"; + hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.5"; - hash = "sha256-TJSEBI1NDHHdB2qzP8KpzoUQvfdiiG3g1j/lJJbz27s="; + version = "10.11.6"; + hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.3"; - hash = "sha256-Up8IoGTudzOhNuxHSkI56Kyb1tsTm4unC/+KfxMDg5o="; + version = "11.0.4"; + hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 427a394873fae..ec2f95f5bd55b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -296,6 +296,7 @@ let homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; maintainers = with maintainers; [ thoughtpolice danbst globin marsam ivan ma27 ]; pkgConfigModules = [ "libecpg" "libecpg_compat" "libpgtypes" "libpq" ]; platforms = platforms.unix; @@ -345,45 +346,45 @@ let mkPackages = self: { postgresql_12 = self.callPackage generic { - version = "12.16"; + version = "12.17"; psqlSchema = "12"; - hash = "sha256-xfH/96D5Ph7DdGQXsFlCkOzmF7SZXtlbjVJ68LoOOPM="; + hash = "sha256-k+jhsjmB1fA8bFdj93soGEwc5NtxlPpGbi7bZdnBxfY="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.12"; + version = "13.13"; psqlSchema = "13"; - hash = "sha256-DaHtzuNRS3vHum268MAEmeisFZBmjoeJxQJTpiSfIYs="; + hash = "sha256-ivacJZkEeirSRlZ9aOxBMa7xFpVNjD5GnpeJCAs3pHQ="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.9"; + version = "14.10"; psqlSchema = "14"; - hash = "sha256-sf47qbGn86ljfdFlbf2tKIkBYHP9TTXxO1AUPLu2qO8="; + hash = "sha256-yZQxxI6dRwsNCrlG6yFBo80ZEwwvtNxLMoSnd07Mg5k="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.4"; + version = "15.5"; psqlSchema = "15"; - hash = "sha256-uuxaS9xENzNmU7bLXZ7Ym+W9XAxYuU4L7O4KmZ5jyPk="; + hash = "sha256-j1OqldeOuOglNupGtoGHeTtCu6O09lqjQvVAsjybEKY="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; }; postgresql_16 = self.callPackage generic { - version = "16.0"; + version = "16.1"; psqlSchema = "16"; - hash = "sha256-356CPrIjMEROHUjlLMZRNaZSpv2zzjJePwhUkzn1G5k="; + hash = "sha256-zjxNhdGbASH+DT+O8fpgH3GYnob4pm99w61UbdVWT+w="; this = self.postgresql_16; thisAttr = "postgresql_16"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 5745630964e4d..583bde82f4816 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; + maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; broken = versionOlder postgresql.version "12"; }; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index e24487f30dbf3..9c8087887ea36 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -26,7 +26,6 @@ , perl , python3 , prometheus-cpp -, re2 , zlib , texinfo }: @@ -117,7 +116,6 @@ stdenv.mkDerivation (finalAttrs: { { f = "lz4"; p = lz4; } { f = "pcre"; p = pcre; } { f = "prometheus-cpp"; p = prometheus-cpp; } - { f = "re2"; p = re2; } ] )} diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index 04e469ae13520..6a6d003a60883 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -143,17 +143,6 @@ index 710e070b..fd1352f6 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -321,10 +289,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a - - - re2/re2/obj/libre2.a: -- cd re2 && rm -rf re2-*/ || true -- cd re2 && tar -zxf re2-*.tar.gz --# cd re2/re2 && sed -i -e 's/-O3 -g /-O3 -fPIC /' Makefile --# cd re2/re2 && patch util/mutex.h < ../mutex.h.patch - cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch - ifeq ($(UNAME_S),Darwin) - cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile @@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 97ec06306fc4a..735054eb61a92 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "yrutschle"; repo = pname; rev = "v${version}"; - hash = "sha256-KfNQWSmAf86AFoInKlNZoiSuSwVLaJVnfo7SjZVY/VU="; + hash = "sha256-KXjoYtiGaOrdWRbI0umNfxbtS7p+YaW352lC/5f+AM4="; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index e7211fe0ddf60..a8057cac7e7de 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.23.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - hash = "sha256-+2j/dSDuSl7bA35qOVlJFTi65aJZg2zQb3HcCxtynKI="; + hash = "sha256-U+B/k/stwjJw+mxUCb4A3yUtc/+Tg0PsWhVnovLLX4A="; }; - cargoHash = "sha256-7ISSq0amoKbmHRsBEEm6MGkc4+SDgWBmicAiswzs+84="; + cargoHash = "sha256-ZDrRjIM8187nr72MlzFr0NAqH2f8qkF1sGAT9+NvfhA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b07a715f6736c..b4c2d24751727 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.52.1"; + version = "1.54.0"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-hscKV4jhJ+tqgTFuOEThABpu8iqK3+av7+DcuSmZwQ4="; + hash = "sha256-/l3csuj1AZQo7C0BzkhqvkMNEQxc6Ers0KtZvxWS96Q="; }; - vendorHash = "sha256-WGZkpffwe4I8FewdBHXGaLbKQP/kHr7UF2lCXBTcNb4="; + vendorHash = "sha256-/kuu7DKPklMZOvYqJpsOp3TeDG9KDEET4U0G+sq+4qY="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/teleport/12/default.nix b/pkgs/servers/teleport/12/default.nix index ee166f5d4721a..6fcba5773f3cf 100644 --- a/pkgs/servers/teleport/12/default.nix +++ b/pkgs/servers/teleport/12/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "12.4.22"; - hash = "sha256-UEiS+GiderYTU34GHsQr4G8XrasV5ewmPcdrec4v5B4="; - vendorHash = "sha256-etutgK/5u+e86kx7ha3x+di9np7Tcr7hpGUMKZxJNT4="; - yarnHash = "sha256-MBTElkMH5rb33l+AYWH+zguSLQf+ntXpOkHZpjLAx/Q="; + version = "12.4.23"; + hash = "sha256-kCHRBa9rdwfcb98XG/08ZaJmI1NhEiSCoXuH8/3xJlk="; + vendorHash = "sha256-yOvQQHjtDSLqQZcw2OIOy6CDqwYSgMpL2Rxlk2u//OE="; + yarnHash = "sha256-beHCg9qUSisYMJ/9eeqWmbc9+V9YGgXBheZSFpbqoPY="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/teleport/13/Cargo.lock b/pkgs/servers/teleport/13/Cargo.lock index d22467c3e7dce..e0b56c33db8e3 100644 --- a/pkgs/servers/teleport/13/Cargo.lock +++ b/pkgs/servers/teleport/13/Cargo.lock @@ -451,17 +451,6 @@ dependencies = [ [[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" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" @@ -713,7 +702,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", - "rustix 0.36.5", + "rustix 0.36.16", "windows-sys 0.42.0", ] @@ -1363,16 +1352,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1382,7 +1371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" dependencies = [ "bitflags 1.3.2", - "errno 0.3.0", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.0", diff --git a/pkgs/servers/teleport/13/default.nix b/pkgs/servers/teleport/13/default.nix index 65cbed70d9cc2..65a4cf64064c6 100644 --- a/pkgs/servers/teleport/13/default.nix +++ b/pkgs/servers/teleport/13/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "13.4.3"; - hash = "sha256-x8G94jKycK3nYwqDA5RPc63GHIk9y4pHfSwSBqGBINk="; - vendorHash = "sha256-Pb3eO9zqLgTD7otM7yGRWicQjvpIXg7xKV8Oc4yh8PA="; - yarnHash = "sha256-GnoiLqzqGV0UZm5zePCDBUUX63NTIIo1dcxtiWQDPqc="; + version = "13.4.5"; + hash = "sha256-uZolRnESFP65Xgvr29laEok2kBbm7G2qY9j8yKRrUdo="; + vendorHash = "sha256-Bkr6R9P2YTqvTEQkHvVdsRmWp6pv3Qg0WaQ+pERclWc="; + yarnHash = "sha256-60k4LRHpX4rYXZZ0CC44PqzL3PDu8PadV0kwXatnByI="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/teleport/14/Cargo.lock b/pkgs/servers/teleport/14/Cargo.lock index c9b50a388b0ba..fc4c503d45469 100644 --- a/pkgs/servers/teleport/14/Cargo.lock +++ b/pkgs/servers/teleport/14/Cargo.lock @@ -451,17 +451,6 @@ dependencies = [ [[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" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" @@ -708,7 +697,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes", - "rustix 0.36.5", + "rustix 0.36.16", "windows-sys 0.42.0", ] @@ -1356,16 +1345,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab" dependencies = [ "bitflags 1.3.2", - "errno 0.2.8", + "errno", "io-lifetimes", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1375,7 +1364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ "bitflags 2.4.0", - "errno 0.3.1", + "errno", "libc", "linux-raw-sys 0.4.3", "windows-sys 0.48.0", @@ -1845,11 +1834,35 @@ 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" dependencies = [ - "windows-targets", + "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]] diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index 71036da070ef1..d62c4549329bd 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -1,9 +1,9 @@ { callPackage, ... }@args: callPackage ../generic.nix ({ - version = "14.0.3"; - hash = "sha256-X+vekYmuTE7n22SH/z2GWO3wnBsIef1GEjR7WOJpjc8="; - vendorHash = "sha256-+R6f2HrlN/RLec83YutccDFJW6gq6HXbxoJVtxMgdp8="; - yarnHash = "sha256-udM4DNaTGiMkqfkllJjmT+Nk6PNbGUzT34ixQOhmScw="; + version = "14.1.1"; + hash = "sha256-xdJBl5imHuo1IP0ja33eaaE4i/sSP3kg/wQwehC1Hao="; + vendorHash = "sha256-+kCns/xHUfUOW2xBk6CaPZYWe/vcEguz2/4lqaJEbFc="; + yarnHash = "sha256-fWBMeat1bSIEMSADn8oDVfQtnUBojjy5ZCdVhw8PGMs="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index f5600579a0ef9..605ebdf3a7116 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zpAduymFC17iL9eEssFoHxK+J4EP1QyamchfLetFN/k="; + sha256 = "sha256-OsyQ7YZjErjfWg/1wf21AxBu2wrotey8hJSzoQQ0OSc="; }; - vendorHash = "sha256-GbAZK2TQKc3bziZm202Q2QLLK0TDJ/AplSGKBSLSoqQ="; + vendorHash = "sha256-jtuf3/CClz37TTQ2zs49yryccoaraAG4UrIOIlBYFqQ="; ldflags = [ "-s" diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index e705d8bc394c3..c961321a875fa 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -66,8 +66,7 @@ in rec { }; unifi7 = generic { - version = "7.5.176"; - suffix = "-1136930355"; - sha256 = "sha256-prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw="; + version = "7.5.187"; + sha256 = "sha256-a5kl8gZbRnhS/p1imPl7soM0/QSFHdM0+2bNmDfc1mY="; }; } diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 7adf281ff9bea..b555d1e371cd0 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.72.2"; + version = "0.73.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-y54EYWI1DbxosUflp5z+b4i1vO1qDju8LxEK0nt4S/g="; + hash = "sha256-t1m9pKsM9E2iAg9vv/nKmQioRi6kMjFGcTXzcT3cMxs="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-uXWBYZAjMA88NtADA4s2kB4Ubb2atrW6F4kAzDGA1WI="; + hash = "sha256-TRZlkDe7ARLGmfw5a0Dw9hSBRhqWvOfuBfPZ5/Bt/TI="; }; configurePhase = '' diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 48c59db1cc30f..77d85bc81ef4a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -4,4 +4,8 @@ version = "6.3.2"; hash = "sha256-Jo2/Vlm4Ml24ucPI6ZHs2mkbpY2rZB1dofmGXNPweA8="; }; + wordpress6_4 = { + version = "6.4.1"; + hash = "sha256-NF3tvVNUYlKPvtvJZzM7djGflOUT4VUlm4AyHPFzfdw="; + }; } diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 49a832a56dd8f..66a2f6c1ba11b 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -7,8 +7,8 @@ }, "fr_FR": { "path": "fr_FR", - "rev": "1258401", - "sha256": "157w59jl4b3ysjiflzav3kvbmqkglgr3k4cbh6f8iqhz6wkzw5h3", + "rev": "1263147", + "sha256": "0rgypx5z7pi88da7ll0aby6hlvahja6wqjl8iacabwsnqawqbbx6", "version": "6.3" }, "ro_RO": { diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index 5628f57f138b2..346c459530a58 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -7,8 +7,8 @@ }, "akismet": { "path": "akismet/tags/5.3", - "rev": "2966753", - "sha256": "17ayrjbwc6ij7qqaph3jjn94i27nmhr6hki5gjl4dzrz8142zrwn", + "rev": "2991242", + "sha256": "1i7y09x2aikndf80wl7xv65m71nv5s0w6jcadpp0dsyzp2m3gjnn", "version": "5.3" }, "antispam-bee": { @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.31", - "rev": "2982492", - "sha256": "0ij7lqxnhkpzd98bxfsdz2ydgm7yj9ig41fxkibr25crv76dwfai", - "version": "2.0.31" + "path": "breeze/tags/2.0.32", + "rev": "2995658", + "sha256": "0c0sh7l6cwz6hbc54gjaasdldrv8h6ynx4b75zzkj2arrmyhjjxg", + "version": "2.0.32" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.15", @@ -60,10 +60,10 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/16.9.0", - "rev": "2984221", - "sha256": "09pyh2w7kbqdq0y1zbsss3xizbk03g9wb85f510shc5znyjapngd", - "version": "16.9.0" + "path": "gutenberg/tags/17.0.2", + "rev": "2995211", + "sha256": "07c1smvapzm0gzkjzjk5irnp47x6hl2d4zcmlfprzj17igdqwa5s", + "version": "17.0.2" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -78,10 +78,10 @@ "version": "2.4.5" }, "jetpack": { - "path": "jetpack/tags/12.8", - "rev": "2990174", - "sha256": "10s2870kp8gp89rbgbkg21bxk6c238kklm1rgrpkry7m1w8qzsi2", - "version": "12.8" + "path": "jetpack/tags/12.8.1", + "rev": "2995420", + "sha256": "1i59npwwk29rsq5myl0axr1vsyfw19dyx22ckc2szkc3a4my8h40", + "version": "12.8.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -102,27 +102,27 @@ "version": "2.06" }, "mailpoet": { - "path": "mailpoet/tags/4.29.0", - "rev": "2972087", - "sha256": "0n0aq8p4265zskq5vblpn551v45870vrmnjzbyvppnyagydfc1q8", - "version": "4.29.0" + "path": "mailpoet/tags/4.36.0", + "rev": "2995974", + "sha256": "1782z2b1bwg7mx9qzvyzpiymmkqiafd5ymb31q11i7ks19gxlmbw", + "version": "4.36.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "2967306", - "sha256": "038sfnyr0ab8hzk5ybs0vnpiklhp1649dszbmlxilb5lm8rphbgq", - "version": "1.14.4" + "rev": "2997367", + "sha256": "158i9pqn4qqa5mzn57pg4m9gsln35c0gfb8v7sg1y02hp9876shg", + "version": "2.2" }, "opengraph": { - "path": "opengraph/tags/1.11.1", - "rev": "2950019", - "sha256": "0vfxv2d3z572m99nlxzla0l5s1lp14a6inb3x1plr779zn0rlg5c", - "version": "1.11.1" + "path": "opengraph/tags/1.11.2", + "rev": "2995321", + "sha256": "03cg7jm0g3rfwkvgjcg392mw09mlbmnvhw261rlldycfglmi270m", + "version": "1.11.2" }, "simple-login-captcha": { "path": "simple-login-captcha/tags/1.3.5", - "rev": "2947230", - "sha256": "054f51gybpy71iwdjnxf89v8x8dlvg4k4ggd2psvjjf16ai258dw", + "rev": "2988106", + "sha256": "1byq8f5qkxxnhjc4dk1ab7h8vzcr01y1nid81wwj2k1i03z9llqa", "version": "1.3.5" }, "static-mail-sender-configurator": { @@ -131,11 +131,17 @@ "sha256": "1mrwgqp1ril54xqr8k2gwgjcsbf4xv3671v15xawapwz730h2c4r", "version": "0.10.0" }, + "tc-custom-javascript": { + "path": "tc-custom-javascript/tags/1.2.3", + "rev": "2870386", + "sha256": "0lcprrnf25p6a12mf5hkfnl6r470n35pgfdl9nizjh4q43qzdcam", + "version": "1.2.3" + }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.11.2", - "rev": "2985470", - "sha256": "1q8jdpvjrp5y5avgrg4cyq7amvz93ww7nm4mpiqgxmjn9l01dmvv", - "version": "5.11.2" + "path": "webp-converter-for-media/tags/5.11.4", + "rev": "2995294", + "sha256": "0grlszp00rw63psv21n70alapkw1pgaq8cp9c0b1klk50jcnnx8q", + "version": "5.11.4" }, "webp-express": { "path": "webp-express/tags/0.25.8", @@ -144,10 +150,10 @@ "version": "0.25.8" }, "wordpress-seo": { - "path": "wordpress-seo/tags/20.7", - "rev": "2909990", - "sha256": "187lkzb9p889xj8s9cwp3r7pjbzq3nv34ix2hcy8a7sr4380518w", - "version": "20.7" + "path": "wordpress-seo/tags/21.5", + "rev": "2986840", + "sha256": "1a1mnsh4imy7ab0b7hp0nis46ixwvj47wgibifa90qndbkv2mwsn", + "version": "21.5" }, "worker": { "path": "worker/tags/4.9.17", @@ -162,10 +168,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.2.1", - "rev": "2988099", - "sha256": "07fbib36zwzagshnx85i7lis65vgbva8q9fs2i1zk687yway60fx", - "version": "1.2.1" + "path": "wp-fastest-cache/tags/1.2.2", + "rev": "2994820", + "sha256": "1mj18yrljjdrd07b0yjkd9pwdciyn4jyrs6hgx6jcys0mc5p009v", + "version": "1.2.2" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -174,16 +180,16 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.9.0", - "rev": "2960628", - "sha256": "1zxpbm92v2hmqipr9jy5awv3wmp7zik85hk9sb7i4ccvds8i90yw", - "version": "3.9.0" + "path": "wp-mail-smtp/tags/3.10.0", + "rev": "2992136", + "sha256": "0py4ns4vsy9rpqq5gjyfc2p1lvf2gy28klw9ixkm6gdiim8pvl61", + "version": "3.10.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.1.6.2", - "rev": "2968479", - "sha256": "1sx8zki5ip2s3lkjdllsyybmsisy7dqzgnpgwj0ksk2gr4aksz1y", - "version": "14.1.6.2" + "path": "wp-statistics/tags/14.2", + "rev": "2976338", + "sha256": "0vcw6qp5w2whbpwcd9m0dpxf4ah0i7snygszp211lqg4g53qbyyv", + "version": "14.2" }, "wp-swiper": { "path": "wp-swiper/trunk", diff --git a/pkgs/servers/web-apps/wordpress/packages/themes.json b/pkgs/servers/web-apps/wordpress/packages/themes.json index 89923e6b538a0..92d09ef4ca97e 100644 --- a/pkgs/servers/web-apps/wordpress/packages/themes.json +++ b/pkgs/servers/web-apps/wordpress/packages/themes.json @@ -1,32 +1,32 @@ { "twentynineteen": { - "path": "twentynineteen/2.6", - "rev": "206169", - "sha256": "0wad8gnha0hnvqmcpvckq42xzi8nvrys4jflsbxiq694fzzr8wk5", - "version": "2.6" + "path": "twentynineteen/2.7", + "rev": "207575", + "sha256": "19zbbpj1qxfz6599di2455qr97z5x4vrprf0bf20c8dq8n8lrh41", + "version": "2.7" }, "twentytwenty": { - "path": "twentytwenty/2.3", - "rev": "206172", - "sha256": "0za1hkaymnphscabwrjxiskv9wgzp7rjwbxazyi19zhb85zh9niq", - "version": "2.3" + "path": "twentytwenty/2.4", + "rev": "207576", + "sha256": "0xp2jcgsn16gv9ad8dirm7j24mi7633yrl524wi858l3m8dh4q4a", + "version": "2.4" }, "twentytwentyone": { - "path": "twentytwentyone/1.9", - "rev": "206170", - "sha256": "0z7w6lk8aaj9wzi1g5rx5ji0w8d221k6cr7asyvsjwm0axdgnj50", - "version": "1.9" + "path": "twentytwentyone/2.0", + "rev": "207577", + "sha256": "0ypdqxfd1va9m6f3zbc0281i69br5hpvvjdqb03kk2xnmam2hjaa", + "version": "2.0" }, "twentytwentythree": { - "path": "twentytwentythree/1.2", - "rev": "198780", - "sha256": "1qybkprcjv89qrzkbv8lrhir6ns1wx3kzdimjnjhx70ggkbygh5y", - "version": "1.2" + "path": "twentytwentythree/1.3", + "rev": "207579", + "sha256": "0r2k73yskqaxhl641ri1shy74rck5xvmfi7b562kz3j44hx0dz4f", + "version": "1.3" }, "twentytwentytwo": { - "path": "twentytwentytwo/1.5", - "rev": "206171", - "sha256": "1zk83kn23gksk27xddqn31sdlhmsqz48p2r24qrbqyay367j8jln", - "version": "1.5" + "path": "twentytwentytwo/1.6", + "rev": "207578", + "sha256": "0ga1682a5sh038xfc7whvdws5vfy1g3qvvy13rm5dln79x022riq", + "version": "1.6" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json index da458b8ede9f2..ebcf43c24b067 100644 --- a/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/wordpress-plugins.json @@ -21,6 +21,7 @@ , "opengraph" , "simple-login-captcha" , "static-mail-sender-configurator" +, "tc-custom-javascript" , "webp-converter-for-media" , "webp-express" , "wordpress-seo" diff --git a/pkgs/servers/windmill/Cargo.lock b/pkgs/servers/windmill/Cargo.lock index 89e22cadf65df..155987a1ab3a3 100644 --- a/pkgs/servers/windmill/Cargo.lock +++ b/pkgs/servers/windmill/Cargo.lock @@ -34,32 +34,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] [[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[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 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -162,6 +174,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] +name = "archiver-rs" +version = "0.5.1" +source = "git+https://github.com/gz/archiver-rs.git?branch=patch-1#a73cef92c2a5b8f48c2a4a9e889952072e03b4b7" +dependencies = [ + "bzip2", + "flate2", + "tar", + "thiserror", + "xz2", + "zip", +] + +[[package]] name = "argon2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -170,7 +195,7 @@ dependencies = [ "base64ct", "blake2", "cpufeatures", - "password-hash", + "password-hash 0.5.0", ] [[package]] @@ -186,25 +211,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - -[[package]] name = "ast_node" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -214,8 +230,21 @@ 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-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -231,15 +260,15 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd", - "zstd-safe", + "zstd 0.11.2+zstd.1.5.2", + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "flate2", @@ -255,11 +284,11 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -269,12 +298,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -284,15 +313,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling", - "rustix 0.37.26", + "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", @@ -304,7 +333,18 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -313,7 +353,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "http", "rand 0.8.5", @@ -334,7 +374,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -343,15 +383,15 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -365,11 +405,12 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.14.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85eb331f5c2b6ae4ff00aabd20a8a21de88b9890c58579616bf760570b207" +checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" dependencies = [ "chrono", + "futures-util", "hex", "hmac", "http-types", @@ -377,7 +418,8 @@ dependencies = [ "hyper-tls", "serde", "serde_json", - "serde_qs 0.9.2", + "serde_path_to_error", + "serde_qs 0.10.1", "sha2 0.10.8", "smart-default", "smol_str", @@ -400,7 +442,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -419,6 +461,28 @@ dependencies = [ ] [[package]] +name = "asynchronous-codec" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" +dependencies = [ + "bytes", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "atoi" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +dependencies = [ + "num-traits", +] + +[[package]] name = "atoi" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -440,6 +504,382 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "aws-config" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.0.1", + "hex", + "http", + "hyper", + "ring 0.17.5", + "time", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246" +dependencies = [ + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff" +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", + "fastrand 2.0.1", + "http", + "percent-encoding", + "tracing", + "uuid 1.5.0", +] + +[[package]] +name = "aws-sdk-s3" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf188e8af89adb0b41ae2f21b6c666c618959e40242e79aaa43fafa9c0c90a8a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http", + "http-body", + "once_cell", + "percent-encoding", + "regex", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http", + "num-bigint", + "once_cell", + "p256", + "percent-encoding", + "regex", + "ring 0.17.5", + "sha2 0.10.8", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb5701fbfb40600cc0fa547f318552dfd4e632b2099bd75d95fb0faae70675d" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body", + "md-5 0.10.6", + "pin-project-lite", + "sha1", + "sha2 0.10.8", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b33fa99f928a5815b94ee07e1377901bcf51aa749034a2c802dc38f9dcfacf5" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.9", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "http", + "rustc_version 0.4.0", + "tracing", +] + +[[package]] name = "axum" version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -505,6 +945,12 @@ dependencies = [ ] [[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -518,9 +964,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -547,7 +993,7 @@ dependencies = [ "async-trait", "futures-channel", "futures-util", - "parking_lot", + "parking_lot 0.12.1", "tokio", ] @@ -612,15 +1058,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", "which", ] [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -633,25 +1079,10 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", + "syn 2.0.39", ] [[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" @@ -713,7 +1144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" dependencies = [ "block-padding", - "cipher", + "cipher 0.3.0", ] [[package]] @@ -724,63 +1155,42 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.0", + "async-lock 3.1.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "piper", "tracing", ] [[package]] name = "borsh" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" dependencies = [ "borsh-derive", - "hashbrown 0.13.2", + "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "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" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", + "syn_derive", ] [[package]] @@ -796,23 +1206,21 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "btoi" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", + "num-traits", ] [[package]] @@ -858,6 +1266,20 @@ name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +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.39", +] [[package]] name = "byteorder" @@ -872,6 +1294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + +[[package]] name = "bzip2" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -894,12 +1326,12 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" +checksum = "d60d9b91c73bc662dc45aff607f5ffe79724b7cf7d7c8dc12a72b25921683b67" dependencies = [ "byteorder", - "candle-gemm", + "gemm", "half", "memmap2", "num-traits", @@ -914,135 +1346,10 @@ dependencies = [ ] [[package]] -name = "candle-gemm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" -dependencies = [ - "candle-gemm-c32", - "candle-gemm-c64", - "candle-gemm-common", - "candle-gemm-f16", - "candle-gemm-f32", - "candle-gemm-f64", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-common" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" -dependencies = [ - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f16" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" -dependencies = [ - "candle-gemm-common", - "candle-gemm-f32", - "dyn-stack", - "half", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] name = "candle-nn" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" +checksum = "4eb6e13e7076439309786482d4d4c1b4e1f2b102ca93513372d5419ffcf5df25" dependencies = [ "candle-core", "half", @@ -1055,10 +1362,11 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" +checksum = "0169336de9dc62dd84e19af1408e53ef8ad07eef8fc103cfebf5b6c3e3f23c2c" dependencies = [ + "byteorder", "candle-core", "candle-nn", "num-traits", @@ -1066,6 +1374,7 @@ dependencies = [ "rayon", "serde", "serde_json", + "serde_plain", "tracing", "wav", ] @@ -1108,6 +1417,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" @@ -1124,9 +1439,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" dependencies = [ "chrono", "chrono-tz-build", @@ -1135,13 +1450,13 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf 0.11.2", - "phf_codegen 0.11.2", + "phf_codegen", ] [[package]] @@ -1154,6 +1469,16 @@ dependencies = [ ] [[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 = "clang-sys" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1166,9 +1491,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -1176,9 +1501,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -1188,21 +1513,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cmake" @@ -1243,6 +1568,12 @@ dependencies = [ ] [[package]] +name = "connection-string" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" + +[[package]] name = "console" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1293,6 +1624,12 @@ dependencies = [ ] [[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" @@ -1336,9 +1673,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1363,9 +1700,18 @@ 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 = "crc32c" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +dependencies = [ + "rustc_version 0.4.0", +] [[package]] name = "crc32fast" @@ -1461,6 +1807,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1515,7 +1873,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1537,7 +1895,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1550,7 +1908,7 @@ dependencies = [ "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.9", ] [[package]] @@ -1595,7 +1953,7 @@ checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1607,7 +1965,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1669,7 +2027,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "pin-project", "serde", "serde_json", @@ -1719,7 +2077,7 @@ dependencies = [ "deno-proc-macro-rules", "lazy-regex", "once_cell", - "pmutil", + "pmutil 0.6.1", "proc-macro-crate 1.3.1", "proc-macro2", "quote", @@ -1727,7 +2085,7 @@ dependencies = [ "strum", "strum_macros", "syn 1.0.109", - "syn 2.0.38", + "syn 2.0.39", "thiserror", ] @@ -1739,7 +2097,7 @@ checksum = "010ce5e0a920b2364c75a9e38bcd3344bfe55a6b6cd9ef6717d78e5478f9bcb3" dependencies = [ "deno_core", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1867,17 +2225,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" dependencies = [ "byteorder", - "cipher", + "cipher 0.3.0", "opaque-debug", ] [[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1900,11 +2252,20 @@ 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", + "dirs-sys 0.4.1", ] [[package]] @@ -1919,6 +2280,17 @@ 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" @@ -1970,9 +2342,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dyn-iter" @@ -1982,15 +2354,27 @@ checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" [[package]] name = "dyn-stack" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" dependencies = [ "bytemuck", "reborrow", ] [[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der 0.6.1", + "elliptic-curve", + "rfc6979", + "signature 1.6.4", +] + +[[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2000,12 +2384,35 @@ dependencies = [ ] [[package]] -name = "ena" -version = "0.14.2" +name = "elliptic-curve" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "log", + "base16ct", + "crypto-bigint", + "der 0.6.1", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "embed-doc-image" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" +dependencies = [ + "base64 0.13.1", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -2015,6 +2422,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + +[[package]] name = "encoding_rs" version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2024,6 +2495,26 @@ dependencies = [ ] [[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[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.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2031,9 +2522,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2066,6 +2557,27 @@ 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-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + +[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2087,6 +2599,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "filetime" version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2105,12 +2627,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[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" @@ -2169,10 +2685,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2200,7 +2716,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2212,7 +2728,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2224,7 +2740,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2245,9 +2761,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2260,9 +2776,9 @@ 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", "futures-sink", @@ -2270,15 +2786,15 @@ dependencies = [ [[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", @@ -2287,20 +2803,31 @@ dependencies = [ [[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-intrusive" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2318,33 +2845,43 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "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.38", + "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-channel", "futures-core", @@ -2365,12 +2902,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.5", "dirs-next", "hyper", "hyper-rustls", "ring 0.16.20", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -2384,6 +2921,123 @@ dependencies = [ ] [[package]] +name = "gemm" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2425,9 +3079,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", @@ -2444,24 +3098,22 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2508,10 +3160,21 @@ dependencies = [ ] [[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[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", @@ -2519,7 +3182,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -2532,6 +3195,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "bytemuck", "cfg-if", "crunchy", "num-traits", @@ -2545,7 +3209,7 @@ 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]] @@ -2554,7 +3218,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] @@ -2563,7 +3227,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -2582,7 +3246,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -2627,7 +3291,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" dependencies = [ - "dirs", + "dirs 5.0.1", "indicatif", "log", "native-tls", @@ -2667,9 +3331,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", @@ -2700,9 +3364,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "base64 0.13.1", - "futures-lite", + "futures-lite 1.13.0", "http", "infer", "pin-project-lite", @@ -2752,17 +3416,18 @@ 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", + "log", + "rustls 0.21.9", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -2836,9 +3501,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2864,6 +3529,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2885,32 +3559,34 @@ dependencies = [ [[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-macro" -version = "0.3.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" +checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.5.3", "proc-macro2", "quote", - "syn 2.0.38", + "syn 1.0.109", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is-macro" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" dependencies = [ - "hermit-abi", - "rustix 0.38.20", - "windows-sys 0.48.0", + "Inflector", + "pmutil 0.6.1", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] @@ -2932,6 +3608,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" @@ -2948,9 +3633,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2961,7 +3646,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "pem 1.1.1", "ring 0.16.20", "serde", @@ -2970,6 +3655,15 @@ dependencies = [ ] [[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap 2.1.0", +] + +[[package]] name = "konst" version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2994,35 +3688,10 @@ dependencies = [ ] [[package]] -name = "lalrpop" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.6.29", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - -[[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" -dependencies = [ - "regex", -] +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lazy-regex" @@ -3063,83 +3732,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3170,6 +3766,17 @@ 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.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libsqlite3-sys" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3221,9 +3828,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -3245,21 +3852,22 @@ dependencies = [ ] [[package]] -name = "lru" -version = "0.10.1" +name = "loki-api" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" dependencies = [ - "hashbrown 0.13.2", + "prost", + "prost-types", ] [[package]] -name = "lz4_flex" -version = "0.9.5" +name = "lru" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ - "twox-hash", + "hashbrown 0.14.2", ] [[package]] @@ -3291,12 +3899,12 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[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", + "aes 0.7.5", + "base64 0.21.5", "block-modes", "crc-any", "des", @@ -3324,14 +3932,70 @@ dependencies = [ "base64 0.20.0", "gethostname", "mail-builder", - "rustls", + "rustls 0.21.9", "smtp-proto", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "webpki-roots 0.25.2", ] [[package]] +name = "malachite" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" +dependencies = [ + "malachite-base", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-base" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" +dependencies = [ + "itertools 0.11.0", + "ryu", +] + +[[package]] +name = "malachite-bigint" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c3eca3b5df299486144c8423c45c24bdf9e82e2452c8a1eeda547c4d8b5d41" +dependencies = [ + "derive_more", + "malachite", + "num-integer", + "num-traits", + "paste", +] + +[[package]] +name = "malachite-nz" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" +dependencies = [ + "embed-doc-image", + "itertools 0.11.0", + "malachite-base", +] + +[[package]] +name = "malachite-q" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" +dependencies = [ + "itertools 0.11.0", + "malachite-base", + "malachite-nz", +] + +[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3431,9 +4095,9 @@ 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", @@ -3443,9 +4107,9 @@ dependencies = [ [[package]] name = "monostate" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +checksum = "e404e13820ea0df0eda93aa294e0c80de76a0daa6bec590d376fbec6d7810394" dependencies = [ "monostate-impl", "serde", @@ -3453,13 +4117,13 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +checksum = "531c82a934da419bed3da09bd87d6e98c72f8d4aa755427b3b009c2b8b8c433c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3475,16 +4139,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "termcolor", "thiserror", ] [[package]] name = "mysql_async" -version = "0.32.2" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" +checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" dependencies = [ "bytes", "crossbeam", @@ -3492,16 +4156,17 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", + "keyed_priority_queue", "lazy_static", "lru", "mio", "mysql_common", "native-tls", "once_cell", - "pem 2.0.1", + "pem 3.0.2", "percent-encoding", "pin-project", - "priority-queue", + "rand 0.8.5", "serde", "serde_json", "socket2 0.5.5", @@ -3515,15 +4180,16 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.30.6" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" +checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ - "base64 0.21.4", - "bigdecimal 0.3.1", - "bindgen 0.68.1", + "base64 0.21.5", + "bigdecimal 0.4.2", + "bindgen 0.69.1", "bitflags 2.4.1", "bitvec", + "btoi", "byteorder", "bytes", "cc", @@ -3532,7 +4198,6 @@ dependencies = [ "flate2", "frunk", "lazy_static", - "lexical", "mysql-common-derive", "num-bigint", "num-traits", @@ -3549,6 +4214,7 @@ dependencies = [ "thiserror", "time", "uuid 1.5.0", + "zstd 0.12.4", ] [[package]] @@ -3642,8 +4308,8 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ + "bytemuck", "num-traits", - "serde", ] [[package]] @@ -3749,9 +4415,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3770,7 +4436,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3781,9 +4447,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3810,6 +4476,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.8", +] + +[[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3817,12 +4494,37 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "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]] @@ -3849,6 +4551,17 @@ dependencies = [ [[package]] name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "password-hash" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" @@ -3871,6 +4584,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.7", + "hmac", + "password-hash 0.4.2", + "sha2 0.10.8", +] + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3887,21 +4612,11 @@ dependencies = [ [[package]] name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.4", - "serde", -] - -[[package]] -name = "pem" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "serde", ] @@ -3930,24 +4645,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "pest" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +name = "pg-embed" +version = "0.7.2" +source = "git+https://github.com/faokunega/pg-embed#72db5e053f0afac6eee51d3baa2fd5c90803e02d" dependencies = [ - "memchr", + "archiver-rs", + "async-trait", + "bytes", + "dirs 5.0.1", + "futures", + "lazy_static", + "log", + "reqwest", + "sqlx 0.6.3", "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.2", + "tokio", + "zip", ] [[package]] @@ -3973,16 +4686,6 @@ 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_codegen" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" @@ -4035,7 +4738,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4073,7 +4776,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4150,13 +4853,24 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pmutil" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pmutil" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4177,9 +4891,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postgres" @@ -4214,7 +4928,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "byteorder", "bytes", "fallible-iterator", @@ -4261,6 +4975,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + +[[package]] name = "prettyplease" version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4277,36 +4997,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "priority-queue" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" -dependencies = [ - "autocfg", - "indexmap 1.9.3", + "syn 2.0.39", ] [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "toml 0.5.11", + "once_cell", + "toml_edit 0.19.15", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "once_cell", - "toml_edit", + "toml_edit 0.20.7", ] [[package]] @@ -4397,7 +5107,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "typify", "unicode-ident", @@ -4417,7 +5127,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4436,11 +5146,43 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot", + "parking_lot 0.12.1", "thiserror", ] [[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-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" @@ -4470,6 +5212,18 @@ dependencies = [ ] [[package]] +name = "pulp" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] name = "quick-xml" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4485,10 +5239,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "equivalent", "hashbrown 0.14.2", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -4571,7 +5325,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.11", ] [[package]] @@ -4690,12 +5444,12 @@ dependencies = [ [[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.11", + "libredox", "thiserror", ] @@ -4774,8 +5528,8 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "async-compression 0.4.4", - "base64 0.21.4", + "async-compression 0.4.5", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -4794,7 +5548,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -4802,7 +5556,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-socks", "tokio-util", "tower-service", @@ -4816,6 +5570,17 @@ dependencies = [ ] [[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac", + "zeroize", +] + +[[package]] name = "riff" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4843,7 +5608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4901,21 +5666,19 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", - "signature 2.1.0", + "signature 2.2.0", "spki 0.7.2", "subtle", "zeroize", @@ -4956,7 +5719,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.38", + "syn 2.0.39", "walkdir", ] @@ -4972,9 +5735,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", @@ -5019,22 +5782,22 @@ dependencies = [ [[package]] name = "rustfmt-wrapper" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed729e3bee08ec2befd593c27e90ca9fdd25efdc83c94c3b82eaef16e4f7406e" +checksum = "f1adc9dfed5cc999077978cc7163b9282c5751c8d39827c4ea8c8c220ca5a440" dependencies = [ "serde", "tempfile", "thiserror", - "toml 0.5.11", + "toml 0.8.8", "toolchain_find", ] [[package]] name = "rustix" -version = "0.37.26" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -5046,25 +5809,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +dependencies = [ + "log", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -5083,71 +5858,53 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustpython-ast" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b83af38212db64ecfc76b6d53a1c6de89733236e39c69d4bc8ab565ae167b2" -dependencies = [ - "num-bigint", - "rustpython-compiler-core", -] - -[[package]] -name = "rustpython-compiler-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81870eb757460989d43ce41e069f1a01d0292b33011b23b0455d0a6394e4c77a" +checksum = "fcf9438da3660e6b88bd659fdc0cd13bcff4b85c584026a48b800c75bf0f8d00" dependencies = [ - "bincode", - "bitflags 1.3.2", - "bstr", - "itertools 0.10.5", - "lz4_flex", - "num-bigint", - "num-complex", - "serde", + "is-macro 0.2.2", + "malachite-bigint", + "rustpython-parser-core", "static_assertions", - "thiserror", ] [[package]] name = "rustpython-parser" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7348e148144ba85bc1284d97004062137306554fd00e7eb500d91720de5e78" +checksum = "9db993974ff12f33c5be8a801741463691502f85ead5c503277937c4077bd92a" dependencies = [ - "ahash 0.7.6", "anyhow", + "is-macro 0.2.2", "itertools 0.10.5", - "lalrpop", "lalrpop-util", "log", - "num-bigint", + "malachite-bigint", "num-traits", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf 0.11.2", + "phf_codegen", "rustc-hash", "rustpython-ast", - "rustpython-compiler-core", - "thiserror", + "rustpython-parser-core", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -5155,6 +5912,27 @@ dependencies = [ ] [[package]] +name = "rustpython-parser-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9d560c6dd4dc774d4bbad48c770e074c178c4ed5f6fd0521fcdb639af21bdd" +dependencies = [ + "is-macro 0.2.2", + "memchr", + "rustpython-parser-vendored", +] + +[[package]] +name = "rustpython-parser-vendored" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae3062d7fe5fe38073f3a1c7145ed9a04e15f6e4a596d642c7db2d5cd2b51b" +dependencies = [ + "memchr", + "once_cell", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5182,7 +5960,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bindgen 0.65.1", "chrono", "data-encoding", @@ -5229,9 +6007,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "chrono", "dyn-clone", @@ -5243,9 +6021,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -5267,12 +6045,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5282,6 +6060,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der 0.6.1", + "generic-array", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5310,16 +6102,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -5338,15 +6121,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] name = "seq-macro" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5354,9 +6128,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5394,13 +6168,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5416,11 +6190,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5437,6 +6211,15 @@ dependencies = [ ] [[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_qs" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5449,9 +6232,9 @@ dependencies = [ [[package]] name = "serde_qs" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af4cee6cd4b23b45e6709150d1e9af5c748131de7e3316a7c2b3008051ed725" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" dependencies = [ "percent-encoding", "serde", @@ -5460,9 +6243,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5476,7 +6259,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5509,11 +6292,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5608,9 +6391,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 0.10.7", "rand_core 0.6.4", @@ -5651,9 +6434,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smart-default" @@ -5693,6 +6476,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5798,12 +6587,22 @@ dependencies = [ [[package]] name = "sqlx" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +dependencies = [ + "sqlx-core 0.6.3", + "sqlx-macros 0.6.3", +] + +[[package]] +name = "sqlx" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.7.2", + "sqlx-macros 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -5811,12 +6610,65 @@ dependencies = [ [[package]] name = "sqlx-core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +dependencies = [ + "ahash 0.7.7", + "atoi 1.0.0", + "base64 0.13.1", + "bitflags 1.3.2", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dirs 4.0.0", + "dotenvy", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive 0.4.2", + "futures-util", + "hashlink", + "hex", + "hkdf", + "hmac", + "indexmap 1.9.3", + "itoa", + "libc", + "log", + "md-5 0.10.6", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rand 0.8.5", + "rustls 0.20.9", + "rustls-pemfile", + "serde", + "serde_json", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlformat", + "sqlx-rt", + "stringprep", + "thiserror", + "tokio-stream", + "url", + "webpki-roots 0.22.6", + "whoami", +] + +[[package]] +name = "sqlx-core" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ - "ahash 0.8.3", - "atoi", + "ahash 0.8.6", + "atoi 2.0.0", "bigdecimal 0.3.1", "byteorder", "bytes", @@ -5825,21 +6677,21 @@ dependencies = [ "crossbeam-queue", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-io", "futures-util", "hashlink", "hex", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -5857,13 +6709,32 @@ dependencies = [ [[package]] name = "sqlx-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +dependencies = [ + "dotenvy", + "either", + "heck", + "once_cell", + "proc-macro2", + "quote", + "sha2 0.10.8", + "sqlx-core 0.6.3", + "sqlx-rt", + "syn 1.0.109", + "url", +] + +[[package]] +name = "sqlx-macros" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-macros-core", "syn 1.0.109", ] @@ -5884,7 +6755,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -5900,8 +6771,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5926,12 +6797,12 @@ dependencies = [ "once_cell", "percent-encoding", "rand 0.8.5", - "rsa 0.9.2", + "rsa 0.9.3", "serde", "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5945,8 +6816,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5974,7 +6845,7 @@ dependencies = [ "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5983,24 +6854,35 @@ dependencies = [ ] [[package]] +name = "sqlx-rt" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +dependencies = [ + "once_cell", + "tokio", + "tokio-rustls 0.23.4", +] + +[[package]] name = "sqlx-sqlite" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ - "atoi", + "atoi 2.0.0", "chrono", "flume", "futures-channel", "futures-core", "futures-executor", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-util", "libsqlite3-sys", "log", "percent-encoding", "serde", - "sqlx-core", + "sqlx-core 0.7.2", "tracing", "url", "uuid 1.5.0", @@ -6039,7 +6921,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -6063,11 +6945,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6106,7 +6988,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6184,11 +7066,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6198,7 +7080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" dependencies = [ "bitflags 2.4.1", - "is-macro", + "is-macro 0.3.0", "num-bigint", "scoped-tls", "serde", @@ -6233,11 +7115,11 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6316,11 +7198,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6421,10 +7303,10 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6433,10 +7315,10 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6456,11 +7338,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6476,9 +7358,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -6486,6 +7368,18 @@ 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" @@ -6499,7 +7393,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -6531,34 +7425,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "tempfile" -version = "3.8.0" +name = "tar" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.20", - "windows-sys 0.48.0", + "filetime", + "libc", + "xattr", ] [[package]] -name = "term" -version = "0.7.0" +name = "tempfile" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "dirs-next", - "rustversion", - "winapi", + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.24", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6589,7 +7483,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6603,6 +7497,34 @@ dependencies = [ ] [[package]] +name = "tiberius" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6e2bf3e4b5be181a2a2ceff4b9b12e2684010d436a6958bd564fbc8094d44d" +dependencies = [ + "async-trait", + "asynchronous-codec", + "byteorder", + "bytes", + "chrono", + "connection-string", + "encoding", + "enumflags2", + "futures-util", + "num-traits", + "once_cell", + "pin-project-lite", + "pretty-hex", + "rustls-native-certs", + "rustls-pemfile", + "thiserror", + "tokio-rustls 0.23.4", + "tokio-util", + "tracing", + "uuid 1.5.0", +] + +[[package]] name = "tiger" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6669,7 +7591,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tinyvector" version = "0.1.0" -source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" +source = "git+https://github.com/windmill-labs/tinyvector?rev=20823b94c20f2b9093f318badd24026cf54dcc85#20823b94c20f2b9093f318badd24026cf54dcc85" dependencies = [ "anyhow", "bincode", @@ -6691,7 +7613,7 @@ dependencies = [ "clap", "derive_builder", "esaxx-rs", - "getrandom 0.2.10", + "getrandom 0.2.11", "indicatif", "itertools 0.11.0", "lazy_static", @@ -6725,7 +7647,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -6742,7 +7664,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6779,7 +7701,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "parking_lot", + "parking_lot 0.12.1", "percent-encoding", "phf 0.11.2", "pin-project-lite", @@ -6794,11 +7716,22 @@ 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", + "rustls 0.21.9", "tokio", ] @@ -6842,12 +7775,13 @@ 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", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -6856,30 +7790,33 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +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", ] @@ -6890,7 +7827,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "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", @@ -6899,14 +7860,14 @@ dependencies = [ [[package]] name = "toolchain_find" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413" +checksum = "ebc8c9a7f0a2966e1acdaf0461023d0b01471eeead645370cf4c3f5cff153f2a" dependencies = [ "home", - "lazy_static", + "once_cell", "regex", - "semver 0.11.0", + "semver 1.0.20", "walkdir", ] @@ -6937,7 +7898,7 @@ dependencies = [ "cookie", "futures-util", "http", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "tower-layer", "tower-service", @@ -6994,7 +7955,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -7030,13 +7991,45 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-loki" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49bbc87d08020d7c2a9f4bb0b7d10da5381d3867f8ae57fcc54621b34567e963" +dependencies = [ + "loki-api", + "reqwest", + "serde", + "serde_json", + "snap", + "tokio", + "tokio-stream", + "tracing", "tracing-core", + "tracing-log 0.1.4", + "tracing-serde", + "tracing-subscriber", + "url", ] [[package]] @@ -7051,9 +8044,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -7066,7 +8059,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] @@ -7132,7 +8125,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "unicode-ident", ] @@ -7149,17 +8142,11 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.38", + "syn 2.0.39", "typify-impl", ] [[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] name = "ulid" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7304,9 +8291,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "unicode_names2" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" +checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" [[package]] name = "unsafe-libyaml" @@ -7332,12 +8319,12 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "flate2", "log", "native-tls", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-webpki", "serde", "serde_json", @@ -7388,7 +8375,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -7397,7 +8384,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -7482,9 +8469,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7492,24 +8479,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -7519,9 +8506,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7529,28 +8516,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-test" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" dependencies = [ "console_error_panic_hook", "js-sys", @@ -7562,12 +8549,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" dependencies = [ "proc-macro2", "quote", + "syn 2.0.39", ] [[package]] @@ -7594,9 +8582,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -7645,7 +8633,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.20", + "rustix 0.38.24", ] [[package]] @@ -7691,11 +8679,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", - "base64 0.21.4", + "base64 0.21.5", "chrono", "dotenv", "futures", @@ -7703,6 +8691,7 @@ dependencies = [ "git-version", "lazy_static", "once_cell", + "pg-embed", "prometheus", "rand 0.8.5", "reqwest", @@ -7710,7 +8699,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "tokio", "tokio-metrics", "tracing", @@ -7725,7 +8714,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "argon2", @@ -7733,8 +8722,10 @@ dependencies = [ "async-recursion", "async-stripe", "async_zip", + "aws-config", + "aws-sdk-s3", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "candle-core", "candle-nn", @@ -7749,7 +8740,7 @@ dependencies = [ "hf-hub", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "magic-crypt", "mail-send", @@ -7768,7 +8759,7 @@ dependencies = [ "serde_urlencoded", "sha2 0.10.8", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tempfile", "time", "tinyvector", @@ -7792,9 +8783,9 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.188.1" +version = "1.210.1" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "chrono", "openapiv3", "prettyplease 0.1.25", @@ -7810,28 +8801,30 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.188.1" +version = "1.210.1" dependencies = [ "chrono", "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tracing", "windmill-common", ] [[package]] name = "windmill-common" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", "chrono", + "cron", + "git-version", "hex", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "rand 0.8.5", @@ -7840,18 +8833,19 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "thiserror", "tokio", "tracing", "tracing-flame", + "tracing-loki", "tracing-subscriber", "uuid 1.5.0", ] [[package]] name = "windmill-parser" -version = "1.188.1" +version = "1.210.1" dependencies = [ "serde", "serde_json", @@ -7859,7 +8853,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7870,11 +8864,11 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "gosyn", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "regex", "windmill-parser", @@ -7882,7 +8876,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7893,10 +8887,10 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.0", "rustpython-parser", "serde_json", "windmill-parser", @@ -7904,24 +8898,24 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "phf 0.11.2", "regex", "rustpython-parser", "serde_json", - "sqlx", + "sqlx 0.7.2", "windmill-common", "windmill-parser", ] [[package]] name = "windmill-parser-sql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7932,7 +8926,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7949,10 +8943,10 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "getrandom 0.2.10", + "getrandom 0.2.11", "serde_json", "wasm-bindgen", "wasm-bindgen-test", @@ -7967,7 +8961,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", @@ -7979,7 +8973,7 @@ dependencies = [ "futures-core", "hex", "hmac", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "reqwest", @@ -7987,7 +8981,7 @@ dependencies = [ "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tokio", "tracing", "ulid", @@ -7998,11 +8992,11 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "base64 0.21.4", + "base64 0.21.5", "bytes", "chrono", "const_format", @@ -8018,7 +9012,8 @@ dependencies = [ "futures", "gcp_auth", "git-version", - "itertools 0.11.0", + "hex", + "itertools 0.12.0", "jsonwebtoken", "lazy_static", "mysql_async", @@ -8036,9 +9031,11 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", + "tiberius", "tokio", "tokio-postgres", + "tokio-util", "tracing", "urlencoding", "uuid 1.5.0", @@ -8198,9 +9195,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -8234,6 +9231,12 @@ dependencies = [ ] [[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8244,9 +9247,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -8256,17 +9259,37 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "zerofrom" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8283,15 +9306,15 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[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 = "zip" @@ -8299,9 +9322,18 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes 0.8.3", "byteorder", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -8310,7 +9342,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[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]] @@ -8324,6 +9365,16 @@ dependencies = [ ] [[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.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index 6b822ade08b69..d40ec9f4f0cf2 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -14,9 +14,9 @@ , openssl , pango , pixman +, giflib , pkg-config , python3 -, rust , rustfmt , stdenv , swagger-cli @@ -24,13 +24,13 @@ let pname = "windmill"; - version = "1.188.1"; + version = "1.210.1"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; + hash = "sha256-ss3EsIqfuctPOEdI5IQtyFFcDzIqnFm6UUG1vA+OlkQ="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -43,7 +43,7 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; + npmDepsHash = "sha256-l9MRaa6TaBg9vFoVuIGZNC9jLS29TlWeSniIBRNDRgU="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory @@ -53,7 +53,7 @@ let npm run generate-backend-client ''; - buildInputs = [ pixman cairo pango ]; + buildInputs = [ pixman cairo pango giflib ]; nativeBuildInputs = [ python3 pkg-config ]; installPhase = '' @@ -70,11 +70,10 @@ rustPlatform.buildRustPackage { SQLX_OFFLINE = "true"; RUSTY_V8_ARCHIVE = let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); meta = { inherit (args) version; }; }; @@ -95,6 +94,8 @@ rustPlatform.buildRustPackage { outputHashes = { "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; + "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk="; + "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY="; }; }; @@ -120,6 +121,7 @@ rustPlatform.buildRustPackage { openssl rustfmt lld + stdenv.cc.cc.lib ]; nativeBuildInputs = [ @@ -148,6 +150,7 @@ rustPlatform.buildRustPackage { wrapProgram "$out/bin/windmill" \ --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 93986677b28ea..cc9bc6cfd89ea 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-NSL67j/nnE6Ftm39XNav3/TPUSFXHxQE5OxpNEIdtVc="; + sha256 = "sha256-B4p2j/U+vTiku7rTj5Ho6BY84kjrNHLDIkI9pZZdmHI="; }; - vendorHash = "sha256-8TQkzsvHjdkYXVmUKaqbs7nURx8kUv2HGs9cBv3hPJc="; + vendorHash = "sha256-kfeIEpe6g4T9joAZesgqdE5dd9UD9+a0nALceKq1/zc="; doCheck = false; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index a9c607ae35ea0..833acf43a5b0a 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # This is the builder for all X.org components. source $stdenv/setup diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 870ea4ad05854..e561e854a7102 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1518,11 +1518,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXrandr = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXrender, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXrandr"; - version = "1.5.3"; + version = "1.5.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz"; - sha256 = "0a5l9q37c9m6gfdchlj43a9j3mw2avfwasfn0ivlkqbq980kjxl9"; + url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz"; + sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1919,11 +1919,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! luit = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "luit"; - version = "20190106"; + version = "20230201"; builder = ./builder.sh; src = fetchurl { - url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; - sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; + url = "https://invisible-mirror.net/archives/luit/luit-20230201.tgz"; + sha256 = "0vy5fqp26pnrdn0hmgnmar6m2y06syrz188jqh03vqkyphfqsapf"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2859,11 +2859,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videoati = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xf86-video-ati"; - version = "5eba006e4129e8015b822f9e1d2f1e613e252cda"; + version = "22.0.0"; builder = ./builder.sh; src = fetchurl { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2"; - sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b"; + url = "mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz"; + sha256 = "0vdznwx78alhbb05paw2xd65hcsila2kqflwwnbpq8pnsdbbpj68"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3899,11 +3899,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.39"; + version = "2.40"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.39.tar.xz"; - sha256 = "10m6mbjymi7qf30g5yd400kqijdjg7ym9qjzh0bc3c7pxwrzbias"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz"; + sha256 = "1qrakn6gyj701mxwbrlhjv4gd73ws51140ns68a1kivxxhdvlgbs"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 280e1b19ec5ae..b3aac93d89cb4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -570,17 +570,6 @@ self: super: configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; }); - xf86videoati = super.xf86videoati.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - patches = [ - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; - sha256 = "sha256-79nqKuJRgMYXDEMB8IWxdmbxtI/m+Oca1wSLYeGMuEk="; - }) - ]; - }); - xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 06a2b69d505af..6a2cfd52886ee 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,4 +1,4 @@ -https://invisible-mirror.net/archives/luit/luit-20190106.tgz +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 @@ -74,7 +74,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.39.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.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 @@ -89,7 +89,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.6.tar.xz mirror://xorg/individual/driver/xf86-video-ast-1.1.6.tar.xz -https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/archive/5eba006e4129e8015b822f9e1d2f1e613e252cda/xf86-video-ati-5eba006e4129e8015b822f9e1d2f1e613e252cda.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-22.0.0.tar.xz mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz @@ -195,7 +195,7 @@ 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 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz -mirror://xorg/individual/lib/libXrandr-1.5.3.tar.xz +mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz mirror://xorg/individual/lib/libXrender-0.9.11.tar.xz mirror://xorg/individual/lib/libXres-1.2.2.tar.xz mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 1cbd33cd4fd9a..9e0601fbd0939 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -10,13 +10,14 @@ , withZlib ? true, zlib , withTools ? false , withRedis ? false +, withImagemagick ? false, imagemagick }: let ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ]; in stdenv.mkDerivation rec { pname = "ejabberd"; - version = "23.01"; + version = "23.10"; nativeBuildInputs = [ makeWrapper autoreconfHook ]; @@ -28,7 +29,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz"; - sha256 = "sha256-K4P+A2u/Hbina4b3GP8T3wmPoQxiv88GuB4KZOb2+cA="; + hash = "sha256-DW5/DYLZHNqJ4lddmag1B0E9ov/eObIVGASUeioPolg="; + # remember to update the deps FOD hash & its pinned ejabberd-po commit }; passthru.tests = { @@ -40,6 +42,15 @@ in stdenv.mkDerivation rec { inherit src version; + # pin ejabberd-po dep + # update: curl -L api.github.com/repos/processone/ejabberd-po/branches/main | jq .commit.sha -r + postPatch = '' + substituteInPlace rebar.config \ + --replace \ + '{git, "https://github.com/processone/ejabberd-po", {branch, "main"}}' \ + '{git, "https://github.com/processone/ejabberd-po", {tag, "26d6463386588d39f07027dabff3cb8dd938bf6b"}}' + ''; + configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; nativeBuildInputs = [ @@ -56,9 +67,10 @@ in stdenv.mkDerivation rec { git reset --hard git clean -ffdx git describe --always --tags > .rev - rm -rf .git + rm -rf .git .github ) done + # not a typo; comes from `make deps` rm deps/.got cp -r deps $out @@ -71,7 +83,7 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-Lj4YSPOiiJQ6uN4cAR+1s/eVSfoIsuvWR7gGkVYrOfc="; + outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI="; }; configureFlags = [ @@ -100,6 +112,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''} rm $out/bin/{mix,iex,elixir} ''; diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index ad16e257bf627..1c1f5848aa303 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.17.1"; + version = "1.19.1"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-aYKTkx5v7tB6k/UBcS0NOgA6SiRrjzn1lUTH/Xp5DFM="; + hash = "sha256-BGHfwKoMfOZUsa05kEt8W2luc1aC3Su/OyaGmcb4UiI="; }; checkPlugins = [ fishtape ]; @@ -16,10 +16,10 @@ buildFishPlugin rec { fishtape test/done.fish ''; - meta = { + meta = with lib; { description = "Automatically receive notifications when long processes finish"; homepage = "https://github.com/franciscolourenco/done"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ malo ]; + license = licenses.mit; + maintainers = [ maintainers.malo ]; }; } diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix index 83192ad092f56..14b57b9a62c65 100644 --- a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix +++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "github-copilot-cli.fish"; - version = "0.1.33"; + version = "0.1.33.1"; src = fetchFromGitHub { owner = "z11i"; repo = pname; rev = version; - hash = "sha256-dhACPlFrw1Z0dW0eA0IMnOelYJc7Fyz2D9u+rL1pyiM="; + hash = "sha256-CFXbeO0euC/UtvQV0KCz4WQfdJgsuXKPM6M9oaw7hvg="; }; meta = with lib; { diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index e558402543bf9..f5450e1da5c32 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { description = "An interactive Unix-like shell written in Go"; changelog = "https://github.com/Rosettea/Hilbish/releases/tag/v${version}"; homepage = "https://github.com/Rosettea/Hilbish"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.mit; }; } diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index acd7494fd3cc9..6d424d94a46ff 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.86.0"; + version = "0.87.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-jUZKqsu0/RO4mc+hzjis1mNrohj1JzM17Z8e2Ggxlfs="; + hash = "sha256-anIkIVRsJW2f2hj/Bz9lcw1vFoWhGHAE/XgIvnxbJg8="; }; - cargoHash = "sha256-WDGhuc2ZGDwfh7X/oRTZLzmKPj1jSnQFL4sy7KYt5Js="; + cargoHash = "sha256-vwOAYigKItd2T/ze5H26cMfIssoAnt0XFQtfA8exLyM="; 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 5aa0adae6ebb3..4b8181e293ca3 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-2023-10-19"; + version = "unstable-2023-10-31"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "7b2856ddff8afac538d826df4abc08325c4be39d"; - hash = "sha256-9OFKtaADDV5I5Yu0sCfQABAmf8yqwX2QwDhPPkh5BEo="; + rev = "c2bb125a6790bef1e448680e077345c4d10dcb12"; + hash = "sha256-Sug07QTL7fxxQAf9YOprMNEQSDqeXEk7qt1g2dP0Eqk="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 0603ba9bfb6b4..15c134018e659 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-Nuo+i1j2l5p3p1hFWipSk0EqZiR+9ZsQyTl3YmyBk+0="; + cargoHash = "sha256-fpqXXgvTuRnU4NkJ/B4m3VTkeujE7sMWOma4KEvlxYw="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index e35a7c483d86f..10ab89368a86e 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-GIIY4wK85igsfkwEiQ2+jJQTv5qekqx4y+OG0yt8TgE="; + cargoHash = "sha256-o/cOHlwo2TBlO+e6DBBKf5x6bgVGozVNMGRb2nCWPT4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index b34d0b17df13b..72094adc2a70e 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-l32TKBM01JAiUqhkxPsg76dodirZ/NuGn6/KKgHKS8I="; + cargoHash = "sha256-seqr4FZHg/f/8iMwSurJRKr41pUbKKti6H2z/JfYkuU="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index d90c4003cb8f4..7576a8ab9bdac 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.3"; + version = "7.4"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-uGiPbkIeKH9zu+xKJJLCYFnyejWLdq7bE59yub3f3KM="; + sha256 = "sha256-QkWUTqFoEA+XZv0EAHnDtkm9xI+NlQcNqicCvCtXJYc="; }; strictDeps = true; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 58485bc8c9aa0..63564b0db5471 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.3.9"; + version = "7.4.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -70,10 +70,6 @@ stdenv.mkDerivation rec { --set POWERSHELL_TELEMETRY_OPTOUT 1 \ --set DOTNET_CLI_TELEMETRY_OPTOUT 1 - '' + lib.optionalString (stdenv.isLinux && stdenv.isx86_64) '' - patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext} $out/share/powershell/libmi.so - patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext} $out/share/powershell/libmi.so - '' + lib.optionalString stdenv.isLinux '' patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $out/share/powershell/libcoreclrtraceptprovider.so @@ -88,19 +84,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-g63hMkJUIYFpSl9NylCQs0WYdq/8S3UaFVtRjhZOs+s="; + hash = "sha256-FnT91XGMr7gE7/dYX+i3BBNiMiqpRODS+BbKHXXmNR8="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-zy6VZyXj9TV5QlVFnCgiB6XfIOyS79kPOFhvMRpOrP4="; + hash = "sha256-E9MXYQuhM8ACmQxAYiqIaYk2hGBFGAmGHzeMJXMJifQ="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-DI+m3Ik1Zw293H6VR19DNAECBApqdIENlrK2/D/3vNc="; + hash = "sha256-i2vQtNp6wgU2g+0pizlviSn/XKO4AwZcc29TIJ6BXBM="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-eHlh46eV+g3eCiKalVGixwKY9mlk2lXRwUJF6By5lP0="; + hash = "sha256-qoLD6SQVA7UtsYJ+P9f8CZ2nT4KLoDLptyblDHK0vuU="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index b7c7284e9f43b..5dc50c558acd1 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -35,6 +35,6 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/spaceship-prompt/spaceship-prompt/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ nyanloutre fortuneteller2k kyleondy ]; + maintainers = with maintainers; [ nyanloutre moni kyleondy ]; }; } diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 7c7ba87d848d8..1565fb8b16f0e 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2023-09-12"; + version = "unstable-2023-11-08"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "5ac930d96be3a51730f7d9d7330f28d9c9c36e0a"; - sha256 = "tyroeGADhBRCQ9/WqNSqMV7kvFUPdC2fcs/B5G5qYhI="; + rev = "f04191aa8ae475cf71f491830d424226d84501c9"; + sha256 = "7cdtDKNyTSUn3Fo6BO3f0SMBgOQs4/5SnHXB7JtAdkA="; fetchSubmodules = true; }; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index f7d7053c77a97..dd29871907188 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -42,6 +42,50 @@ rec { stdenv.override (prev: { allowedRequisites = null; extraBuildInputs = (prev.extraBuildInputs or []) ++ pkgs; }); + # Override the libc++ dynamic library used in the stdenv to use the one from the platform’s + # default stdenv. This allows building packages and linking dependencies with different + # compiler versions while still using the same libc++ implementation for compatibility. + # + # Note that this adapter still uses the headers from the new stdenv’s libc++. This is necessary + # because older compilers may not be able to parse the headers from the default stdenv’s libc++. + overrideLibcxx = stdenv: + assert stdenv.cc.libcxx != null; + let + llvmLibcxxVersion = lib.getVersion llvmLibcxx; + stdenvLibcxxVersion = lib.getVersion stdenvLibcxx; + + stdenvLibcxx = pkgs.stdenv.cc.libcxx; + stdenvCxxabi = pkgs.stdenv.cc.libcxx.cxxabi; + + llvmLibcxx = stdenv.cc.libcxx; + llvmCxxabi = stdenv.cc.libcxx.cxxabi; + + libcxx = pkgs.runCommand "${stdenvLibcxx.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit cxxabi; + isLLVM = true; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvLibcxx}' "$out" + echo '${stdenvLibcxx}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmLibcxx}/include' "$dev/include" + ''; + + cxxabi = pkgs.runCommand "${stdenvCxxabi.name}-${llvmLibcxxVersion}" { + outputs = [ "out" "dev" ]; + inherit (stdenvCxxabi) libName; + } '' + mkdir -p "$dev/nix-support" + ln -s '${stdenvCxxabi}' "$out" + echo '${stdenvCxxabi}' > "$dev/nix-support/propagated-build-inputs" + ln -s '${lib.getDev llvmCxxabi}/include' "$dev/include" + ''; + in + overrideCC stdenv (stdenv.cc.override { + inherit libcxx; + extraPackages = [ cxxabi pkgs.pkgsTargetTarget."llvmPackages_${lib.versions.major llvmLibcxxVersion}".compiler-rt ]; + }); + # Override the setup script of stdenv. Useful for testing new # versions of the setup script without causing a rebuild of # everything. @@ -60,12 +104,13 @@ rec { mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: if stdenv.hostPlatform.isDarwin then throw "Cannot build fully static binaries on Darwin/macOS" - else (mkDerivationSuper args).overrideAttrs(finalAttrs: { - NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + " -static"; - } // lib.optionalAttrs (!(finalAttrs.dontAddStaticConfigureFlags or false)) { - configureFlags = (finalAttrs.configureFlags or []) ++ [ - "--disable-shared" # brrr... - ]; + else (mkDerivationSuper args).overrideAttrs (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -static"; + } // lib.optionalAttrs (!(args.dontAddStaticConfigureFlags or false)) { + configureFlags = (args.configureFlags or []) ++ [ + "--disable-shared" # brrr... + ]; + cmakeFlags = (args.cmakeFlags or []) ++ ["-DCMAKE_SKIP_INSTALL_RPATH=On"]; })); } // lib.optionalAttrs (stdenv0.hostPlatform.libc == "glibc") { extraBuildInputs = (old.extraBuildInputs or []) ++ [ @@ -245,4 +290,131 @@ rec { env = (args.env or {}) // { NIX_CFLAGS_COMPILE = toString (args.env.NIX_CFLAGS_COMPILE or "") + " ${toString compilerFlags}"; }; }); }); + + # Overriding the SDK changes the Darwin SDK used to build the package, which: + # * Ensures that the compiler and bintools have the correct Libsystem version; and + # * Replaces any SDK references with those in the SDK corresponding to the requested SDK version. + # + # `sdkVersion` can be any of the following: + # * A version string indicating the requested SDK version; or + # * An attrset consisting of either or both of the following fields: darwinSdkVersion and darwinMinVersion. + overrideSDK = stdenv: sdkVersion: + let + inherit ( + { inherit (stdenv.hostPlatform) darwinMinVersion darwinSdkVersion; } + // (if lib.isAttrs sdkVersion then sdkVersion else { darwinSdkVersion = sdkVersion; }) + ) darwinMinVersion darwinSdkVersion; + + sdk = pkgs.darwin."apple_sdk_${lib.replaceStrings [ "." ] [ "_" ] darwinSdkVersion}"; + # TODO: Make this unconditional after #229210 has been merged, + # and the 10.12 SDK is updated to follow the new structure. + Libsystem = if darwinSdkVersion == "10.12" then pkgs.darwin.Libsystem else sdk.Libsystem; + + replacePropagatedFrameworks = pkg: + let + propagatedInputs = pkg.propagatedBuildInputs; + mappedInputs = map mapPackageToSDK propagatedInputs; + + env = { + inherit (pkg) outputs; + # Map old frameworks to new ones and the package’s outputs to their original outPaths. + # Also map any packages that have propagated frameworks to their proxy packages using + # the requested SDK version. These mappings are rendered into tab-separated files to be + # parsed and read back with `read`. + dependencies = lib.concatMapStrings (pair: "${pair.fst}\t${pair.snd}\n") (lib.zipLists propagatedInputs mappedInputs); + pkgOutputs = lib.concatMapStrings (output: "${output}\t${(lib.getOutput output pkg).outPath}\n") pkg.outputs; + passAsFile = [ "dependencies" "pkgOutputs" ]; + }; + in + # Only remap the package’s propagated inputs if there are any and if any of them were themselves remapped. + if lib.length propagatedInputs > 0 && propagatedInputs != mappedInputs + then pkgs.runCommand pkg.name env '' + # Iterate over the outputs in the package being replaced to make sure the proxy is + # a fully functional replacement. This is like `symlinkJoin` except for outputs and + # the contents of `nix-support`, which will be customized for the requested SDK. + while IFS=$'\t\n' read -r outputName pkgOutputPath; do + mkdir -p "''${!outputName}" + + for targetPath in "$pkgOutputPath"/*; do + targetName=$(basename "$targetPath") + + # `nix-support` is special-cased because any propagated inputs need their SDK + # frameworks replaced with those from the requested SDK. + if [ "$targetName" == "nix-support" ]; then + mkdir "''${!outputName}/nix-support" + + for file in "$targetPath"/*; do + fileName=$(basename "$file") + + if [ "$fileName" == "propagated-build-inputs" ]; then + cp "$file" "''${!outputName}/nix-support/$fileName" + + while IFS=$'\t\n' read -r oldFramework newFramework; do + substituteInPlace "''${!outputName}/nix-support/$fileName" \ + --replace "$oldFramework" "$newFramework" + done < "$dependenciesPath" + fi + done + else + ln -s "$targetPath" "''${!outputName}/$targetName" + fi + done + done < "$pkgOutputsPath" + '' + else pkg; + + # Remap a framework from one SDK version to another. + mapPackageToSDK = pkg: + let + name = lib.getName pkg; + framework = lib.removePrefix "apple-framework-" name; + in + /**/ if pkg == null then pkg + else if name != framework then sdk.frameworks."${framework}" + else replacePropagatedFrameworks pkg; + + mapRuntimeToSDK = pkg: + # Only remap xcbuild for now, which exports the SDK used to build it. + if pkg != null && lib.isAttrs pkg && lib.getName pkg == "xcodebuild" + then pkg.override { stdenv = overrideSDK stdenv { inherit darwinMinVersion darwinSdkVersion; }; } + else pkg; + + mapInputsToSDK = inputs: args: + let + runsAtBuild = lib.flip lib.elem [ + "depsBuildBuild" + "depsBuildBuildPropagated" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "depsBuildTarget" + "depsBuildTargetPropagated" + ]; + atBuildInputs = lib.filter runsAtBuild inputs; + atRuntimeInputs = lib.subtractLists atBuildInputs inputs; + in + lib.genAttrs atRuntimeInputs (input: map mapPackageToSDK (args."${input}" or [ ])) + // lib.genAttrs atBuildInputs (input: map mapRuntimeToSDK (args."${input}" or [ ])); + + mkCC = cc: cc.override { + bintools = cc.bintools.override { libc = Libsystem; }; + libc = Libsystem; + }; + in + # TODO: make this work across all input types and not just propagatedBuildInputs + stdenv.override (old: { + buildPlatform = old.buildPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + hostPlatform = old.hostPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + targetPlatform = old.targetPlatform // { inherit darwinMinVersion darwinSdkVersion; }; + + allowedRequisites = null; + cc = mkCC old.cc; + + extraBuildInputs = [sdk.frameworks.CoreFoundation ]; + mkDerivationFromStdenv = extendMkDerivationArgs old (mapInputsToSDK [ + "buildInputs" + "nativeBuildInputs" + "propagatedNativeBuildInputs" + "propagatedBuildInputs" + ]); + }); } diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 25a80fd11aa2d..c94c56daae1c2 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -245,7 +245,8 @@ in coreutils = bootstrapTools; gnugrep = bootstrapTools; - pbzx = bootstrapTools; + # Either pbzx or Libsystem is required from bootstrap tools (one is used building the other). + pbzx = if localSystem.isAarch64 then bootstrapTools else super.pbzx; cpio = self.stdenv.mkDerivation { name = "bootstrap-stage0-cpio"; buildCommand = '' @@ -255,7 +256,11 @@ in passthru.isFromBootstrapFiles = true; }; - darwin = super.darwin.overrideScope (selfDarwin: _: { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Prevent CF from being propagated to the initial stdenv. Packages that require it + # will have to manually add it to their build inputs. + CF = null; + binutils-unwrapped = bootstrapTools // { version = "boot"; }; @@ -296,15 +301,6 @@ in sigtool = bootstrapTools; } // lib.optionalAttrs (! useAppleSDKLibs) { - CF = self.stdenv.mkDerivation { - name = "bootstrap-stage0-CF"; - buildCommand = '' - mkdir -p $out/Library/Frameworks - ln -s ${bootstrapTools}/Library/Frameworks/CoreFoundation.framework $out/Library/Frameworks - ''; - passthru.isFromBootstrapFiles = true; - }; - Libsystem = self.stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' @@ -424,15 +420,18 @@ in # making sure both packages are present on x86_64-darwin and aarch64-darwin. (prevStage: # previous stage0 stdenv: - assert lib.all isFromBootstrapFiles (with prevStage; [ bash coreutils cpio gnugrep pbzx ]); + assert lib.all isFromBootstrapFiles ( + with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ] + ); assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ binutils-unwrapped cctools print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ CF Libsystem ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); + assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); + assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null); assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ clang-unwrapped libclang libllvm llvm compiler-rt libcxx libcxxabi @@ -445,7 +444,11 @@ in inherit (prevStage) ccWrapperStdenv coreutils gnugrep; - cmake = super.cmakeMinimal; + # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. + cmake = self.cmakeMinimal; + cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); curl = super.curlMinimal; @@ -457,9 +460,18 @@ in ninja = super.ninja.override { buildDocs = false; }; - python3 = super.python3Minimal; + # Use this stage’s CF to build Python. It’s required but can’t be included in the stdenv. + python3 = self.python3Minimal; + python3Minimal = super.python3Minimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; + }); darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { + # Use this stage’s CF to build configd. It’s required but can’t be included in the stdenv. + configd = superDarwin.configd.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + }); + signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -529,7 +541,8 @@ in assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -628,7 +641,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); @@ -725,7 +739,8 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -824,8 +839,9 @@ in binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -951,7 +967,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1031,7 +1048,8 @@ in ]); assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1047,9 +1065,9 @@ in overrides = self: super: { inherit (prevStage) ccWrapperStdenv - autoconf automake bash bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff - libedit libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl texinfo unzip which + autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff + libedit libtool m4 ninja openldap openssh patchutils perl pkg-config python3 scons + serf sqlite subversion sysctl texinfo unzip which # CF dependencies - don’t rebuild them. icu @@ -1057,11 +1075,40 @@ in # LLVM dependencies - don’t rebuild them. libffi libiconv libxml2 ncurses zlib; + # These overrides are required to break an infinite recursion. curl depends on Darwin + # frameworks, but those frameworks require these dependencies to build, which + # depend on curl indirectly. + cpio = super.cpio.override { + inherit (prevStage) fetchurl; + }; + + libyaml = super.libyaml.override { + inherit (prevStage) fetchFromGitHub; + }; + + pbzx = super.pbzx.override { + inherit (prevStage) fetchFromGitHub; + }; + + python3Minimal = super.python3Minimal.override { + inherit (prevStage) fetchurl; + }; + + xar = super.xar.override { + inherit (prevStage) fetchurl; + }; + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs # CF dependencies - don’t rebuild them. libobjc objc4; + # rewrite-tbd is also needed to build Darwin frameworks, so it’s built using the + # previous stage’s fetchFromGitHub to avoid an infinite recursion (same as above). + rewrite-tbd = superDarwin.rewrite-tbd.override { + inherit (prevStage) fetchFromGitHub; + }; + signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -1158,16 +1205,18 @@ in (prevStage: # previous stage4 stdenv: assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash binutils-unwrapped brotli bzip2 curl diffutils ed file findutils gawk gettext gmp - gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib zstd + bash binutils-unwrapped brotli bzip2 cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5 + libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch + pbzx pcre python3Minimal xar xz zlib zstd ]); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); + assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd libclosure libdispatch xnu ]); @@ -1176,9 +1225,9 @@ in ]); assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison cmake cmakeMinimal cpio cyrus_sasl db expat flex groff libedit - libtool m4 ninja openldap openssh patchutils pbzx perl pkg-config.pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which + autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit + libtool m4 ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons + serf sqlite subversion sysctl.provider texinfo unzip which ]); assert prevStage.darwin.cctools == prevStage.darwin.cctools-llvm; @@ -1307,14 +1356,14 @@ in overrides = self: super: { inherit (prevStage) - bash binutils brotli bzip2 coreutils curl diffutils ed file findutils gawk gettext - gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 - libunistring libxml2 ncurses nghttp2 openbsm openpam openssl patch pcre xz zlib - zstd; + bash binutils brotli bzip2 coreutils cpio curl diffutils ed file findutils gawk + gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2 + libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx + pcre python3Minimal xar xz zlib zstd; darwin = super.darwin.overrideScope (_: _: { inherit (prevStage.darwin) - CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi xnu; + CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port; }); diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 448d6ecd9f179..1324c78c5fd64 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,5 +1,21 @@ { pkgspath ? ../../.., test-pkgspath ? pkgspath , localSystem ? { system = builtins.currentSystem; } +# Specify the desired LLVM version in an overlay to avoid the use of +# mismatching versions. +# +# The llvmPackages that we take things (clang, libc++ and such) from +# is specified explicitly to be llvmPackages_11 to keep the +# bootstrap-tools stable. However, tools like otool, +# install_name_tool and strip are taken straight from stdenv.cc, +# which, after the bump, is a different LLVM version altogether. +# +# The original intent was that bootstrap-tools specified LLVM 11 +# exhaustively but it didn't. That should be rectified with this +# PR. As to why stick with 11? That's just to keep the +# bootstrap-tools unchanged. +# +# https://github.com/NixOS/nixpkgs/pull/267058/files#r1390889848 +, overlays ? [(self: super: { llvmPackages = super.llvmPackages_11; })] , crossSystem ? null , bootstrapFiles ? null }: @@ -13,11 +29,9 @@ let cross = if crossSystem != null in (import "${pkgspath}/pkgs/stdenv/darwin" args'); } else {}; -in with import pkgspath ({ inherit localSystem; } // cross // custom-bootstrap); +in with import pkgspath ({ inherit localSystem overlays; } // cross // custom-bootstrap); -let - llvmPackages = llvmPackages_11; -in rec { +rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; @@ -28,7 +42,7 @@ in rec { cctools_ = darwin.cctools; # Avoid debugging larger changes for now. - bzip2_ = bzip2.override (args: { linkStatic = true; }); + bzip2_ = bzip2.override (args: { enableStatic = true; enableShared = false; }); # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh index 8c6fec7873b6e..d49fb8aa57fcc 100644 --- a/pkgs/stdenv/generic/default-builder.sh +++ b/pkgs/stdenv/generic/default-builder.sh @@ -1,6 +1,4 @@ -if [ -f .attrs.sh ]; then - . .attrs.sh -fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 8c52eb10c3cfb..63d02c8f08570 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -439,6 +439,7 @@ else let crossFile = builtins.toFile "cross-file.conf" '' [properties] + bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} [host_machine] @@ -449,6 +450,7 @@ else let [binaries] llvm-config = 'llvm-config-native' + rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] ''; crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; in crossFlags ++ mesonFlags; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ad9857fc9d61c..37c10fb2957b1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -16,29 +16,15 @@ if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi -if [ -f .attrs.sh ]; then +if [ -f .attrs.sh ] || [[ -n "${NIX_ATTRS_JSON_FILE:-}" ]]; then __structuredAttrs=1 echo "structuredAttrs is enabled" -else - __structuredAttrs= -fi -if [ -n "$__structuredAttrs" ]; then for outputName in "${!outputs[@]}"; do # ex: out=/nix/store/... export "$outputName=${outputs[$outputName]}" done - # Before Nix 2.4, $NIX_ATTRS_*_FILE was named differently: - # https://github.com/NixOS/nix/commit/27ce722 - if [[ -n "${ATTRS_JSON_FILE:-}" ]]; then - export NIX_ATTRS_JSON_FILE="$ATTRS_JSON_FILE" - fi - - if [[ -n "${ATTRS_SH_FILE:-}" ]]; then - export NIX_ATTRS_SH_FILE="$ATTRS_SH_FILE" - fi - # $NIX_ATTRS_JSON_FILE pointed to the wrong location in sandbox # https://github.com/NixOS/nix/issues/6736; please keep around until the # fix reaches *every patch version* that's >= lib/minver.nix @@ -49,6 +35,7 @@ if [ -n "$__structuredAttrs" ]; then export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" fi else + __structuredAttrs= : "${outputs:=out}" fi @@ -1539,6 +1526,44 @@ showPhaseFooter() { } +runPhase() { + local curPhase="$*" + if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then return; fi + if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then return; fi + if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then return; fi + if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then return; fi + if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then return; fi + if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then return; fi + if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then return; fi + if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then return; fi + if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then return; fi + + if [[ -n $NIX_LOG_FD ]]; then + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" + fi + + showPhaseHeader "$curPhase" + dumpVars + + local startTime=$(date +"%s") + + # Evaluate the variable named $curPhase if it exists, otherwise the + # function named $curPhase. + eval "${!curPhase:-$curPhase}" + + local endTime=$(date +"%s") + + showPhaseFooter "$curPhase" "$startTime" "$endTime" + + if [ "$curPhase" = unpackPhase ]; then + # make sure we can cd into the directory + [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" + + cd "${sourceRoot:-.}" + fi +} + + genericBuild() { # variable used by our gzip wrapper to add -n. # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. @@ -1565,39 +1590,7 @@ genericBuild() { # phase name is space-free, which it must be because it's the name # of either a shell variable or a shell function. for curPhase in ${phases[*]}; do - if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi - if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi - if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi - if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi - if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi - if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi - if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi - if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi - - if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" - fi - - showPhaseHeader "$curPhase" - dumpVars - - local startTime=$(date +"%s") - - # Evaluate the variable named $curPhase if it exists, otherwise the - # function named $curPhase. - eval "${!curPhase:-$curPhase}" - - local endTime=$(date +"%s") - - showPhaseFooter "$curPhase" "$startTime" "$endTime" - - if [ "$curPhase" = unpackPhase ]; then - # make sure we can cd into the directory - [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}" - - cd "${sourceRoot:-.}" - fi + runPhase "$curPhase" done } diff --git a/pkgs/test/cc-wrapper/atomics.cc b/pkgs/test/cc-wrapper/atomics.cc new file mode 100644 index 0000000000000..23601ae92f0b0 --- /dev/null +++ b/pkgs/test/cc-wrapper/atomics.cc @@ -0,0 +1,8 @@ +#include <atomic> +#include <cstdint> + +int main() +{ + std::atomic_int x = {0}; + return !std::atomic_is_lock_free(&x); +} diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 74009c97980d2..a0088751d4a24 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -9,7 +9,8 @@ let ); staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib"; emulator = stdenv.hostPlatform.emulator buildPackages; - libcxxStdenvSuffix = lib.optionalString (stdenv.cc.libcxx != null) "-libcxx"; + isCxx = stdenv.cc.libcxx != null; + libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx"; in stdenv.mkDerivation { pname = "cc-wrapper-test-${stdenv.cc.cc.pname}${libcxxStdenvSuffix}"; version = stdenv.cc.version; @@ -37,6 +38,14 @@ in stdenv.mkDerivation { $CXX -o include-cxxabi ${./include-cxxabi.cc} ${emulator} ./include-cxxabi + # cxx doesn't have libatomic.so + ${lib.optionalString (!isCxx) '' + # https://github.com/NixOS/nixpkgs/issues/91285 + echo "checking whether libatomic.so can be linked... " >&2 + $CXX -shared -o atomics.so ${./atomics.cc} -latomic ${lib.optionalString (stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "6.0.0" ) "-std=c++17"} + $READELF -d ./atomics.so | grep libatomic.so && echo "ok" >&2 || echo "failed" >&2 + ''} + ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' echo "checking whether compiler can build with CoreFoundation.framework... " >&2 mkdir -p foo/lib diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 71d7d5f75ef01..b4da2de5c5b8c 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -156,6 +156,9 @@ let # Two web browsers -- exercises almost the entire packageset pkgs.pkgsCross.aarch64-multiplatform.qt5.qutebrowser pkgs.pkgsCross.aarch64-multiplatform.firefox + + # Uses pkgsCross.riscv64-embedded; see https://github.com/NixOS/nixpkgs/issues/267859 + pkgs.spike ]; in { diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 06c275edc70c8..9543e165a8053 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,41 +39,42 @@ with pkgs; name = "cc-wrapper-supported"; builtGCC = let - names = lib.pipe (attrNames gccTests) ([ - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.cc)) + inherit (lib) filterAttrs; + sets = lib.pipe gccTests ([ + (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc)) # Broken - (filter (n: n != "gcc49Stdenv")) - (filter (n: n != "gccMultiStdenv")) + (filterAttrs (n: _: n != "gcc49Stdenv")) + (filterAttrs (n: _: n != "gccMultiStdenv")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # fails with things like # ld: warning: ld: warning: object file (trunctfsf2_s.o) was built for newer macOS version (11.0) than being linked (10.5) # ld: warning: ld: warning: could not create compact unwind for ___fixunstfdi: register 20 saved somewhere other than in frame - (filter (n: n != "gcc11Stdenv")) + (filterAttrs (n: _: n != "gcc11Stdenv")) ]); in - toJSON (lib.genAttrs names (name: { name = pkgs.${name}; })); + toJSON sets; builtLLVM = let - names = lib.pipe (attrNames llvmTests) ([ - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.stdenv.cc)) - (filter (n: lib.meta.availableOn stdenv.hostPlatform pkgs.${n}.libcxxStdenv.cc)) + inherit (lib) filterAttrs; + sets = lib.pipe llvmTests ([ + (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc)) + (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc)) # libcxxStdenv broken # fix in https://github.com/NixOS/nixpkgs/pull/216273 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # libcxx does not build for some reason on aarch64-linux - (filter (n: n != "llvmPackages_7")) + (filterAttrs (n: _: n != "llvmPackages_7")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - (filter (n: n != "llvmPackages_5")) - (filter (n: n != "llvmPackages_6")) - (filter (n: n != "llvmPackages_7")) - (filter (n: n != "llvmPackages_8")) - (filter (n: n != "llvmPackages_9")) - (filter (n: n != "llvmPackages_10")) + (filterAttrs (n: _: n != "llvmPackages_6")) + (filterAttrs (n: _: n != "llvmPackages_7")) + (filterAttrs (n: _: n != "llvmPackages_8")) + (filterAttrs (n: _: n != "llvmPackages_9")) + (filterAttrs (n: _: n != "llvmPackages_10")) ]); in - toJSON (lib.genAttrs names (name: { stdenv = pkgs.${name}.stdenv; libcxx = pkgs.${name}.libcxxStdenv; })); + toJSON sets; buildCommand = '' touch $out ''; diff --git a/pkgs/test/nixpkgs-check-by-name/.envrc b/pkgs/test/nixpkgs-check-by-name/.envrc index 1d953f4bd7359..4555ccf0921f3 100644 --- a/pkgs/test/nixpkgs-check-by-name/.envrc +++ b/pkgs/test/nixpkgs-check-by-name/.envrc @@ -1 +1,7 @@ +if has nix_direnv_watch_file; then + nix_direnv_watch_file default.nix shell.nix +else + watch_file default.nix shell.nix +fi + use nix diff --git a/pkgs/test/nixpkgs-check-by-name/default.nix b/pkgs/test/nixpkgs-check-by-name/default.nix index 0d4e2fcc48a78..fc24b1fd33982 100644 --- a/pkgs/test/nixpkgs-check-by-name/default.nix +++ b/pkgs/test/nixpkgs-check-by-name/default.nix @@ -5,8 +5,10 @@ rustfmt, clippy, mkShell, + makeWrapper, }: let + runtimeExprPath = ./src/eval.nix; package = rustPlatform.buildRustPackage { name = "nixpkgs-check-by-name"; @@ -16,7 +18,9 @@ let nix rustfmt clippy + makeWrapper ]; + env.NIX_CHECK_BY_NAME_EXPR_PATH = "${runtimeExprPath}"; # Needed to make Nix evaluation work inside the nix build preCheck = '' export TEST_ROOT=$(pwd)/test-tmp @@ -34,7 +38,12 @@ let cargo fmt --check cargo clippy -- -D warnings ''; + postInstall = '' + wrapProgram $out/bin/nixpkgs-check-by-name \ + --set NIX_CHECK_BY_NAME_EXPR_PATH "$NIX_CHECK_BY_NAME_EXPR_PATH" + ''; passthru.shell = mkShell { + env.NIX_CHECK_BY_NAME_EXPR_PATH = toString runtimeExprPath; inputsFrom = [ package ]; }; }; diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index e4f986748b4f4..161d013374e7f 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -35,8 +35,6 @@ enum AttributeVariant { Other, } -const EXPR: &str = include_str!("eval.nix"); - /// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are /// of the form `callPackage <package_file> { ... }`. /// See the `eval.nix` file for how this is achieved on the Nix side @@ -60,9 +58,10 @@ pub fn check_values( attrs_file_path.display() ))?; + let expr_path = std::env::var("NIX_CHECK_BY_NAME_EXPR_PATH") + .context("Could not get environment variable NIX_CHECK_BY_NAME_EXPR_PATH")?; // With restrict-eval, only paths in NIX_PATH can be accessed, so we explicitly specify the // ones needed needed - let mut command = process::Command::new("nix-instantiate"); command // Inherit stderr so that error messages always get shown @@ -76,8 +75,6 @@ pub fn check_values( "--readonly-mode", "--restrict-eval", "--show-trace", - "--expr", - EXPR, ]) // Pass the path to the attrs_file as an argument and add it to the NIX_PATH so it can be // accessed in restrict-eval mode @@ -96,6 +93,8 @@ pub fn check_values( command.arg("-I"); command.arg(path); } + command.args(["-I", &expr_path]); + command.arg(expr_path); let result = command .output() diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 908faec3c3888..0b09a109beadb 100644 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi set -x export NIX_DEBUG=1 diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 585e28971b491..5e464d43f81cb 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "d4l3k"; repo = "go-sct"; rev = "4ae88a6bf50e0b917541ddbcec1ff10ab77a0b15"; - sha256 = "sha256-/0ilM1g3CNaseqV9i+cKWyzxvWnj+TFqazt+aYDtNVs="; + hash = "sha256-/0ilM1g3CNaseqV9i+cKWyzxvWnj+TFqazt+aYDtNVs="; }; postPatch = '' @@ -27,6 +27,7 @@ buildGoModule rec { homepage = "https://github.com/d4l3k/go-sct"; license = licenses.mit; maintainers = with maintainers; [ ]; + platforms = platforms.linux; mainProgram = "sct"; }; } diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index 4c79e11765cb2..84f43301bbd75 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "srandrd"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "jceb"; repo = pname; rev = "v${version}"; - sha256 = "07r1ck2ijj30n19ylndgw75ly9k3815kj9inpxblfnjpwbbw6ic0"; + sha256 = "sha256-Wf+tVqDaNAiH6UHN8fFv2wM+LEch6wKlZOkqWEqLLkw="; }; buildInputs = [ libX11 libXrandr libXinerama ]; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ac232f917bd78..b6fe79c7b9cf9 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -74,6 +74,12 @@ stdenv.mkDerivation (finalAttrs: { "LDFLAGS=-lXi" ]; + # error: call to undeclared function 'xnee_check_key'; + # ISO C99 and later do not support implicit function declarations + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # XXX: Actually tests require an X server. doCheck = true; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index e65cac675dbdb..7bbc1e14efbe2 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -3,24 +3,20 @@ , fetchPypi , groff , less +, nix-update-script +, testers +, awscli }: python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.29.9"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.30.2"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-8SmOu79FZESL1Hd15wdd1m1Uewswqaum2y8LOZAl9P8="; + hash = "sha256-XbYsPbYUIJPCS+nhcE3A5K7yxHcGUkulT5vHPT5T9kM="; }; - # https://github.com/aws/aws-cli/issues/4837 - postPatch = '' - substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.17" "docutils>=0.10" \ - --replace "colorama>=0.2.5,<0.4.5" "colorama>=0.2.5,<0.5" \ - --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" - ''; propagatedBuildInputs = with python3.pkgs; [ botocore @@ -44,10 +40,6 @@ python3.pkgs.buildPythonApplication rec { rm $out/bin/aws.cmd ''; - passthru = { - python = python3; # for aws_shell - }; - doInstallCheck = true; installCheckPhase = '' @@ -59,12 +51,25 @@ python3.pkgs.buildPythonApplication rec { runHook postInstallCheck ''; + passthru = { + python = python3; # for aws_shell + updateScript = nix-update-script { + # Excludes 1.x versions from the Github tags list + extraArgs = [ "--version-regex" "^(1\.(.*))" ]; + }; + tests.version = testers.testVersion { + package = awscli; + command = "aws --version"; + inherit version; + }; + }; + meta = with lib; { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; mainProgram = "aws"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/tools/admin/cdist/default.nix b/pkgs/tools/admin/cdist/default.nix index 115800fcf2c5c..8467605727c93 100644 --- a/pkgs/tools/admin/cdist/default.nix +++ b/pkgs/tools/admin/cdist/default.nix @@ -2,6 +2,7 @@ , buildPythonApplication , fetchFromGitea , pythonImportsCheckHook +, six , sphinxHook , sphinx-rtd-theme }: @@ -21,6 +22,7 @@ buildPythonApplication rec { nativeBuildInputs = [ pythonImportsCheckHook + six sphinxHook sphinx-rtd-theme ]; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 8257c7a3869da..331d83292bf49 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-9+K1d35wghK/j4hp7tGRDvj/5s3wiwj/++wovUf6n4Q="; + hash = "sha256-w63mNGDUc5YrlBrqsXRyy4SPC35kNKWhiHe6Sfc30tI="; }; - vendorHash = "sha256-qV2uZX2In+NYpzlQRuTfRtmWhozYwviVaFxMC+4kf7I="; + vendorHash = "sha256-8hZFsYMZQ8RxImEG2t0kfukbRjAJMEDSYF+ryLOZelc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 862b68be94efe..e7d889e9009c3 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.74.3"; + version = "1.74.4"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-upnwaY++tUg4LcuD/BMSvvM2bo/95OP+SUK/aOiq1Oo="; + sha256 = "sha256-PzjIcdzEmX+0PRurOX5ZQ4LQnBny9Av8eKhPsyiZb6c="; }; vendorHash = null; diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 779d6d32de72b..78fd0510629f4 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.824.0) - aws-sdk-core (3.181.1) + aws-partitions (1.851.0) + aws-sdk-core (3.186.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (1.6.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -32,11 +32,10 @@ GEM declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.103.0) + excon (0.104.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -66,7 +65,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.216.0) + fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -107,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.49.0) + google-apis-androidpublisher_v3 (0.52.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -122,23 +121,23 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -161,7 +160,7 @@ GEM os (1.1.4) plist (3.7.0) public_suffix (5.0.3) - rake (13.0.6) + rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -189,13 +188,10 @@ GEM tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -214,4 +210,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.19 + 2.4.20 diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index a28442fd04cee..033ce2a4292e1 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03dy04n302202rn97cy2r65ybx7ik0s2qqg8s4w3jgi4nvhyy8b4"; + sha256 = "1aj4c8m40kpyy48j5gmr3gnz27sy97zjrdd3xpn6i0ix2m9sq2c5"; type = "gem"; }; - version = "1.824.0"; + version = "1.851.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; + sha256 = "19zl449qzc2ir0yzwhdy82nkm0ycd1822pym6b2i0h1k7zw69may"; type = "gem"; }; - version = "3.181.1"; + version = "3.186.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; type = "gem"; }; - version = "1.71.0"; + version = "1.72.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; type = "gem"; }; - version = "1.134.0"; + version = "1.136.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; babosa = { groups = ["default"]; @@ -178,15 +178,14 @@ version = "0.6.5"; }; domain_name = { - dependencies = ["unf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; dotenv = { groups = ["default"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15la3ni3fwl8aj8mifn3hkryfjg6z09j4cc8j24rq6kwknlry5ff"; + sha256 = "104vrqqy6bszbhpvabgz9ra7dm6lnb5jwzwqm2fks0ka44spknyl"; type = "gem"; }; - version = "0.103.0"; + version = "0.104.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -368,10 +367,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mqlcnblhs1dp4433skziqissl92frwcbf4bbq1ihvywlbpayfb"; + sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi"; type = "gem"; }; - version = "2.216.0"; + version = "2.217.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wdy5r6rhnj9744fvibkm1npgz3nm7wfcaann1laz45mh499f2g"; + sha256 = "0rxxj033ziwx94xcym2cs76lcqjiyxv5vv52i32s97nkpk6wid6g"; type = "gem"; }; - version = "0.49.0"; + version = "0.52.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +399,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4p7fyqlnydjgprawmhc7q6yjfzdjjvhn0hh0j6a9rq9wii2xli"; + sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -433,10 +432,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj"; + sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx"; type = "gem"; }; - version = "0.19.0"; + version = "0.29.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -476,10 +475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9"; + sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j"; type = "gem"; }; - version = "1.44.0"; + version = "1.45.0"; }; googleauth = { dependencies = ["faraday" "jwt" "multi_json" "os" "signet"]; @@ -487,10 +486,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06yg24bdh0daxz3bz7ap90b14j3blli7ywg5q05a5kghs9xa26y1"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; highline = { groups = ["default"]; @@ -658,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; representable = { dependencies = ["declarative" "trailblazer-option" "uber"]; @@ -828,36 +827,15 @@ }; version = "0.1.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; - type = "gem"; - }; - version = "0.0.8.2"; - }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; webrick = { groups = ["default"]; @@ -885,10 +863,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; + sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index f9e517e091d8f..d27e5eb7386d2 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.35"; + version = "0.38"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-4lAoUmbNsC0d+yaB+DqHVqz3UMI08rhXIm7rgueeXik="; + sha256 = "sha256-MA7mMGZyRbQ4165qB+Q6/gQZP/yaUoZmMCVrPCPZoj4="; }; - vendorHash = "sha256-hSllpWjiYOBbANCX7usdAAF1HNAJ79ELK92qEyn8G1c="; + vendorHash = "sha256-OmukK6ecaiCRnK6fL238GhkxW4A4yrcR/xelBZzVwqI="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix index c71f23c978bbf..b65b5700c6070 100644 --- a/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix +++ b/pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix @@ -32,6 +32,7 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}" passAsFile = [ "comps" ]; doInstallCheck = true; + disallowedRequisites = [ google-cloud-sdk ]; installCheckPhase = let compNames = builtins.map (drv: drv.name) comps_; @@ -57,5 +58,5 @@ runCommand "google-cloud-sdk-${google-cloud-sdk.version}" done # Replace references to the original google-cloud-sdk with this one - find $out/google-cloud-sdk/bin/ -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \; + find $out/google-cloud-sdk -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \; '' diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 3050cbbaac78c..299d77ff8acf4 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.93.0"; + version = "3.94.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-linux-x64.tar.gz"; - sha256 = "1s081ak1m55jckgrrcnj918smlx79sywqgqfbvf50hkcrk5pwdsj"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-linux-x64.tar.gz"; + sha256 = "1yn97xxqwgrcd5psrrimcz1gjv34s7mri40nwb2mgmqj7xs4hyi3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "1r1sfxngwkf89lni0l8zalh2vz5a7m9ap4p15cs4bc98zmkin762"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-amd64.tar.gz"; - sha256 = "01zckkhkji8579r6b18mc6h36ap5qm8pa5kjf3mzgy1j1v1mhlww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-linux-amd64.tar.gz"; + sha256 = "1m44dwr8q8w60s5clm4n1hini1bm5bqc7p7h1gvbh5zg1482hn5q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-darwin-x64.tar.gz"; - sha256 = "0gxch1ml2sv66wbzfycsg02f6cagwrv0kl2b437xnn8g86mxi2di"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-darwin-x64.tar.gz"; + sha256 = "0v854xz9imq9kxslvyx3km20jzcia8m6wkq6ga1gxlsrbx3ajgrn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; @@ -219,8 +219,8 @@ sha256 = "0iymy2rjyxya49w7awrjns4pnj4m2m66iqf59f1a6ww4i5qmx5f1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-amd64.tar.gz"; - sha256 = "10w91x51by096blmvgdyci1xan9xw7yh9ky7ajpz3mmr3y3npqn8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-darwin-amd64.tar.gz"; + sha256 = "0g8rcdbfbpmsw3wqx9jy5kz6pcmr9im2njisi3rlkkyfazm7fmqd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-linux-arm64.tar.gz"; - sha256 = "0xmsn6qyrmiqpgpffr1c0ykpw06ca8lcv4hgsvv12jxzqrasdv6a"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-linux-arm64.tar.gz"; + sha256 = "075pyjjinc77283cqd81745sdjxlcrdn02nx17jis28w4gp7y88n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; @@ -377,8 +377,8 @@ sha256 = "11q7cnncwdmjp8klk74wrnm6674ap5lrdjfq7413ps8rbdjpyvhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-linux-arm64.tar.gz"; - sha256 = "0rl4ckrna59qgyhzmrzzlhl08c13979gjfx0pbhk6m6ahcm6whyc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-linux-arm64.tar.gz"; + sha256 = "1dxam51n9r2nmkw29fdwl5b0664ll2a1qczva0fgh1wpdslisp8s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-darwin-arm64.tar.gz"; - sha256 = "0q59khgglzk0dkz1p81nmj0v7gsgkdfv2109sk3lb7ms5myknkd6"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.94.0-darwin-arm64.tar.gz"; + sha256 = "05yyw5pjbmzgqimcd72xidwzqsvvkj7ayafwy701smmxdpck31b0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; @@ -535,8 +535,8 @@ sha256 = "1glpfbinny7cm7bk3q5y7g7lyrzmhdlsfjyiaxqwpkwx2960p5iv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.4-darwin-arm64.tar.gz"; - sha256 = "0xh2r364xkfxq4dlxskxm449d2iqrc2105y72km6w6wrmdvazpn7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.4.5-darwin-arm64.tar.gz"; + sha256 = "0kcivc4bs720s7cdjphjcy1sss7pfsands37c8gikhiq0cnl39mb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index 3450019afa266..7adbaf7f6689c 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-vuYkUFh9C+D6Sbu/vbEFV57FDVQVSCkvOxdLeDVbe18="; + hash = "sha256-ciretC6z2NcLffSkK78DFIUqbRHgVTA7OEyNk6qdAgI="; }; vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index c596c709977c2..97e064a9f9f97 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.93.0"; + version = "0.97.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-e8d+CK7rRbyHeRHOjK3tGFIBHuosdV4AMetUQar54E4="; + hash = "sha256-2c2Ymf+cATK/E8DS/Z1EvgfWPo2fo4y2zx13MAPAQPg="; # 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-BUCe2v80tHAqMBwa6xae3ZOTOok8msM6hFh6d9D4xZA="; + vendorHash = "sha256-xtik+sMCcVdG4FsurpTJT0U//hKFyZsNCIpbVY235Bk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index ee1693ee18e25..07aa89fa5caf2 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -50,15 +50,17 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ gnustep.make ] ++ lib.optionals stdenv.isDarwin [ xcbuildHook ]; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + # xcbuild links with clang instead of clang++. + env = lib.optionalAttrs stdenv.isDarwin { + LD_FLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + xcbuildFlags = lib.optionals stdenv.isDarwin [ "-target unar" "-target lsar" "-configuration Release" - "MACOSX_DEPLOYMENT_TARGET=10.12" - # Fix "ld: file not found: /nix/store/*-clang-7.1.0/lib/arc/libarclite_macosx." error - # Disabling ARC may leak memory, however since this program is generally not used for - # long periods of time, it shouldn't be an issue - "CLANG_LINK_OBJC_RUNTIME=NO" + "MACOSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; makefile = lib.optionalString (!stdenv.isDarwin) "Makefile.linux"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 3d5474a0984a9..b44f53fce10a2 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 = "2023.09.13"; + version = "2023.11.17"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-rpGINfLuWHu6QA/30aI9B8Hmpfx1o6vstiQn+t0blxA="; + hash = "sha256-yWCHK7bi1kCZNWBhaLqilm/ZUv5YXUGi7W3PaRKA7ww="; }; meta = with lib; { diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index c9dc204ad405d..a13238c0143e1 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "unstable-2023-10-13"; + version = "unstable-2023-11-13"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "1b07b595b0bfd261c87f4efecd022481ed4a196f"; - sha256 = "sha256-S4UD/J28McnJjFu5FH3ElwzXapceUUezfBCgI91eIi0="; + rev = "21ae411fd46282726d893e53c05fef5baea64fef"; + sha256 = "sha256-oPP5znyWI9mYHpwLqHu5aiz5DOIZLcTbgaLiBjFiwrg="; }; cmakeFlags = [ diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 5e196a5b557bc..22925dce99fa8 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,35 +1,68 @@ -{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config +{ lib, stdenv, makeWrapper, fetchFromGitHub, which, pkg-config , libjpeg , ocamlPackages -, awscli2, curl, ffmpeg, youtube-dl -, runtimePackages ? [ awscli2 curl ffmpeg youtube-dl ] +, awscli2, bubblewrap, curl, ffmpeg, yt-dlp +, runtimePackages ? [ awscli2 bubblewrap curl ffmpeg yt-dlp ] }: let pname = "liquidsoap"; - version = "2.1.4"; + version = "2.2.2"; in stdenv.mkDerivation { inherit pname version; - src = fetchurl { - url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GQuG7f9U+/HqPcuj6hnBoH5mWEhxSwWgBnkCuLqHTAc="; + src = fetchFromGitHub { + owner = "savonet"; + repo = "liquidsoap"; + rev = "refs/tags/v${version}"; + hash = "sha256-t7rkWHSAd3DaTCXaGfL9NcIQYT+f4Od9D6huuZlwhWk="; }; - postFixup = '' + postPatch = '' + substituteInPlace src/lang/dune \ + --replace "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)" + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + dune build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dune install --prefix "$out" + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + wrapProgram $out/bin/liquidsoap \ --set LIQ_LADSPA_PATH /run/current-system/sw/lib/ladspa \ --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; + runHook postFixup + ''; strictDeps = true; - nativeBuildInputs = - [ makeWrapper pkg-config which - ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir - ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + which + ocamlPackages.ocaml + ocamlPackages.dune_3 + ocamlPackages.findlib + ocamlPackages.menhir + ]; buildInputs = [ libjpeg @@ -38,29 +71,36 @@ stdenv.mkDerivation { ocamlPackages.dtools ocamlPackages.duppy ocamlPackages.mm - ocamlPackages.ocaml_pcre - ocamlPackages.menhir ocamlPackages.menhirLib - (ocamlPackages.camomile.override { version = "1.0.2"; }) ocamlPackages.ocurl + ocamlPackages.cry + ocamlPackages.camomile ocamlPackages.uri - ocamlPackages.sedlex + ocamlPackages.fileutils + ocamlPackages.menhir # liquidsoap-lang + ocamlPackages.menhirLib + ocamlPackages.metadata + ocamlPackages.dune-build-info + ocamlPackages.re + ocamlPackages.sedlex # liquidsoap-lang + ocamlPackages.ppx_string # Recommended dependencies ocamlPackages.ffmpeg # Optional dependencies - ocamlPackages.camlimages - ocamlPackages.gd4o ocamlPackages.alsa ocamlPackages.ao ocamlPackages.bjack - ocamlPackages.cry + ocamlPackages.camlimages ocamlPackages.dssi ocamlPackages.faad ocamlPackages.fdkaac ocamlPackages.flac ocamlPackages.frei0r + ocamlPackages.gd4o + ocamlPackages.graphics ocamlPackages.gstreamer + ocamlPackages.imagelib ocamlPackages.inotify ocamlPackages.ladspa ocamlPackages.lame @@ -72,25 +112,22 @@ stdenv.mkDerivation { ocamlPackages.ogg ocamlPackages.opus ocamlPackages.portaudio + ocamlPackages.posix-time2 ocamlPackages.pulseaudio - ocamlPackages.shine ocamlPackages.samplerate + ocamlPackages.shine ocamlPackages.soundtouch ocamlPackages.speex ocamlPackages.srt ocamlPackages.ssl ocamlPackages.taglib ocamlPackages.theora - ocamlPackages.vorbis - ocamlPackages.xmlplaylist - ocamlPackages.posix-time2 ocamlPackages.tsdl ocamlPackages.tsdl-image ocamlPackages.tsdl-ttf - - # Undocumented dependencies - ocamlPackages.graphics - ocamlPackages.cohttp-lwt-unix + ocamlPackages.vorbis + ocamlPackages.xmlplaylist + ocamlPackages.yaml ]; meta = with lib; { diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index 5b69721bdb4ba..ec55b78c4f8b7 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "piper"; - version = "2023.11.6-1"; + version = "2023.11.14-2"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-9y7HuVgbI8if5XrgQGnEZV1lOw8oMXTFRUTvy/kTGfs="; + hash = "sha256-3ynWyNcdf1ffU3VoDqrEMrm5Jo5Zc5YJcVqwLreRCsI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index f6b1f6d9f669c..48c936ca632fa 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.19.1"; - format = "pyproject"; + version = "0.20.2"; + pyproject = true; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-GYVr/Wam1IGCSR2vHMAu5Fg/jRB333L6iNjltnRKh4E="; + hash = "sha256-1nlSf15IEX1qKfDtR6+jQqskjxIuzaIWatkj9Z1fh8Y="; }; postPatch = let @@ -57,7 +57,9 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ cython + numpy packaging + setuptools ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a55dbc96f107a..96eeeb39a9cb1 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,7 +1,6 @@ -args @ { +{ lib, stdenv, - llvmPackages_12, # Anything newer than 11 fetchzip, which, attr, @@ -22,12 +21,6 @@ args @ { CoreFoundation, }: -let - # Fails to build with clang-11 on Darwin: - # error: exception specification of overriding function is more lax than base version - stdenv = if args.stdenv.isDarwin then llvmPackages_12.stdenv else args.stdenv; -in - stdenv.mkDerivation rec { version = "2.7.13"; pname = "dar"; diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index 27b7c3541933f..ed4dc0eee42da 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic-rs"; - version = "0.5.4"; + version = "0.6.1"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-LAOU2cnKb+TEWNiXJkpgqNxuU16g/Kc3swGIUc8t9x0="; + hash = "sha256-rpIEgQYwfManfgTrhCt6/Q4VBY2yyn4edC6/mz5D7nM="; }; - cargoHash = "sha256-OTIdl2x5m90rEwNBu3LL3rFQ0FVS3GDYU7gf8P7CTaQ="; + cargoHash = "sha256-q+K887jPB9i9iXpFYXjn3zppAPWNlTc2AG7ivOr77J4="; nativeBuildInputs = [ installShellFiles ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/rustic-rs/rustic"; - changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt"; + changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/CHANGELOG.md"; description = "fast, encrypted, deduplicated backups powered by pure Rust"; mainProgram = "rustic"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 6b12605531887..d6fad23c1632d 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b+J+8nxFZYJlAKOStpH7ItPqMw7inM5pss17kyX1brg="; + sha256 = "sha256-vdHnG0uQdy5PboIovtxl5i9xwFpjYLCZf2IGeiMcWe8="; }; - vendorHash = "sha256-d0O54KNGLXU8FGr1eSEp30JMWNVo91Le2MI8UnAfTuU="; + vendorHash = "sha256-pYVEFKLPfstWWO6ypgv7ntAaE1Wmq2XKuZC2ccMa8Vc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index de54827071c64..402e6f4dde370 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]); hardeningDisable = [ "format" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-D__THROW="; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [ + "-D__THROW=" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); # efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244 patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ]; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix index 963300c9ca110..948c514284023 100644 --- a/pkgs/tools/cd-dvd/sacd/default.nix +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -17,8 +17,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Makefile prefix, otherwise `/usr` prefix is enforced + # https://github.com/Sound-Linux-More/sacd/pull/1 (fetchpatch { - url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch"; + url = "https://github.com/Sound-Linux-More/sacd/commit/a72def4fab234bcd68b444cf7447a8876b4e2ce8.patch"; name = "makefile-prefix.patch"; sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64"; }) diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index be456cf594427..bfab2dbb94670 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl -, linkStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableStatic ? with stdenv.hostPlatform; isStatic || isCygwin +, enableShared ? true , autoreconfHook , testers }: @@ -47,8 +48,12 @@ in { outputs = [ "bin" "dev" "out" "man" ]; - configureFlags = - lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]; + configureFlags = lib.concatLists [ + (lib.optional enableStatic "--enable-static") + (lib.optional (!enableShared) "--disable-shared") + ]; + + dontDisableStatic = enableStatic; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/tools/compression/zfp/default.nix index d63140b147602..fdb005007f1e9 100644 --- a/pkgs/tools/compression/zfp/default.nix +++ b/pkgs/tools/compression/zfp/default.nix @@ -2,7 +2,7 @@ , config , enableCfp ? true , enableCuda ? config.cudaSupport -, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms +, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms , enableOpenMP ? true , enablePython ? true , enableUtilities ? true }: diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 791dda4f11ef3..75b306b368aa3 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -2,7 +2,8 @@ , fixDarwinDylibNames , file , legacySupport ? false -, static ? stdenv.hostPlatform.isStatic +, static ? stdenv.hostPlatform.isStatic # generates static libraries *only* +, enableStatic ? static # these need to be ran on the host, thus disable when cross-compiling , buildContrib ? stdenv.hostPlatform == stdenv.buildPlatform , doCheck ? stdenv.hostPlatform == stdenv.buildPlatform @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.attrsets.mapAttrsToList (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; - BUILD_STATIC = static; + BUILD_STATIC = enableStatic; BUILD_CONTRIB = buildContrib; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; diff --git a/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock index c4dd7f58c7042..f43cc63c95982 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock +++ b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock @@ -4,27 +4,67 @@ version = 3 [[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", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "libc", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" + +[[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 = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", ] [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "atty" @@ -55,7 +95,7 @@ dependencies = [ "clap", "colored", "either", - "errno", + "errno 0.2.8", "gag", "getset", "itertools", @@ -74,7 +114,7 @@ dependencies = [ "anyhow", "bindgen", "bitfield", - "bitflags", + "bitflags 1.3.2", "byteorder", "chrono", "colored", @@ -92,7 +132,7 @@ name = "bindgen" version = "0.64.0" source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -103,7 +143,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -119,22 +159,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.12.0" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -153,24 +196,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", "num-traits", - "time", - "wasm-bindgen", - "winapi", ] [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -178,118 +215,68 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cxx" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "windows-sys", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" @@ -303,6 +290,16 @@ dependencies = [ ] [[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "errno-dragonfly" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -314,12 +311,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filedescriptor" @@ -351,7 +345,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -377,65 +371,29 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[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", -] - -[[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 = "instant" -version = "0.1.12" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.3", "libc", "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.3", + "rustix 0.38.21", "windows-sys", ] @@ -449,15 +407,6 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -471,9 +420,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libudev-sys" @@ -486,34 +435,28 @@ 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.1.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[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" @@ -541,35 +484,19 @@ 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-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 = "once_cell" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parse-display" @@ -592,15 +519,15 @@ dependencies = [ "proc-macro2", "quote", "regex", - "regex-syntax", - "syn", + "regex-syntax 0.6.29", + "syn 1.0.109", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "peeking_take_while" @@ -610,9 +537,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[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 = "proc-macro-error" @@ -623,7 +550,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -640,56 +567,65 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[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", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rpassword" @@ -709,29 +645,36 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.7" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", - "errno", + "bitflags 1.3.2", + "errno 0.3.5", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys", ] [[package]] -name = "scratch" -version = "1.0.3" +name = "rustix" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.5", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "strsim" @@ -741,9 +684,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -751,67 +694,57 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.3.0" +name = "syn" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "tempfile" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "winapi-util", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix 0.38.21", + "windows-sys", ] [[package]] name = "terminal_size" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.27", "windows-sys", ] [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi", + "syn 2.0.38", ] [[package]] @@ -827,21 +760,21 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-width" -version = "0.1.10" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" [[package]] name = "version_check" @@ -850,66 +783,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -926,15 +799,6 @@ 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" @@ -942,9 +806,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -957,42 +830,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 81152d144aa99..f6e1cb2e0b11d 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -12,32 +12,28 @@ , lz4 , attr , udev -, valgrind , nixosTests , fuse3 , cargo , rustc -, coreutils , rustPlatform , makeWrapper +, writeScript , fuseSupport ? false }: -let - rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe"; -in stdenv.mkDerivation { + +stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "unstable-2023-06-28"; + version = "1.3.3"; + src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - inherit rev; - hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I="; + rev = "v${finalAttrs.version}"; + hash = "sha256-73vgwgBqyRLQ/Tts7bl6DhZMOs8ndIOiCke5tN89Wps="; }; - # errors on fsck_err function. Maybe miss-detection? - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; - nativeBuildInputs = [ pkg-config cargo @@ -71,27 +67,42 @@ in stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - nativeCheckInputs = [ valgrind ]; makeFlags = [ "PREFIX=${placeholder "out"}" - "VERSION=${lib.strings.substring 0 7 rev}" + "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; - preCheck = lib.optionalString fuseSupport '' + preCheck = lib.optionalString (!fuseSupport) '' rm tests/test_fuse.py ''; - passthru.tests = { - smoke-test = nixosTests.bcachefs; - inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; - }; + passthru = { + tests = { + smoke-test = nixosTests.bcachefs; - postFixup = '' - wrapProgram $out/bin/mount.bcachefs \ - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ''; + inherit (nixosTests.installer) + bcachefsSimple + bcachefsEncrypted + bcachefsMulti + bcachefsLinuxTesting + bcachefsUpgradeToLinuxTesting; + }; + + updateScript = writeScript "update-bcachefs-tools-and-cargo-lock.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/tags?per_page=1")" + + version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + + curl "https://raw.githubusercontent.com/${finalAttrs.src.owner}/${finalAttrs.src.repo}/v$version/rust-src/Cargo.lock" > \ + "$(git rev-parse --show-toplevel)/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock" + ''; + }; enableParallelBuilding = true; @@ -102,4 +113,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ davidak Madouura ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index d9beb8f12fcbd..6761947367315 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-PpLLbYO93mEjGP2ARt1u/0fHhuWdVt1Ozph5RdUTfJ4="; + hash = "sha256-tCZzbclOKwS2mD6ZjE3EJ9wWbWbd6iRsiQ7ZwqRQBE8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix index efdb9f3dc1d60..ba14fcad6c580 100644 --- a/pkgs/tools/filesystems/dduper/default.nix +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -4,9 +4,8 @@ let btrfsProgsPatched = btrfs-progs.overrideAttrs { patches = [ (fetchpatch { - name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; - url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/ecc2664c380616ec75cfc1e600b5514cdff5c687/patch/btrfs-progs-v6.1/0001-Print-csum-for-a-given-file-on-stdout.patch"; - sha256 = "sha256-M4LT7G6gwBfSXf6EL4pxNoQJMyUTOA+ojxEJqw2yss4="; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/1f1d29eff61430e118f88239545a29f0bcf3e15d/patch/btrfs-progs-v6.3.3/0001-Print-csum-for-a-given-file-on-stdout.patch"; + hash = "sha256-bO0t8QePnUbMkQQPesZlBF/khD/H8AaWHr2GkOnT6x8="; }) ]; }; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index fd2be83691a11..a22ed2f6f77c6 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , libgcrypt , pkg-config , glib @@ -14,35 +13,27 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; + hash = "sha256-hYBD5XFjM2AEsQm7yKEHkfjwLZmXTxkY/6S3hs1uBPw="; }; - patches = [ - # Use variable instead of hardcoding pkg-config - # https://github.com/markfasheh/duperemove/pull/315 - (fetchpatch2 { - url = "https://github.com/markfasheh/duperemove/commit/0e1c62d79a9a79d7bb3e80f1bd528dbf7cb75e22.patch"; - hash = "sha256-YMMu6LCkBlipEJALukQMwIMcjQEAG5pjGEGeTW9OEJk="; - }) - ]; - postPatch = '' substituteInPlace util.c --replace \ "lscpu" "${lib.getBin util-linux}/bin/lscpu" ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; + buildInputs = [ libgcrypt glib linuxHeaders sqlite util-linux ]; makeFlags = [ "PREFIX=${placeholder "out"}" "VERSION=v${version}" + "CFLAGS=-Wno-error=format-security" ]; passthru.tests.version = testers.testVersion { diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 14701a615c01e..966c396823928 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , cmake, pkg-config, perl , gettext, fuse, openssl, tinyxml2 }: @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { owner = "vgough"; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes a build failure when building with newer versions of clang. + # https://github.com/vgough/encfs/pull/650 + (fetchpatch { + url = "https://github.com/vgough/encfs/commit/406b63bfe234864710d1d23329bf41d48001fbfa.patch"; + hash = "sha256-VunC5ICRJBgCXqkr7ad7DPzweRJr1bdOpo1LKNCs4zY="; + }) + ]; + buildInputs = [ gettext fuse openssl tinyxml2 ]; nativeBuildInputs = [ cmake pkg-config perl ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index b738c30970182..38a4bbc35b3b0 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.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-tc3+OHDjsA2OC9YvuOXZMaysKot8O3+qNoymzF2PnwA="; + hash = "sha256-2nCH6L72CldGJk+5SREidlQfqaOvVIpRo/CjDDOHVmA="; }; - vendorHash = "sha256-9pVdoeRyhhxOX3jLZVlx+5eHfP5iu0x40wnpV0xq3Z0="; + vendorHash = "sha256-ViUnMiu6iMb/Ugbyx5FEGe5XSKf/wiOt/xAq/rT/Fzs="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 6ee1d96eaf498..46c62b7ae4b07 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/trapexit/mergerfs"; license = lib.licenses.isc; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jfrankenau makefu ]; + maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 6e11c6513dad1..debac18310dcd 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/trapexit/mergerfs-tools"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 7f08c9f716254..c1c374ac0340f 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.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "vasi"; repo = pname; rev = version; - sha256 = "sha256-gK1k1Ooue3HLtBmPFMZdW4h2Ee1Uy4T26EOBeQICQpM="; + sha256 = "sha256-nCdAO5WPYt/aHdNnfkIJqz0T59COgsSGeXho4bFZVTY="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; diff --git a/pkgs/tools/filesystems/stratisd/Cargo.lock b/pkgs/tools/filesystems/stratisd/Cargo.lock index 7fbf8fc968f33..d3554b3ce19fa 100644 --- a/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -1269,7 +1269,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.6.1" +version = "3.6.2" dependencies = [ "assert_cmd", "assert_matches", diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index ea519112b1cfe..bd8d4e89dd011 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -11,7 +11,6 @@ , dbus , cryptsetup , util-linux -, udev , lvm2 , systemd , xfsprogs @@ -28,13 +27,13 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-qpuJzsN6AXqvKtKBDZZEmviWBpPR0qNuq+3tIHGSWLs="; + hash = "sha256-R6Bb6ep5T8ePmxwDTxQyeXcSpp2S1C2zqwxmX2Wt1L8="; }; cargoDeps = rustPlatform.importCargoLock { @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { --replace stratis-min "$out/bin/stratis-min" \ --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ --replace sleep "${coreutils}/bin/sleep" \ - --replace udevadm "${udev}/bin/udevadm" + --replace udevadm "${systemd}/bin/udevadm" ''; nativeBuildInputs = [ @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { dbus cryptsetup util-linux - udev + systemd lvm2 ]; diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock b/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock new file mode 100644 index 0000000000000..3611e181a0fed --- /dev/null +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock @@ -0,0 +1,753 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", + "which", +] + +[[package]] +name = "bindgen" +version = "0.69.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", + "which", +] + +[[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 = "blkid" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f68440dfd06d6a97a56f8e67729316f33c7e52c31f59f16f6e9641777702bb7" +dependencies = [ + "bitflags 1.3.2", + "blkid-sys", + "libc", + "pkg-config", + "strum", + "strum_macros", + "thiserror", +] + +[[package]] +name = "blkid-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc9c952498f4ffdf6ec98a7e739ca08cc8af1950efdd9f47db46d9dbdc111565" +dependencies = [ + "bindgen 0.65.1", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_derive", + "indexmap", + "lazy_static", + "os_str_bytes", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.86", +] + +[[package]] +name = "cstr-argument" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bd9c8e659a473bce955ae5c35b116af38af11a7acb0b480e01f3ed348aeb40" +dependencies = [ + "cfg-if", + "memchr", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "errno" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +dependencies = [ + "libc", + "windows-sys", +] + +[[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 = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "indexmap" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[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 = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[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 = "libzfs" +version = "0.6.16" +source = "git+https://github.com/DeterminateSystems/rust-libzfs?branch=fix-build-zpool-auto-expand-partitions#7c14513fb85a147ce91afa02f5a0dc3e3f788c3a" +dependencies = [ + "cstr-argument", + "foreign-types", + "lazy_static", + "libzfs-sys", + "libzfs-types", + "nvpair-sys", + "serde", + "serde_derive", +] + +[[package]] +name = "libzfs-sys" +version = "0.5.11" +source = "git+https://github.com/DeterminateSystems/rust-libzfs?branch=fix-build-zpool-auto-expand-partitions#7c14513fb85a147ce91afa02f5a0dc3e3f788c3a" +dependencies = [ + "bindgen 0.69.1", + "nvpair-sys", + "pkg-config", +] + +[[package]] +name = "libzfs-types" +version = "0.1.2" +source = "git+https://github.com/DeterminateSystems/rust-libzfs?branch=fix-build-zpool-auto-expand-partitions#7c14513fb85a147ce91afa02f5a0dc3e3f788c3a" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[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 = "nvpair-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc4cc751960db1094a7a732dd0706927aeae9194bf66c30fa227b70fc62b6c8" + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pkg-config" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" + +[[package]] +name = "prettyplease" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +dependencies = [ + "proc-macro2", + "syn 2.0.39", +] + +[[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.86", + "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 = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[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.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.86", +] + +[[package]] +name = "serde_json" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" + +[[package]] +name = "strum_macros" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.86", +] + +[[package]] +name = "syn" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[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 = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.86", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "zpool_part_disks" +version = "0.1.1" +dependencies = [ + "blkid", + "clap", + "libzfs", + "serde", + "serde_json", +] diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix index 601baabd87eee..9af487b59c4e1 100644 --- a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix +++ b/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix @@ -8,16 +8,21 @@ }: rustPlatform.buildRustPackage rec { pname = "zpool-auto-expand-partitions"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "zpool-auto-expand-partitions"; rev = "v${version}"; - hash = "sha256-LA6YO6vv7VCXwFfayQVxVR80niSCo89sG0hqh0wDEh8="; + hash = "sha256-N1znZbJULEeNR4ABSrUtHHkmz08N+CZqX6Ni7jFzc4c="; }; - cargoHash = "sha256-5v0fqp8aro+QD/f5VudMREc8RvKQapNAoArcCKMN1Sw="; + cargoLock.lockFile = ./Cargo.lock; + # We rely on a fork of libzfs in order to bump the bindgen version to fix + # builds against LLVM 16. + cargoLock.outputHashes = { + "libzfs-0.6.16" = "sha256-kQunP/xW1Zb1q+TcgAkmZkt1yDnJo9CwF5qldikVN94="; + }; preBuild = '' substituteInPlace src/grow.rs \ diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/tools/games/pocket-updater-utility/default.nix index ef52b388ae8c1..2d841c00c5168 100644 --- a/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/pkgs/tools/games/pocket-updater-utility/default.nix @@ -6,7 +6,7 @@ , dotnetCorePackages ? pkgs.dotnetCorePackages , openssl ? pkgs.openssl , zlib ? pkgs.zlib -, targetPlatform ? pkgs.targetPlatform +, hostPlatform ? stdenv.hostPlatform }: buildDotnetModule rec { @@ -30,7 +30,7 @@ buildDotnetModule rec { patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace pocket_updater.csproj \ - --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}" + --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" ''; projectFile = "pocket_updater.csproj"; diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index a9f8aa21bf1d6..dcf078654b82d 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "lsix"; - version = "1.8"; + version = "1.8.2"; src = fetchFromGitHub { owner = "hackerb9"; repo = pname; rev = version; - sha256 = "sha256-Qx6/PFm1XBmEI6iI+Ref9jNe6sXIhsVL4VQ1CX+caZE="; + sha256 = "sha256-xlOlAfZonSo/RERt5WxPqMvppVrY5/Yhh7SgCCsYDQE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 69af8d86b6790..105169c5e0305 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.4.3"; + version = "11.4.4"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4776"; - sha256 = "h8QjYc4VYJY1fSwCyqn6am/L0tv02ux1lQZfYov1XFA="; + rev = "4784"; + sha256 = "GoO32AWu2s/s1IzehPynCJctc1F98dQhz5cQSXQhu2A="; }; nativeBuildInputs = [ @@ -95,6 +95,10 @@ stdenv.mkDerivation { runHook postConfigure ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + }; + installPhase = '' runHook preInstall diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 3e9127a9a9aec..2f70dec897c04 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { pname = "optipng"; - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz"; - sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg"; + hash = "sha256-JaO9aEgfIVAsyqD0wT+E3PayAzjkxOjFHyzvvYUTOYw="; }; buildInputs = [ libpng ]; - LDFLAGS = lib.optional static "-static"; # Workaround for crash in cexcept.h. See # https://github.com/NixOS/nixpkgs/issues/28106 preConfigure = '' export LD=$CC ''; + # OptiPNG does not like --static, --build or --host + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + configureFlags = [ "--with-system-zlib" "--with-system-libpng" diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 1bf20910cf54a..642a49c39b843 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = "sdk-${finalAttrs.version}"; - hash = "sha256-abVqLovvcKBJhGhSCbyD5mc1DSfvh4TWssGxi52ukQ8="; + rev = "vulkan-sdk-${finalAttrs.version}"; + hash = "sha256-UIk5hihUPjXNzEeO2laS4dUef/rEExxXAZjMcftx+3A="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 60e7e7221a13a..8159831264511 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -24,8 +24,6 @@ , wayland-protocols , enableX11 ? stdenv.isLinux , xorg -, withoutStdRanges ? stdenv.isDarwin -, range-v3 }: stdenv.mkDerivation rec { @@ -69,8 +67,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableX11 [ xorg.libX11 xorg.xcbutilimage - ] ++ lib.optionals withoutStdRanges [ - range-v3 ]; cmakeFlags = lib.optionals (!enableOpencv) [ diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 218014db019eb..c16ba635f5043 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -18,7 +18,6 @@ , libexif , librsvg , poppler -, libgsf , libtiff , fftw , lcms2 @@ -26,7 +25,6 @@ , libimagequant , imagemagick , pango -, orc , matio , cfitsio , libwebp @@ -36,19 +34,23 @@ , openslide , libheif , cgif +, libarchive +, libhwy +, testers +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.14.5"; + version = "8.15.0"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; src = fetchFromGitHub { owner = "libvips"; repo = "libvips"; - rev = "v${version}"; - hash = "sha256-fG3DTP+3pO7sbqR/H9egJHU3cLKPU4Jad6qxcQ9evNw="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-WfKq+maLcAXyjk1sq66wSU92ALv4MfRDPKe4Mki0KRQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -76,7 +78,6 @@ stdenv.mkDerivation rec { libexif librsvg poppler - libgsf libtiff fftw lcms2 @@ -84,7 +85,6 @@ stdenv.mkDerivation rec { libimagequant imagemagick pango - orc matio cfitsio libwebp @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { openslide libheif cgif + libarchive + libhwy ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file @@ -109,13 +111,29 @@ stdenv.mkDerivation rec { ++ lib.optional (imagemagick == null) "-Dmagick=disabled" ; + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "vips --version"; + }; + }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v([0-9.]+)" ]; + }; + }; + meta = with lib; { - changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; - homepage = "https://libvips.github.io/libvips/"; + changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; + homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ kovirobi ]; + maintainers = with maintainers; [ kovirobi anthonyroussel ]; + pkgConfigModules = [ "vips" "vips-cpp" ]; platforms = platforms.unix; mainProgram = "vips"; }; -} +}) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 96edbcad83f60..dae55225a0b3f 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, jq, libX11, libXrandr, libxcb, wayland }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland }: stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; - rev = "v${version}"; - hash = "sha256-MeW7mmbjgqEvXEnAYzTNu4omC4fqq1fplIVjDpV2LcA="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-rSKPTeTDOz6IeJGRt9aIu1VH8VfVzXNYZfjdiSXEJxg="; }; nativeBuildInputs = [ cmake pkg-config jq ]; - buildInputs = [ vulkan-headers libX11 libXrandr libxcb wayland ]; + buildInputs = [ vulkan-headers vulkan-utility-libraries libX11 libXrandr libxcb wayland ]; # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 072876e46dec2..ab593a9bc4de7 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -16,23 +16,22 @@ , which , xcbutilkeysyms , xcbutilwm +, valijson , vulkan-headers , vulkan-loader -, symlinkJoin -, vulkan-validation-layers +, vulkan-utility-libraries , writeText }: stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; - rev = "v${version}"; - hash = "sha256-Kem3nWVaMeDEsidKYMsWr9Bu0yBgjjennDB0sKBDogA="; - fetchSubmodules = true; + rev = "vulkan-sdk-${version}"; + hash = "sha256-2ZUD+RBsl35QV3250JOPCIoJb4sJcBsiRE4SZaS6ROs="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config ]; @@ -45,6 +44,10 @@ stdenv.mkDerivation rec { libXrandr libffi libxcb + valijson + vulkan-headers + vulkan-loader + vulkan-utility-libraries wayland xcbutilkeysyms xcbutilwm @@ -52,27 +55,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" - "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}" - "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${ - symlinkJoin { - name = "vulkan-validation-layers-merged"; - paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; - } - }" - # Hide dev warnings that are useless for packaging - "-Wno-dev" ]; preConfigure = '' - # We need to run this update script which generates some source files, - # Remove the line in it which calls 'git submodule update' though. - # Also patch the scripts in ./scripts - update=update_external_sources.sh - patchShebangs $update patchShebangs scripts/* - sed -i '/^git /d' $update - ./$update - substituteInPlace via/CMakeLists.txt --replace "jsoncpp_static" "jsoncpp" ''; @@ -85,13 +71,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ - ./gtest.patch - ]; - - # Same as vulkan-validation-layers - dontPatchELF = true; - # Help vulkan-loader find the validation layers setupHook = writeText "setup-hook" '' export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch deleted file mode 100644 index cf062a8591ff2..0000000000000 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/gtest.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/external/googletest/googlemock/CMakeLists.txt b/external/googletest/googlemock/CMakeLists.txt -index e7df8ec53d..869bfcb716 100644 ---- a/external/googletest/googlemock/CMakeLists.txt -+++ b/external/googletest/googlemock/CMakeLists.txt -@@ -111,10 +111,10 @@ endif() - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - target_include_directories(gmock_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gmock_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - endif() - - ######################################################################## -diff --git a/external/googletest/googletest/CMakeLists.txt b/external/googletest/googletest/CMakeLists.txt -index abdd98b79a..7ae174d566 100644 ---- a/external/googletest/googletest/CMakeLists.txt -+++ b/external/googletest/googletest/CMakeLists.txt -@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - target_include_directories(gtest_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${gtest_build_include_dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>") - endif() - target_link_libraries(gtest_main PUBLIC gtest) - diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 9327bd9c9d6ed..e148f51d86893 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; - rev = "v${version}"; - hash = "sha256-C5FVkI9F/dgIS8qp7VaOn9J2zoNLb1PnmgAemsVO6zM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-IsMxiAR4ak6kC3BNYhtI+JVNkEka4ZceSElxk39THXg="; }; nativeBuildInputs = [ @@ -57,27 +57,19 @@ stdenv.mkDerivation rec { Cocoa ]; - libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; - - patches = [ - # Vulkan-Tools expects to find the MoltenVK ICD and `libMoltenVK.dylib` in its source repo. - # Patch it to use the already-built binaries and ICD in nixpkgs. - ./use-nix-moltenvk.patch - ]; - - # vkcube.app and vkcubepp.app require `ibtool`, but the version in `xib2nib` is not capable of - # building these apps. Build them using `ibtool` from Xcode, but don’t allow any other binaries - # into the sandbox. Note that the CLT are not supported because `ibtool` requires Xcode. - sandboxProfile = lib.optionalString stdenv.isDarwin '' - (allow process-exec - (literal "/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/ibtool") - (regex "/Xcode.app/Contents/Developer/usr/bin/xcodebuild")) - (allow file-read*) - (deny file-read* (subpath "/usr/local") (with no-log)) - (allow file-write* (subpath "/private/var/folders")) + postPatch = lib.optionalString stdenv.isDarwin '' + # Modify mac_common.cmake to find the ICD where nixpkgs puts it. + substituteInPlace mac_common.cmake \ + --replace MoltenVK/icd/MoltenVK_icd.json MoltenVK_icd.json + # Remove the unconditional check for `ibtool` since the cube demo that needs it won’t be built. + sed -e '/#.*Interface Builder/,/^endif()/d' -i mac_common.cmake + # Install `vulkaninfo` to $out/bin even on Darwin. + substituteInPlace vulkaninfo/CMakeLists.txt \ + --replace 'install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")' 'install(TARGETS vulkaninfo)' ''; + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + dontPatchELF = true; cmakeFlags = [ @@ -91,7 +83,8 @@ stdenv.mkDerivation rec { "-Wno-dev" ] ++ lib.optionals stdenv.isDarwin [ "-DMOLTENVK_REPO_ROOT=${moltenvk}/share/vulkan/icd.d" - "-DIBTOOL=/usr/bin/ibtool" + # Don’t build the cube demo because it requires `ibtool`, which is not available in nixpkgs. + "-DBUILD_CUBE=OFF" ]; meta = with lib; { @@ -102,7 +95,6 @@ stdenv.mkDerivation rec { use of the Vulkan API. ''; homepage = "https://github.com/KhronosGroup/Vulkan-Tools"; - hydraPlatforms = [ "x86_64-linux" "i686-linux" ]; platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch b/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch deleted file mode 100644 index 5d09bff9c958c..0000000000000 --- a/pkgs/tools/graphics/vulkan-tools/use-nix-moltenvk.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt -index a2f026e7..327f5dba 100644 ---- a/cube/CMakeLists.txt -+++ b/cube/CMakeLists.txt -@@ -257,14 +257,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcube BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcube BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcube RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -@@ -302,14 +295,7 @@ else() - endif() - - if(APPLE) -- # Keep RPATH so fixup_bundle can use it to find libraries -- set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE) -- install(TARGETS vkcubepp BUNDLE DESTINATION "cube") -- # Fix up the library references to be self-contained within the bundle. -- install(CODE " -- include(BundleUtilities) -- fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\") -- ") -+ install(TARGETS vkcubepp BUNDLE DESTINATION "Applications") - else() - install(TARGETS vkcubepp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() -diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake -index 9b823f95..0c43a2c9 100644 ---- a/cube/macOS/cube/cube.cmake -+++ b/cube/macOS/cube/cube.cmake -@@ -72,12 +72,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcube POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake -index eae4de3c..e528ae26 100644 ---- a/cube/macOS/cubepp/cubepp.cmake -+++ b/cube/macOS/cubepp/cubepp.cmake -@@ -74,12 +74,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" - # Copy the MoltenVK lib into the bundle. - if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - else() - add_custom_command(TARGET vkcubepp POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" -+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks -+ COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib - DEPENDS vulkan) - endif() -diff --git a/mac_common.cmake b/mac_common.cmake -index bad3c414..b498906d 100644 ---- a/mac_common.cmake -+++ b/mac_common.cmake -@@ -23,9 +23,8 @@ set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT}) - # MoltenVK JSON File - - execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json) --execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json -- OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) -+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json) - - # ~~~ - # Modify the ICD JSON file to adjust the library path. -@@ -36,10 +35,9 @@ execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]* - # ~~~ - add_custom_target(MoltenVK_icd-staging-json ALL - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json -- COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$" -- ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -- VERBATIM -- DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json") -+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json -+ ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json -+ DEPENDS "${MOLTENVK_DIR}/MoltenVK_icd.json") - set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE) - - find_library(COCOA NAMES Cocoa) -diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt -index d23dcf89..32aa0ebb 100644 ---- a/vulkaninfo/CMakeLists.txt -+++ b/vulkaninfo/CMakeLists.txt -@@ -136,9 +136,5 @@ elseif(APPLE) - add_definitions(-DVK_USE_PLATFORM_MACOS_MVK -DVK_USE_PLATFORM_METAL_EXT) - endif() - --if(APPLE) -- install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo") --else() -- install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) --endif() -+install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index 1ef2c807bde7d..dabe14d895fa7 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Lightweight color picker for X11"; homepage = "https://github.com/Soft/xcolor"; - maintainers = with lib.maintainers; [ fortuneteller2k ]; + maintainers = with lib.maintainers; [ moni ]; license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch new file mode 100644 index 0000000000000..7b7ca5a0befa5 --- /dev/null +++ b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40889.patch @@ -0,0 +1,17 @@ +Simple bounds checks for CVE-2023-40889, based on third-party +fix by Remi Meier @ +https://github.com/Raemi/zbar/commit/5e8acc6974f17e56c3ddaa5509870beb8d7a599c + +--- a/zbar/qrcode/qrdec.c ++++ b/zbar/qrcode/qrdec.c +@@ -3900,8 +3900,8 @@ void qr_reader_match_centers(qr_reader *_reader,qr_code_data_list *_qrlist, + /*TODO: We might be able to accelerate this step significantly by + considering the remaining finder centers in a more intelligent order, + based on the first finder center we just chose.*/ +- for(j=i+1;!mark[i]&&j<_ncenters;j++){ +- for(k=j+1;!mark[j]&&k<_ncenters;k++)if(!mark[k]){ ++ for(j=i+1; i < _ncenters && !mark[i]&&j<_ncenters;j++){ ++ for(k=j+1; j < _ncenters && !mark[j]&&k<_ncenters;k++)if(!mark[k]){ + qr_finder_center *c[3]; + qr_code_data qrdata; + int version; diff --git a/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch new file mode 100644 index 0000000000000..3576df214ae1a --- /dev/null +++ b/pkgs/tools/graphics/zbar/0.23.92-CVE-2023-40890.patch @@ -0,0 +1,26 @@ +Simple bounds checks for CVE-2023-40890 + +--- a/zbar/decoder/databar.c ++++ b/zbar/decoder/databar.c +@@ -23,6 +23,8 @@ + + #include <config.h> + #include <zbar.h> ++#include <stdlib.h> ++#include <stdio.h> + + #ifdef DEBUG_DATABAR + # define DEBUG_LEVEL (DEBUG_DATABAR) +@@ -691,6 +693,12 @@ lookup_sequence (databar_segment_t *seg, + fixed = -1; + s <<= 1; + dbprintf(2, "%x", s); ++ ++ if (i > 20) { ++ fprintf(stderr, "Bug: Out-of-bounds condition detected\n"); ++ exit(99); ++ } ++ + seq[i++] = s++; + seq[i++] = s; + } diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index f9b84d2656a34..5a1d7e94fdf6c 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , imagemagickBig , pkg-config , withXorg ? true @@ -42,6 +43,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w="; }; + patches = [ + ./0.23.92-CVE-2023-40889.patch + ./0.23.92-CVE-2023-40890.patch + ]; + nativeBuildInputs = [ pkg-config xmlto diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 136550548e645..cedbb1b9f22da 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -8,6 +8,7 @@ , extra-cmake-modules , cairo , pango +, expat , fribidi , fmt , wayland @@ -29,6 +30,7 @@ , libdatrie , xcbutilkeysyms , pcre +, xcbutil , xcbutilwm , xcb-imdkit , libxkbfile @@ -43,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.1"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-R8stzpfQttBZFFSu8ikUz/2eL+b98/X672uVFsha9H0="; + hash = "sha256-HclPnxeDtWzlyOEXKgTrypiHVJezuUCBhfUW+9ytPVg="; }; prePatch = '' @@ -63,6 +65,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + expat fmt isocodes cairo @@ -84,6 +87,7 @@ stdenv.mkDerivation rec { libXdmcp libxkbcommon pcre + xcbutil xcbutilwm xcbutilkeysyms xcb-imdkit diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix index 0e1a5fa9598b0..7069cfe017709 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-anthy"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz"; - sha256 = "sha256-kUelkzVr1zOC4bbNP2EFPnhtygkJnKCFdlHeSkBGLGw="; + sha256 = "sha256-7kKHes8jacDQcOQsngstzTrRoc81ybQoSyrY4s8KPSg="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index 4facccf49fbbf..47d7dfad6bd54 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Zjwt7JHwCfXlY46qRTXSmXI69fANZNI7DY1ixpMEqPM="; + sha256 = "sha256-boIkbtNLPTNXY9e5gdQklhJuDU36ZswOqY2X8nRKqho="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index bcb1a6ac50944..50c944f85f4b9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-XC8NQYVvGhh6GFrKtJi9GeBHxWrtw9DJzeeDvKAQEdk="; + sha256 = "sha256-DrgZlj3SUR1lFVvDXoCKvil22YRW6YJkGwihdGdWaHM="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 0dfa9f822a29a..78e43f78503e9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-xVBmFFUnlWqviht/KGFTHCd3xCln/6hyBG72tIHqopc="; }; + outputs = [ "out" "dev" ]; + cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e922bc533c2ca..a532a447a1efb 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -9,17 +9,18 @@ , libXdmcp , qtbase , qt6 +, wayland }: mkDerivation rec { pname = "fcitx5-qt"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IkaaLFMyPVaL5taRN4e+QxMEsNhhXlA1fWBn/6PeGnI="; + sha256 = "sha256-qXQ5nvPV5YHD8MFfeqgF8kyk0zf28lWxM8SUo3T6TzA="; }; preConfigure = '' @@ -31,7 +32,7 @@ mkDerivation rec { cmakeFlags = [ # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase}" + "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" "-DENABLE_QT4=0" "-DENABLE_QT6=1" ]; @@ -46,6 +47,7 @@ mkDerivation rec { qtx11extras libxcb libXdmcp + wayland ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 0e62a1ae366f9..29cbd2e3dc387 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.2"; + version = "5.1.3"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-0WcBM6kOKATuh6I8yEzl+HkK5/k4Ku6brZ+s1ncKlpw="; + hash = "sha256-qFojAwwR6lqP7RKSJ3LPAxDEscjKJ6wNZFpdlwz+QzM="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix index 58cbe91e3c570..0622ce699f8c2 100644 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ b/pkgs/tools/inputmethods/fusuma/default.nix @@ -18,7 +18,7 @@ bundlerApp { description = "Multitouch gestures with libinput driver on X11, Linux"; homepage = "https://github.com/iberianpig/fusuma"; license = licenses.mit; - maintainers = with maintainers; [ jfrankenau nicknovitski Br1ght0ne ]; + maintainers = with maintainers; [ nicknovitski Br1ght0ne ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index cb19026173254..33426862004d3 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.23"; + version = "1.4.24"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-7bmWyk7A+dXu1jjD5j9P/w88PVqPnNSxE1Kgj+Xpvyg="; + sha256 = "sha256-E5+IA2tH9wes6Soj9DPw1cdfQ9PINUy9zKJHMt9/fjY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index e7ef0f8accf14..73df87a8262e2 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wertarbyte/triggerhappy/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau taha ]; + maintainers = with maintainers; [ taha ]; }; } diff --git a/pkgs/tools/llm/open-interpreter/default.nix b/pkgs/tools/llm/open-interpreter/default.nix index bba449acdc768..b8624fdc48312 100644 --- a/pkgs/tools/llm/open-interpreter/default.nix +++ b/pkgs/tools/llm/open-interpreter/default.nix @@ -4,7 +4,7 @@ , semgrep }: let - version = "0.1.7"; + version = "0.1.11"; in python3.pkgs.buildPythonApplication { pname = "open-interpreter"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication { owner = "KillianLucas"; repo = "open-interpreter"; rev = "v${version}"; - hash = "sha256-U+GKvlFY9vkjXaPI0H5RsoMFLlLq1+IuSy/cOj/LNSw="; + hash = "sha256-viUMGUBy5UNWag6P8tXE4TcJIx53Q/tASNV3bmCCK0g="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication { gitpython huggingface-hub inquirer + jinja2 litellm openai # pyreadline3 # this is a windows deps @@ -36,6 +37,7 @@ python3.pkgs.buildPythonApplication { rich six tiktoken + tokenizers tokentrim wget yaspin diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index f74d1a8c803a5..793e06fb3d056 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -1,31 +1,33 @@ { lib, stdenv , fetchurl -, fetchzip , autoPatchelfHook , makeWrapper , jdk , libsecret , webkitgtk , wrapGAppsHook +, _7zz +, nixosTests }: stdenv.mkDerivation rec { pname = "Archi"; - version = "4.7.1"; + version = "5.2.0"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://www.archimatetool.com/downloads/archi/Archi-Linux64-${version}.tgz"; - sha256 = "0sd57cfnh5q2p17sd86c8wgmqyipg29rz6iaa5brq8mwn8ps2fdw"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchzip { - url = "https://www.archimatetool.com/downloads/archi/Archi-Mac-${version}.zip"; - sha256 = "1h05lal5jnjwm30dbqvd6gisgrmf1an8xf34f01gs9pwqvqfvmxc"; - } - else - throw "Unsupported system"; + src = { + "x86_64-linux" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Linux64-${version}.tgz"; + hash = "sha256-uGW4Wl3E71ZCgWzPHkmXv/PluegDF8C64FUQ7C5/SDA="; + }; + "x86_64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-${version}.dmg"; + hash = "sha256-GI9aIAYwu60RdjN0Y3O94sVMzJR1+nX4txVcvqn1r58="; + }; + "aarch64-darwin" = fetchurl { + url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg"; + hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system"); buildInputs = [ libsecret @@ -34,7 +36,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook - ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + _7zz + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + + unpackPhase = if stdenv.hostPlatform.isDarwin then '' + 7zz x $src + '' else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -55,6 +65,8 @@ stdenv.mkDerivation rec { mv Archi.app "$out/Applications/" ''; + passthru.tests = { inherit (nixosTests) archi; }; + meta = with lib; { description = "ArchiMate modelling toolkit"; longDescription = '' diff --git a/pkgs/tools/misc/bfetch/default.nix b/pkgs/tools/misc/bfetch/default.nix index 107f2cd945285..675a8cb11f382 100644 --- a/pkgs/tools/misc/bfetch/default.nix +++ b/pkgs/tools/misc/bfetch/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NNBnh/bfetch"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/bootspec/default.nix b/pkgs/tools/misc/bootspec/default.nix index 7bf6bc478d7c0..2ffa6c47ab09e 100644 --- a/pkgs/tools/misc/bootspec/default.nix +++ b/pkgs/tools/misc/bootspec/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bootspec"; @@ -13,6 +14,17 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5IGSMHeL0eKfl7teDejAckYQjc8aeLwfwIQSzQ8YaAg="; }; + patches = [ + # https://github.com/DeterminateSystems/bootspec/pull/127 + # Fixes the synthesize tool for aarch64-linux + (fetchpatch { + name = "aarch64-support.patch"; + url = "https://github.com/DeterminateSystems/bootspec/commit/1d0e925f360f0199f13422fb7541225fd162fd4f.patch"; + sha256 = "sha256-wU/jWnOqVBrU2swANdXbQfzRpNd/JIS4cxSyCvixZM0="; + }) + + ]; + cargoHash = "sha256-eGSKVHjPnHK7WyGkO5LIjocNGHawahYQR3H5Lgk1C9s="; meta = with lib; { diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 5838c24172f8e..f9b3ec3f73ac2 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez -, tcl, acl, kmod, coreutils, shadow, util-linux, udev +, tcl, acl, kmod, coreutils, shadow, util-linux , alsaSupport ? stdenv.isLinux, alsa-lib , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { ) substituteInPlace $out/libexec/brltty/systemd-wrapper \ --replace 'logger' "${util-linux}/bin/logger" \ - --replace 'udevadm' "${udev}/bin/udevadm" + --replace 'udevadm' "${systemd}/bin/udevadm" ''; } diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index bf289ff8c77c4..570882d59ab9a 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -1,25 +1,24 @@ -{lib, stdenv, fetchurl, flex}: +{ lib, stdenv, fetchFromGitHub, flex, autoreconfHook }: stdenv.mkDerivation rec { pname = "detox"; - version = "1.2.0"; + version = "1.4.5"; - src = fetchurl { - url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; - sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; + src = fetchFromGitHub { + owner = "dharple"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cTuK5EIimRVZ1nfuTa1ds6xrawYIAbwNNIkNONd9y4Q="; }; - buildInputs = [flex]; + nativeBuildInputs = [ flex autoreconfHook ]; hardeningDisable = [ "format" ]; - postInstall = '' - install -m644 safe.tbl $out/share/detox/ - ''; - meta = with lib; { - homepage = "https://detox.sourceforge.net/"; + homepage = "https://github.com/dharple/detox"; description = "Utility designed to clean up filenames"; + changelog = "https://github.com/dharple/detox/blob/v${version}/CHANGELOG.md"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces difficult to work with characters, such as spaces, with standard @@ -29,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "detox"; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 8926b9714291e..09a4ef57c69f6 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -78,11 +78,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "251"; + version = "252"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-7oAFxzLLEds9SI14F88QRhirb/3pjXhmGaW0SWUgpv4="; + hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ="; }; outputs = [ diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 04b9dd5fad888..b23fe3fa4ed8d 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -49,7 +49,7 @@ buildGoModule rec { ''; homepage = "https://direnv.net"; license = licenses.mit; - maintainers = teams.numtide.members; + maintainers = [ maintainers.zimbatm ]; mainProgram = "direnv"; }; } diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 767a1f5eaecff..2a2a3d3611cf3 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.20.1"; + version = "2.20.2"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-yBPzf0ZpL49CupdtxjEo9QiOC5vwTcqdfAC2Q6WcNhE="; + hash = "sha256-xF7+yOtVT464C+LWjho+eMgvTqL58YZ8COnDzw5gL3c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-jgPOC8xtxYyKhYzsJezefwgopVL+1MED+Wf5h6bCYBg="; + cargoHash = "sha256-ttj770aw5NOb2+R2dTxN6Trkz0k5iVWhvHPoG9fzUbw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 359bd6d3ab932..222470299739e 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -17,6 +17,6 @@ rustPlatform.buildRustPackage rec { description = "ELF visualizer, generates HTML files from ELF binaries."; homepage = "https://github.com/ruslashev/elfcat"; license = licenses.zlib; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index b46b94037083e..efee9f7043e5e 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - hash = "sha256-SR3e0sw/Hc2NJvSWpMezqZa5HHqyCIPKN1A3o5giH54="; + hash = "sha256-EowM4u/qWua9P9M8PNMeFh6wwCYJ2HF6036VtBZW5SY="; }; postPatch = '' diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index ceb416c652905..f5bd9910569f3 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20230904.0"; + version = "20231107.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-b+NlWekNXbGvhLQlQqFtSSsO99J+ldS6NddlK3lykeA="; + hash = "sha256-84iM987nxNidMObnbY3lt78xRbN9USNtqQzfOzkd17k="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 8413dde76961d..60c81924805f7 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, python3 +, python3Packages , fetchFromGitHub , platformio , esptool_3 @@ -8,7 +8,7 @@ }: let - python = python3.override { + python = python3Packages.python.override { packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix {}; }; @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.10.6"; + version = "2023.11.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GqZSQVQnxLj0JrUrCMB5+RmxcJRU6ErIDGP8WaMolXk="; + hash = "sha256-7VYGrWoElc/urs+jomJrRt0dzdmJhCenRvb9bHCl6H4="; }; postPatch = '' @@ -45,6 +45,7 @@ python.pkgs.buildPythonApplication rec { # - validate_pillow_installed propagatedBuildInputs = with python.pkgs; [ aioesphomeapi + argcomplete click colorama cryptography @@ -72,7 +73,7 @@ python.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3Packages; [ hypothesis mock pytest-asyncio diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 19ab5158a65b6..e2457ad63e137 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -6,18 +6,29 @@ tcl.mkTclDerivation rec { src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; - sha256 = "0d1cp5hggjl93xwc8h1y6adbnrvpkk0ywkd00inz9ndxn21xm9s9"; + hash = "sha256-Safag7C92fRtBKBN7sGcd2e7mjI+QMR4H4nK92C5LDQ="; }; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; - sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b"; + hash = "sha256-yyzE0Jjac5qaj7Svn4VpMiAqSNLYrw7VZbtFqgMVncs="; }) (substituteAll { src = ./fix-cross-compilation.patch; tcl = "${buildPackages.tcl}/bin/tclsh"; }) + # The following patches fix compilation with clang 15+ + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/24/attachment/0001-Add-prototype-to-function-definitions.patch"; + hash = "sha256-X2Vv6VVM3KjmBHo2ukVWe5YTVXRmqe//Kw2kr73OpZs="; + }) + (fetchpatch { + url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; + hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; + }) + # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. + ./fix-darwin-clang16.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/expect/fix-darwin-clang16.patch b/pkgs/tools/misc/expect/fix-darwin-clang16.patch new file mode 100644 index 0000000000000..9454769c99c8f --- /dev/null +++ b/pkgs/tools/misc/expect/fix-darwin-clang16.patch @@ -0,0 +1,31 @@ +diff -ur a/exp_win.c b/exp_win.c +--- a/exp_win.c 2018-02-02 14:15:52.000000000 -0500 ++++ b/exp_win.c 2023-10-10 07:47:33.082690432 -0400 +@@ -39,7 +39,8 @@ + /* Sigh. On AIX 2.3, termios.h exists but does not define TIOCGWINSZ */ + /* Instead, it has to come from ioctl.h. However, As I said above, this */ + /* can't be cavalierly included on all machines, even when it exists. */ +-#if defined(HAVE_TERMIOS) && !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H) ++/* Darwin also has termios.h, but it requires ioctl.h for `ioctl`. */ ++#if defined(HAVE_TERMIOS) && (defined(__APPLE__) || !defined(HAVE_TIOCGWINSZ_IN_TERMIOS_H)) + # include <sys/ioctl.h> + #endif + +diff -ur d/pty_termios.c c/pty_termios.c +--- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 ++++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 +@@ -7,7 +7,13 @@ + + */ + +-#include <pty.h> /* openpty */ ++/* openpty */ ++#ifdef __APPLE__ ++#include <util.h> ++#else /* pty.h is Linux-specific */ ++#include <pty.h> ++#endif ++ + #include <stdio.h> + #include <signal.h> + diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index fe1d957437d08..074088f3f19ec 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iF1E9wBX9UVv/zuCgznXqKLBF+Xk0LqVdJfxFNpmzRI="; + sha256 = "sha256-An1biuaqPeRniJZroxoT2o9IEA4XFf5l6ut4nmOsQJI="; }; - cargoHash = "sha256-xf4Q6nk2sYuAV+B7dsRF+feiLRKLXDSHnlYmw+o5bNc="; + cargoHash = "sha256-gnFu0JsMt1wMfifF6EnjDwwydFnVyqpkHV0cyR5Qt3Y="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/tools/misc/fetchutils/default.nix index e9ee3fba516d4..d1c830f877d63 100644 --- a/pkgs/tools/misc/fetchutils/default.nix +++ b/pkgs/tools/misc/fetchutils/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/lptstr/fetchutils"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix index b943c22d25be7..0ad2c533fd964 100644 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ b/pkgs/tools/misc/flashrom-stable/default.nix @@ -2,7 +2,7 @@ , installShellFiles , lib , libftdi1 -, libgpiod +, libgpiod_1 , libjaylink , libusb1 , pciutils @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libjaylink libusb1 ] ++ lib.optionals (!stdenv.isDarwin) [ - libgpiod + libgpiod_1 pciutils ]; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index a674bee64560c..d88b143adc92f 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "2.1.10"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-6uq5eOHx0P2S3WsN0PooNlGQS2ty7DdPsCEgoQsLmRM="; + hash = "sha256-E3fNU6aHyKMli+A+yiJUY065jchWkkAbumkdY8BaAAE="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index c27e1ff1aaccf..8e783fc155097 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -25,13 +25,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.44.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-YIMtLQzxORWFWCgdnLUQLmmE79aw40LhcxqiHCWjgNk="; + hash = "sha256-oL3AA/3RPKcXLBNYaBYleueQph7/xvN/UEhwcYM9lAs="; }; vendorHash = "sha256-EutNjyW5bvGvMZP9xBrcu91TOAbl9TDZe2+g0/qnuAQ="; diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/tools/misc/gh-actions-cache/default.nix index 8bc735f4e5239..46fe8cb704d13 100644 --- a/pkgs/tools/misc/gh-actions-cache/default.nix +++ b/pkgs/tools/misc/gh-actions-cache/default.nix @@ -21,8 +21,9 @@ buildGoModule rec { "-w" ]; - # Tests need network - doCheck = false; + # Needed for tests. + # https://github.com/actions/gh-actions-cache/issues/53#issuecomment-1464954495 + env.GH_TOKEN = "dummy-token-to-facilitate-rest-client"; meta = { description = "gh extension to manage GitHub Actions caches"; diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index a253d1da6c3fa..de5f49aca256a 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-8UoAN5z84gGV869AgOWGrC92NdEnkw5b6QME4QKQ/mM="; + hash = "sha256-mfPh9cdsn9Jq9a1gkF5f/24inxuwcITrp7KfSfp0pMQ="; }; subPackages = [ "." ]; - vendorHash = "sha256-S2bt015AD25K6yrVGK3qv8Gq2fVifVV0AVBSt/8V9So="; + vendorHash = "sha256-GfvEurTX5r2ZIOwaDJA4ncd8SNMusoqXuhcMGYvaVwQ="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix index e0a4369eb4779..83b6b2466fbf3 100644 --- a/pkgs/tools/misc/goss/default.nix +++ b/pkgs/tools/misc/goss/default.nix @@ -16,16 +16,16 @@ buildGoModule rec { pname = "goss"; # Don't forget to update dgoss to the same version. - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FDn1OETkYIpMenk8QAAHvfNZcSzqGl5xrD0fAZPVmRM="; + hash = "sha256-dH052t30unWmrFTZK5niXNvbg1nngzWY7mwuZr4ULbM="; }; - vendorHash = "sha256-n+k7f9e2iqf4KrcDkzX0CWk+Bq2WE3dyUEid4PTP1FA="; + vendorHash = "sha256-4fEEz/c/xIeWxIzyyjwgSn2/2FWLA2tIedK65jGgYhY="; CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix index 3dc849eaeec76..cc033e50fee58 100644 --- a/pkgs/tools/misc/graylog/5.1.nix +++ b/pkgs/tools/misc/graylog/5.1.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.1.4"; - sha256 = "sha256-ZuzmNbc+qB6oYCnR5iAsSEQGTB+pk+ghF0/+O3BTLkA="; + version = "5.1.7"; + sha256 = "sha256-OIdDBrLJEXhnQF98F0ncsoYcrH4KtHUz9Di1Jefsi6w="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } diff --git a/pkgs/tools/misc/halp/default.nix b/pkgs/tools/misc/halp/default.nix index d9028a8392a8d..89867fe7a9410 100644 --- a/pkgs/tools/misc/halp/default.nix +++ b/pkgs/tools/misc/halp/default.nix @@ -5,7 +5,6 @@ , stdenv , darwin , unixtools -, rust }: rustPlatform.buildRustPackage rec { @@ -48,7 +47,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/helper/args/mod.rs \ - --subst-var-by releaseDir target/${rust.toRustTargetSpec stdenv.hostPlatform}/$cargoCheckType + --subst-var-by releaseDir target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$cargoCheckType ''; preCheck = '' diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index b6577a17bb195..2636cb71717bb 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -95,6 +95,13 @@ stdenv.mkDerivation rec { else [ "-DHDF4_BUILD_FORTRAN=OFF" ] ); + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + doCheck = true; excludedTests = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index dcfcf4a6a5446..dda8fd3a8fa49 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -12,11 +12,11 @@ let inherit (lib) optional; in stdenv.mkDerivation rec { - version = "1.10.9"; + version = "1.10.11"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE="; + sha256 = "sha256-Cvx32lxGIXcJR1u++8qRwMtvHqYozNjDYZbPbFpN4wQ="; }; outputs = [ "out" "dev" ]; @@ -51,11 +51,5 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant homepage = "https://www.hdfgroup.org/HDF5/"; platforms = lib.platforms.unix; - knownVulnerabilities = [ - "CVE-2020-10809" - "CVE-2020-10810" - "CVE-2020-10811" - "CVE-2020-10812" - ]; }; } diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 39c0b680b0022..89702cfd1a7f1 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -27,7 +27,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.3"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; + sha256 = "sha256-lCXyJO110SgLtG1vJpI92Tj5BA5+rr9X5m7HNXwI+Rc="; }; passthru = { diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/tools/misc/hex/default.nix index 618fbe1dda60f..c903404d0bf1c 100644 --- a/pkgs/tools/misc/hex/default.nix +++ b/pkgs/tools/misc/hex/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "hex"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "sitkevij"; repo = "hex"; rev = "v${version}"; - hash = "sha256-mxKjiciejnOTbSkCzOWdAtysRAnEv4JgntPS1qM9og8="; + hash = "sha256-0LUT86mtqkscTfWNj2WHdMUizq0UQMCqXqTE0HRUItc="; }; - cargoHash = "sha256-kGe6XN03V+ILnlAcT0E8BvrYMa7ub05STFsFY6X5Gkk="; + cargoHash = "sha256-BDDAKr6F9KtZGKX6FjasnO8oneZp0cy0M9r0tyqxL+o="; passthru.tests.version = testers.testVersion { package = hex; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index f7c096249b0f8..9bbc98e729c46 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -74,7 +74,7 @@ let ]; license = if enableUnfree then licenses.elastic20 else licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; + maintainers = with maintainers; [ offline basvandijk ]; }; passthru.tests = lib.optionalAttrs (config.allowUnfree && enableUnfree) ( diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index e097ab12f082e..867e492b33e27 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-transform-name=s/^l//" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int"; + meta = with lib; { homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index b396de5002d95..c8ce33207787a 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; buildInputs = [ boehmgc ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = { homepage = "https://github.com/rrthomas/mmv"; description = "Utility for wildcard renaming, copying, etc"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index d838181a9c766..6bcbd8a9ac410 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.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-Wj7zKszVtaTwcIoTtjHasShEnSDoiZ53Gnz38Ci31Hs="; + hash = "sha256-zF+Hnsmw5TJCYYoItrwcnyh3NSmKrV9JoTPwTMVyw7Y="; }; vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 2df98d5a00b36..0f0d92c59fa00 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.7.5"; + version = "100.9.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-7osM21fLDwO5eFv+28hbkzmqFCVbmI7vOria5vbnrP0="; + sha256 = "sha256-c+pzpDUDx6xqpELLM32z0T5mGlF0qk6wqyS1OU9NkRs="; }; vendorHash = null; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 51fd22b0c35e7..619858cbe3594 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,26 +1,109 @@ { lib , stdenv , fetchurl -, libibmad +, rdma-core , openssl , zlib +, xz +, expat +, boost +, curl +, pkg-config +, libxml2 +, pciutils +, busybox +, python3 +, automake +, autoconf +, libtool +, git +# use this to shrink the package's footprint if necessary (e.g. for hardened appliances) +, onlyFirmwareUpdater ? false +# contains binary-only libraries +, enableDPA ? true }: stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.17.0-1"; + version = "4.26.0-1"; src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; - sha256 = "030vpiv44sxmjf0dng91ziq1cggwj33yp0l4xc6cdhnrv2prjs7y"; + hash = "sha256-P8XACcz6d8UTOhFFeTijfFOthBqnUghGlDj9K145sZ8="; }; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + libxml2 + git + ]; + buildInputs = [ - libibmad - openssl + rdma-core zlib + libxml2 + openssl + ] ++ lib.optionals (!onlyFirmwareUpdater) [ + boost + curl + expat + xz + python3 + ]; + + preConfigure = '' + export CPPFLAGS="-I$(pwd)/tools_layouts -isystem ${libxml2.dev}/include/libxml2" + export INSTALL_BASEDIR=$out + ./autogen.sh + ''; + + # Cannot use wrapProgram since the python script's logic depends on the + # filename and will get messed up if the executable is named ".xyz-wrapped". + # That is why the python executable and runtime dependencies are injected + # this way. + # + # Remove host_cpu replacement again (see https://github.com/Mellanox/mstflint/pull/865), + # needs to hit master or a release. master_devel may be rebased. + # + # Remove patch for regex check, after https://github.com/Mellanox/mstflint/pull/871 + # got merged. + prePatch = [ + '' + patchShebangs eval_git_sha.sh + substituteInPlace configure.ac \ + --replace "build_cpu" "host_cpu" + substituteInPlace common/compatibility.h \ + --replace "#define ROOT_PATH \"/\"" "#define ROOT_PATH \"$out/\"" + substituteInPlace configure.ac \ + --replace 'Whether to use GNU C regex])' 'Whether to use GNU C regex])],[AC_MSG_RESULT([yes])' + '' + (lib.optionals (!onlyFirmwareUpdater) '' + substituteInPlace common/python_wrapper.sh \ + --replace \ + 'exec $PYTHON_EXEC $SCRIPT_PATH "$@"' \ + 'export PATH=$PATH:${lib.makeBinPath [ (placeholder "out") pciutils busybox]}; exec ${python3}/bin/python3 $SCRIPT_PATH "$@"' + '') ]; + configureFlags = [ + "--enable-xml2" + "--datarootdir=${placeholder "out"}/share" + ] ++ lib.optionals (!onlyFirmwareUpdater) [ + "--enable-adb-generic-tools" + "--enable-cs" + "--enable-dc" + "--enable-fw-mgr" + "--enable-inband" + "--enable-rdmem" + ] ++ lib.optionals enableDPA [ + "--enable-dpa" + ]; + + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; dontDisableStatic = true; # the build fails without this. should probably be reported upstream @@ -29,6 +112,7 @@ stdenv.mkDerivation rec { description = "Open source version of Mellanox Firmware Tools (MFT)"; homepage = "https://github.com/Mellanox/mstflint"; license = with licenses; [ gpl2 bsd2 ]; + maintainers = with maintainers; [ thillux ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 75e5340c2613b..647991b412a23 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.1.1"; + version = "7.1.2"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-qQc7FqpkAri/RE1hJIC4P6n1Jc6TJwBcR0Dp5n5QDQg="; + sha256 = "sha256-00NZI/KFcgEAkvESnx0KQFW1GvX6FgZLA4Z1Fv2qi+E="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 76a8e4a3c9338..2ee18cb3da1c0 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - hash = "sha256-cL/vvwwFH3ztQUVqjZmO2nPmqCyuFMPCtMcRwNvEfNc="; + hash = "sha256-YO6nf1tY+tEgPlvq7JDgeG0ywE8+HEpZH7ToFzvYfvY="; }; - vendorHash = "sha256-nCzBWANnNAwUw17EPs0G9ezpKJG+Ix1E7IhdvxFe3Xc="; + vendorHash = "sha256-Gvk/EI5b6AIYBCKYqSFKva0SfiWI/oNCeq7cTyVRpwY="; ui = buildNpmPackage { inherit src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-qDpCI65r3S9WMEmYQeyY2KRpLnP6oxEL6rrhj0MGeWk="; + npmDepsHash = "sha256-G2yEIiKc/gxcUPS+97B68C/HukabGZAX2XY1gstGBvg="; prePatch = '' cd web/ diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 1f15f217eca2b..8e00ef627691e 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -97,6 +97,6 @@ in python.pkgs.buildPythonApplication rec { description = "A utility for sending notifications, on demand and when commands finish"; homepage = "http://ntfy.rtfd.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ jfrankenau kamilchm ]; + maintainers = with maintainers; [ kamilchm ]; }; } diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index b38cb81748a65..5d15b7077385b 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -4,7 +4,7 @@ coreutils, # mktemp grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev -udev, # udevadm udevinfo +systemd, # udevadm ntfs3g, # ntfs3g dmraid, # dmraid lvm2 # lvs @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do wrapProgram $file \ - --suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ + --suffix PATH : ${lib.makeBinPath [ grub2 systemd coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" done; ''; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index b6c971dd3c2ef..aa0d86253d77a 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/caryll/otfcc"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ jfrankenau ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index c5419b27fece3..079e6704c6875 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , python3 }: - stdenv.mkDerivation rec { version = "1.5"; pname = "pastebinit"; @@ -21,11 +21,9 @@ stdenv.mkDerivation rec { patches = [ # Required to allow pastebinit 1.5 to run on Python 3.8 - (fetchpatch { - name = "use-distro-module.patch"; - url = "https://bazaar.launchpad.net/~arnouten/pastebinit/python38/diff/264?context=3"; - sha256 = "1gp5inp4xald65xbb7fc5aqq5s2fhw464niwjjja9anqyp3zhawj"; - }) + ./use-distro-module.patch + # Required to remove the deprecation warning of FancyURLopener + ./use-urllib-request.patch # Required because pastebin.com now redirects http requests to https (fetchpatch { name = "pastebin-com-https.patch"; @@ -47,6 +45,6 @@ stdenv.mkDerivation rec { description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ raboof ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/tools/misc/pastebinit/use-distro-module.patch b/pkgs/tools/misc/pastebinit/use-distro-module.patch new file mode 100644 index 0000000000000..0e5dbf7860ae1 --- /dev/null +++ b/pkgs/tools/misc/pastebinit/use-distro-module.patch @@ -0,0 +1,14 @@ +=== modified file 'pastebinit' +--- pastebinit 2018-07-04 00:46:08 +0000 ++++ pastebinit 2020-11-13 14:21:11 +0000 +@@ -38,8 +38,8 @@ + + # Now try to override it with a distributor pastebin + try: +- import platform +- release = platform.linux_distribution()[0].lower() ++ import distro ++ release = distro.id() + if release == 'debian': + defaultPB = "paste.debian.net" + elif release == 'fedora': diff --git a/pkgs/tools/misc/pastebinit/use-urllib-request.patch b/pkgs/tools/misc/pastebinit/use-urllib-request.patch new file mode 100644 index 0000000000000..f379fd0651dbd --- /dev/null +++ b/pkgs/tools/misc/pastebinit/use-urllib-request.patch @@ -0,0 +1,66 @@ +=== modified file 'pastebinit' +--- pastebinit 2018-07-04 00:46:08 +0000 ++++ pastebinit 2020-11-13 14:21:11 +0000 +@@ -23,15 +23,9 @@ + from __future__ import print_function + + import sys +-if sys.version[0] == "2": +- from ConfigParser import NoOptionError +- from ConfigParser import SafeConfigParser as ConfigParser +- from urllib import urlencode +- from urllib import FancyURLopener +-else: +- from configparser import ConfigParser, NoOptionError +- from urllib.parse import urlencode +- from urllib.request import FancyURLopener ++from configparser import ConfigParser, NoOptionError ++from urllib.parse import urlencode ++from urllib.request import urlopen, Request + + # Set the default pastebin + defaultPB = "pastebin.com" +@@ -72,13 +66,6 @@ try: + version = "1.5" + configfile = os.path.expanduser("~/.pastebinit.xml") + +- # Custom urlopener to handle 401's +- class pasteURLopener(FancyURLopener): +- version = "Pastebinit v%s" % version +- +- def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): +- return None +- + def preloadPastebins(): + # Check several places for config files: + # - global config in /etc/pastebin.d +@@ -410,12 +397,18 @@ try: + else: + post_format = 'standard' + +- url_opener = pasteURLopener() ++ request = Request( ++ fetch_url, ++ method="POST", ++ headers={ ++ 'User-Agent': "Pastebinit v%s" % version ++ } ++ ) + + if post_format == 'json': + if json: + params = json.dumps(params) +- url_opener.addheader('Content-type', 'text/json') ++ request.add_header('Content-type', 'text/json') + else: + print(_("Could not find any json library."), file=sys.stderr) + sys.exit(1) +@@ -428,7 +421,7 @@ try: + print("POSTing to: %s\nParams: %s" % ( + fetch_url, str(params)), file=sys.stderr) + try: +- page = url_opener.open(fetch_url, params) ++ page = urlopen(request, params.encode("utf-8")) + except Exception as e: + print(_("Failed to contact the server: %s") % e, file=sys.stderr) + sys.exit(1) diff --git a/pkgs/tools/misc/pb/default.nix b/pkgs/tools/misc/pb/default.nix index dfe4d7e291afd..1cbe8eded5cbe 100644 --- a/pkgs/tools/misc/pb/default.nix +++ b/pkgs/tools/misc/pb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pb"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "parseablehq"; repo = pname; rev = "v${version}"; - hash = "sha256-jnMGBwwsQJnbvTTLxhpwORQ5m8xZxLA0PQVhW/MjMto="; + hash = "sha256-ckRvtEtagyYpXJ0hh8jsgpE/16bu7b9IdNn2stvb2iI="; }; - vendorHash = "sha256-jC3P0b8fLZbL1hyWTnA/w3Uk4uqWSxpWDs6nQv55/0c="; + vendorHash = "sha256-dNSr0bQz7XdC2fTD82TI8tfmwKBuAcbxjaMC9KAjxlI="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index ed1646c04f824..b335f644312ab 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -1,4 +1,4 @@ -{ buildPerlPackage, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS +{ buildPerlPackage, shortenPerlShebang, stdenv, lib, fetchFromGitHub, which, bzip2, PodMarkdown, JSONXS , TextCSV_XS }: buildPerlPackage rec { pname = "pgbadger"; @@ -14,11 +14,19 @@ buildPerlPackage rec { patchShebangs ./pgbadger ''; + # pgbadger has too many `-Idir` flags on its shebang line on Darwin, + # causing the build to fail when trying to generate the documentation. + # Rewrite the -I flags in `use lib` form. + preBuild = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang ./pgbadger + ''; + outputs = [ "out" ]; PERL_MM_OPT = "INSTALL_BASE=${placeholder "out"}"; buildInputs = [ PodMarkdown JSONXS TextCSV_XS ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; nativeCheckInputs = [ which bzip2 ]; @@ -28,6 +36,5 @@ buildPerlPackage rec { changelog = "https://github.com/darold/pgbadger/raw/v${version}/ChangeLog"; license = lib.licenses.postgresql; maintainers = lib.teams.determinatesystems.members; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/pgbadger.x86_64-darwin }; } diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index 826d77815bc3d..dc8e545a7d8e4 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ python3 ]; + checkFlags = [ + # tests are failing upstream + "--skip=test_dot" + "--skip=test_dotdot" + ]; + preCheck = '' patchShebangs tests/editors/env-editor.py ''; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 039e9acb2e8e9..dc7fe1627a1ce 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, nixosTests }: let version = "1.2023.12"; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/plantuml.war" ''; + passthru.tests = { + inherit (nixosTests) plantuml-server; + }; + meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index b5396f130f1da..4a87e5787bd29 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { A command-line download/upload tool for popular file sharing websites ''; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ aforemny jfrankenau ]; + maintainers = with lib.maintainers; [ aforemny ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index f14339e007f5a..e0da056c48c7b 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.8.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-VkWGVKLN8arc6BOivmjSk8MtMbp2WYqZE9lM8oTQe+U="; + sha256 = "sha256-nsGBBGw66LCwOuNdBjlz6u9RT+BX6iZmZeDY9yJoc+c="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index bd06fadee1ee1..6fa9c477af09b 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pv"; - version = "1.8.0"; + version = "1.8.5"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.gz"; - sha256 = "sha256-XOxPc3gmoO3atHHdO3Wlh70poufPowBo1X8pQ5olH98="; + sha256 = "sha256-0ilI0GvgalvjczYxjeVAoiFb4QqwFj+M0jogFJZHt4A="; }; meta = { diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 86043f7b0ba45..5c139d017c864 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -24,8 +24,8 @@ }: let pname = "qFlipper"; - version = "1.3.2"; - sha256 = "sha256-n/vvLR4p7ZmQC+FuYOvarmgydfYwxRBRktzs7CfiNQg="; + version = "1.3.3"; + sha256 = "sha256-/Xzy+OA0Nl/UlSkOOZW2YsOHdJvS/7X3Z3ITkPByAOc="; timestamp = "99999999999"; commit = "nix-${version}"; diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/tools/misc/ripdrag/default.nix index 3417382bab91c..b2288810d30e1 100644 --- a/pkgs/tools/misc/ripdrag/default.nix +++ b/pkgs/tools/misc/ripdrag/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ripdrag"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nik012003"; repo = "ripdrag"; rev = "v${version}"; - hash = "sha256-GWNu970nyD4E2mWghOtHnuvVYGhgZ87zNCNxSpxOsgQ="; + hash = "sha256-mU2S4DhS2KXO7uIMBhJvaTjLpkFCljyEVoPcq4b2jKc="; }; - cargoHash = "sha256-aN+25hhE6LhI8M+enyzsfSTARIxbY36mdeP70rjBJQ8="; + cargoHash = "sha256-PWFNLtEXIgZ0RheDS5j9/MMXgzFjgCJKMi/51Z2ta8I="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ec0f90a5c46d8..2d48edf2dfd24 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + meta = with lib; { description = "Readline wrapper for console programs"; homepage = "https://github.com/hanslub42/rlwrap"; diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/tools/misc/rshim-user-space/default.nix index 25550f45c4faa..a8bdd356a2cc7 100644 --- a/pkgs/tools/misc/rshim-user-space/default.nix +++ b/pkgs/tools/misc/rshim-user-space/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "Mellanox"; repo = pname; rev = "rshim-${version}"; - hash = "sha256-LbAs4IFfYT6OhrtwRXmuQR9rD7ulmmUB20Au5fO8j9w="; + hash = "sha256-jR9Q1i2p4weKuGPTAylNIVglgcZH0UtvXBVVCEquxu8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 6ceaa4508d8fc..f51b896159a4a 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.10.2"; + version = "2023.11.2"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-wp5+n8dSnCExxgnCHl0GhcWTu8J6nGBJnjzWmc7XJ3E="; + hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; }; - cargoHash = "sha256-Y/AUdg001/ezYHgOEt32go7DiIMLym9GyB88hG4NdKs="; + cargoHash = "sha256-KOte3zmJllrMp6OaKuFtUsRjdRKlSAxdJp1iJEOPcF0="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index aca6e18e372c8..5aa6adf768a2a 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec { description = "Smart Automatic Cover Art Downloader"; homepage = "https://github.com/desbma/sacad"; license = licenses.mpl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index f6b372d926498..0f93551965e23 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -114,7 +114,5 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = platforms.unix; - # "Couldn't find any versions for \"node-gyp\" that matches \"latest\" in our cache (possible versions are \"\") - broken = true; }; } diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/tools/misc/shim/default.nix index 1615a6d8c794a..0989a37454ca7 100644 --- a/pkgs/tools/misc/shim/default.nix +++ b/pkgs/tools/misc/shim/default.nix @@ -3,7 +3,7 @@ let - inherit (stdenv.targetPlatform) system; + inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; target = { diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index 4478cb4bcb611..26b4fa724b48a 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ ]; mainProgram = "tab"; + broken = (stdenv.isDarwin && stdenv.isAarch64); # Added 2023-11-13 }; } diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index 7d9693e41d69b..f6360061a5be7 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; - rev = "refs/tags/${version}"; - hash = "sha256-NGPwdTkgzowdchUjuoJ9iVrkmAjXvyijHmUfb5cAUKY="; + rev = version; + hash = "sha256-WsQpMmFTlAPg+9uEecMKfpys29cQ642IZ8yvsPxmCfo="; }; - cargoHash = "sha256-Pi8JiToF56a6zaUpGTAF6Bw8W8elSzLQimfMDua83Nk="; + cargoHash = "sha256-sttQ8fGRGdq7nDiG3/z/YEg2NA+miTwahGNv3yNnnds="; meta = with lib; { description = "A log file highlighter"; diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/tools/misc/taoup/default.nix index 3924625f1313c..4d991a88cf114 100644 --- a/pkgs/tools/misc/taoup/default.nix +++ b/pkgs/tools/misc/taoup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "taoup"; - version = "1.1.19"; + version = "1.21"; src = fetchFromGitHub { owner = "globalcitizen"; repo = pname; rev = "v${version}"; - hash = "sha256-axMpQICvxWBlNJ5D06DYI7b4zFGeadfWFcpTN6lPvpg="; + hash = "sha256-UHo3c+DQn77CJONy/QXM55rpIdhVkJbhR82tqmUltPQ="; }; buildInputs = [ rubyEnv bash ncurses ]; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 8c3f840a6e225..f9f334fb1036d 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.70.2"; + version = "1.71.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-LSICkg99veFHLmdcQZmnyfTbdqx7k2XI13W7Cjuj3qA="; + hash = "sha256-cV5t4gNhPODGzJoLZdft6/9gBBVio50BJKYEI24a8qg="; }; - vendorHash = "sha256-84h+LQzk/xy/Gapy7IxB8IPvsVGRsJP7udd9HhLskew="; + vendorHash = "sha256-1w1pQyHTuEJ1w01lJIZhXuEArFigjoFKGvi0cpFd8m0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index a136031dfc137..3778048143be3 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "sha256-COnqzWqah1J/q64XrOBhMOsrafAs/BptqNvrjHJ9edQ="; + sha256 = "sha256-lZLjTmSKxGJhUMELcIPjycpuRR3m9oz/Vh1/FEUzMOQ="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/turbo/default.nix b/pkgs/tools/misc/turbo/default.nix index 50192d6166764..f1216c1fa190c 100644 --- a/pkgs/tools/misc/turbo/default.nix +++ b/pkgs/tools/misc/turbo/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, buildGoModule +, buildGo120Module , git , nodejs , protobuf @@ -25,7 +25,7 @@ , CoreFoundation }: let - version = "1.10.13"; + version = "1.10.16"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; @@ -38,7 +38,7 @@ let inherit src version; cargoBuildFlags = [ "--package" "turborepo-ffi" ]; - cargoHash = "sha256-CIKuW8qKJiqgDBPfuCIBcWUP41BHwAa1m9vmcQ9ZmAY="; + cargoHash = "sha256-Mj46yNOYTqt732d7SJ3sAeXbgDkoh7o7S23lKVgpvKY="; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ @@ -59,7 +59,7 @@ let }; - go-turbo = buildGoModule { + go-turbo = buildGo120Module { inherit src version; pname = "go-turbo"; modRoot = "cli"; @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage { ]; RELEASE_TURBO_CLI = "true"; - cargoHash = "sha256-rKdonANA6WvXPMpK8sC95hsX9Yb5zedeBezY4LWzsZE="; + cargoHash = "sha256-F+mEDkP7GismosXj+ICJCE4SHhCpWK7FiSyqjJM6LJ4="; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index c40fbc7a01b8a..aae9daddae9e8 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.0.21"; + version = "2.1.0"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-KZh15M1dRV7oN5Qrg8q+PV3ZHCdNHF2wOUnGq+VLGYI="; + hash = "sha256-BH4oka2Ht4fGMD6/xy/MLBXNkJRggs4VQVG0UqmYQoI="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index c3cb420f5fea8..d5b347bb41551 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -9864,7 +9864,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.34.0" +version = "0.34.1" dependencies = [ "apache-avro", "approx", diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 7c4afb16ebca7..ddd6e32e16d44 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -27,14 +27,14 @@ # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] - ++ lib.optional stdenv.targetPlatform.isUnix "unix") + ++ lib.optional stdenv.hostPlatform.isUnix "unix") , nixosTests , nix-update-script }: let pname = "vector"; - version = "0.34.0"; + version = "0.34.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -43,9 +43,11 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-E9sbpVFDVKJKYqSiqXeC9AItset/bXvVA9mURazTn/I="; + hash = "sha256-vK+k+VbUVgJ8idlvuod5ExAkkeTYDk/135dyLRct0zs="; }; + patches = [ ./vector-pr19075.patch ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/tools/misc/vector/vector-pr19075.patch b/pkgs/tools/misc/vector/vector-pr19075.patch new file mode 100644 index 0000000000000..96ab75edef37e --- /dev/null +++ b/pkgs/tools/misc/vector/vector-pr19075.patch @@ -0,0 +1,23 @@ +From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001 +From: Aaron Andersen <aaron@fosslib.net> +Date: Tue, 7 Nov 2023 09:05:26 -0500 +Subject: [PATCH] fix(config): rustc warnings + +--- + src/convert_config.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/convert_config.rs b/src/convert_config.rs +index f0a900cf421a0..d81b998c5ee1f 100644 +--- a/src/convert_config.rs ++++ b/src/convert_config.rs +@@ -157,8 +157,7 @@ fn walk_dir_and_convert( + let new_output_dir = if entry_path.is_dir() { + let last_component = entry_path + .file_name() +- .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")) +- .clone(); ++ .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")); + let new_dir = output_dir.join(last_component); + + if !new_dir.exists() { diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 52b561e579046..a0acfcf7f7d6f 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9w.1"; + version = "0.9.16"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-/EQ8+8ac1MnWuXL9aNYl5U2ZfTpd/iThyvXygorbPmM="; + sha256 = "sha256-nX7T3TAGgxAB65X8D2HlI+3T6p7aH3bwG3N1pScX/4g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 6d772a8ba5c38..2249ea83d1ab6 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.51"; + version = "1.0.52"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-SeUwd9S2WMGbNqj9NzZZKW1tQWc0cbe+uZmHc1PWKR8="; + hash = "sha256-6x2H+WY23XxBWmAqD2Lsc4TdCY76XiR/BhSU++XuIFY="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-G7pIy8KuDEEVVhH0WzY93eDhH2oTT9sP5CqTgfxYB0c="; + cargoHash = "sha256-1YnoHL+FKXhopcW0Scya22sRBwantRH9gF7w/rxU0H8="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/whatsapp-chat-exporter/default.nix b/pkgs/tools/misc/whatsapp-chat-exporter/default.nix index e6d2f7af0b7ba..9b2281d07a6f4 100644 --- a/pkgs/tools/misc/whatsapp-chat-exporter/default.nix +++ b/pkgs/tools/misc/whatsapp-chat-exporter/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "whatsapp-chat-exporter"; - version = "0.9.1"; + version = "0.9.7"; format = "setuptools"; src = fetchFromGitHub { owner = "KnugiHK"; repo = "Whatsapp-Chat-Exporter"; rev = "refs/tags/${version}"; - hash = "sha256-DvCYMfR9GgdP9rVpcoIR5nG9b4ToOBMG1a9OTvjfIiU="; + hash = "sha256-ySKZM7zmPKb+AHAK7IDpn07qinwz0YY8btb4KWGfy7w="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/wit-bindgen/default.nix b/pkgs/tools/misc/wit-bindgen/default.nix index 990b51e3bf808..5cedb1b899224 100644 --- a/pkgs/tools/misc/wit-bindgen/default.nix +++ b/pkgs/tools/misc/wit-bindgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "wit-bindgen-cli-${version}"; - hash = "sha256-IFMnuXHL8NVHxkV7oXM6WTE+LMZ2D4g1VdDv0J5V72A="; + hash = "sha256-yPmjlINQAXnzYtGVdNiJ/DEL4Xz2AtQxq5EXl5nWR08="; }; - cargoHash = "sha256-9aocnv4msQ2/aIvN1HymKSuBxrtwdR9i31e7thtMh/k="; + cargoHash = "sha256-wROV2erysHrHJdbAy74z04ZCdlGHoICX8tKzKj2cq3E="; # 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/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index fc87723208ede..eb1e7c5b01b79 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec { chmod a+x $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ - --set FONTCONFIG_FILE "${fontsConf}" \ + --set-default FONTCONFIG_FILE "${fontsConf}" \ --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index c39832be65611..c9c1caff8018c 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.10.13"; + version = "2023.11.16"; src = fetchPypi { inherit pname version; - hash = "sha256-4CbqHENf827vEhW8TFu4xHmTi5AFSZe6mfY6RUH+Y7Q="; + hash = "sha256-8Mza8S4IsVkCYBpGccerEpBtexHeOudfplBoEcJOxdo="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 6274dae69489c..624fa1d15d5df 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.39.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-ZKtYXUNuBwQtEHTaPlptiRncFWattkkcAGGzbKalJZE="; + hash = "sha256-nT4P/ZlquJz48T8LCRQd5menL8vtGMBSUgZNJYx0Pn4="; }; - cargoHash = "sha256-4XRCXQYJaYvnIfEK2b0VuLy/HIFrafLrK9BvZMnCKpY="; + cargoHash = "sha256-jp3FS+sEvQY0DtVPCkJjAZlEc2bJOiA20+Pdt//yat4="; nativeBuildInputs = [ mandown diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 6c972bb239714..094cc8733bdcd 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook , gnutls, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aria2"; - version = "1.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; + sha256 = "sha256-xbiNSg/Z+CA0x0DQfMNsWdA+TATyX6dCeW2Nf3L3Kfs="; }; strictDeps = true; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 7aeed0b339b41..e867f2f8ac8fa 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.14.1"; + version = "0.14.2"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-z4pBC/igKpwe1zJpOP8VqBOybtIq0wVaz+rfOwPzht4="; - aarch64-linux = "sha256-f3ofThBmBfV6Fr9FHfAsNz6w1Od0QM9fE8tFVB01PzM="; - x86_64-darwin = "sha256-iU/t35ibkTjgNV3E0xzdrMw63TKVzSlJjhZTxGzHSz0="; - aarch64-darwin = "sha256-213e3J2e9fvuoGPkeeKV46eWxR0nP+uh0f+INeZG738="; + x86_64-linux = "sha256-UR34PX3GChOTM4ROcvlghXOv4M8CYgiCvQaR/BRRvzs="; + aarch64-linux = "sha256-5q5Zz+/klgwbBvE40aMCw+ulv+g9Yhpcsn31PPCp9S4="; + x86_64-darwin = "sha256-NH1/QKqmaKGL35verE2sRXUwXePJoQk5kiUEIA5Xxn8="; + aarch64-darwin = "sha256-PpZ1dbT57+cdmLTvxo0/HY0lKoa+/N4cSfTNhbE6LLo="; }; in fetchzip { diff --git a/pkgs/tools/networking/configurable-http-proxy/default.nix b/pkgs/tools/networking/configurable-http-proxy/default.nix index 34cf5307038d9..74d009d3ed1a6 100644 --- a/pkgs/tools/networking/configurable-http-proxy/default.nix +++ b/pkgs/tools/networking/configurable-http-proxy/default.nix @@ -24,6 +24,5 @@ buildNpmPackage rec { homepage = "https://github.com/jupyterhub/configurable-http-proxy"; license = lib.licenses.bsd3; mainProgram = "configurable-http-proxy"; - maintainers = with lib.maintainers; [ ixxie ]; }; } diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 0a8b02af7cf5e..856a21cb9679b 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "containerlab"; - version = "0.46.2"; + version = "0.48.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-TzHTiAcN57FDdKBkZq5YwFwjP3s6OmN3431XGoMgnwI="; + hash = "sha256-k166J9algbbwGMG65Sr0sshwhLwo5M7JDtGnG4AKZJM="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-3ALEwpFDnbSoTm3bxHZmRGkw1DeQ4Ikl6PpTosa1S6E="; + vendorHash = "sha256-w5lwZTSG6OI85P/swjK3NtovMqfgttr9DC+CPSKlpKQ="; ldflags = [ "-s" @@ -41,6 +41,6 @@ buildGoModule rec { changelog = "https://github.com/srl-labs/containerlab/releases/tag/${src.rev}"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/tools/networking/crackle/default.nix index 00d0acd2aa94c..ea42e7a0b3208 100644 --- a/pkgs/tools/networking/crackle/default.nix +++ b/pkgs/tools/networking/crackle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Crack and decrypt BLE encryption"; homepage = "https://github.com/mikeryan/crackle"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.bsd2; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c99f09e7f93a0..48bf59e252661 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, perl, nixosTests +{ lib, stdenv, fetchurl, darwin, pkg-config, perl, nixosTests , brotliSupport ? false, brotli , c-aresSupport ? false, c-aresMinimal , gnutlsSupport ? false, gnutls @@ -57,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0="; }; - patches = [ - ./7.79.1-darwin-no-systemconfiguration.patch - ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; @@ -90,7 +86,12 @@ stdenv.mkDerivation (finalAttrs: { optional wolfsslSupport wolfssl ++ optional rustlsSupport rustls-ffi ++ optional zlibSupport zlib ++ - optional zstdSupport zstd; + optional zstdSupport zstd ++ + optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation + CoreServices + SystemConfiguration + ]); # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html preConfigure = '' diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index b503cc5785c03..8a40b290ae48b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -21,12 +21,12 @@ let owner = "DataDog"; repo = "datadog-agent"; goPackagePath = "github.com/${owner}/${repo}"; - version = "7.48.1"; + version = "7.49.0"; src = fetchFromGitHub { inherit owner repo; rev = version; - hash = "sha256-3PFplTR/L2xJjQ5GEz2ow28SEHWafOmiLjIQHQqAaso="; + hash = "sha256-0/9Yngfnbq73ZWsHHF3yDNGBB+u4X9SKbv+lJdv0J/w="; }; rtloader = stdenv.mkDerivation { pname = "datadog-agent-rtloader"; @@ -43,7 +43,7 @@ in buildGoModule rec { doCheck = false; - vendorHash = "sha256-o7CTw7IIS5xueW20O1wKDV1Yji7PhGhp+6+i2ymKhxE="; + vendorHash = "sha256-oBqH5sbT1+dLnAfouh4Vyds3M5pw5Z7u8XGGBTXflS0="; subPackages = [ "cmd/agent" diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index b23753e204126..43d2124d682b3 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, nettle -, libidn, libnetfilter_conntrack, buildPackages +, libidn, libnetfilter_conntrack, nftables, buildPackages , dbusSupport ? stdenv.isLinux , dbus , nixosTests @@ -13,6 +13,7 @@ let "-DHAVE_DBUS" ] ++ lib.optionals stdenv.isLinux [ "-DHAVE_CONNTRACK" + "-DHAVE_NFTSET" ]); in stdenv.mkDerivation rec { @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] ++ lib.optionals dbusSupport [ dbus ] - ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack ]; + ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack nftables ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index e37ecc3578e4c..b603c9a25c791 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -18,11 +18,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-nsxv/mepd9HtJ5EHu9q3kNc64qYmvDju4j+h9nhqdZ4="; + hash = "sha256-gbrL9Q7G0Pfsqq18A+WZeLADIvva1u1KmJ3TF1S28l0="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/tools/networking/hp2p/default.nix index 52f3455ed4d5a..9e2b5d639049c 100644 --- a/pkgs/tools/networking/hp2p/default.nix +++ b/pkgs/tools/networking/hp2p/default.nix @@ -2,20 +2,19 @@ stdenv.mkDerivation rec { pname = "hp2p"; - version = "3.3"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "cea-hpc"; repo = "hp2p"; - rev = version; - sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + rev = "711f6cc5b4e552d969c2436ad77afd35d31bfd05"; + sha256 = "sha256-mBTJZb3DPmIlL7N+PfjlWmBw0WfFF2DesImVZlbDQKc="; }; - patches = [ ./python3.patch ]; enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; - buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; - pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + buildInputs = [ mpi ] ++ (with python3Packages; [ python plotly ]) ; + pythonPath = (with python3Packages; [ plotly ]) ; preConfigure = '' patchShebangs autogen.sh diff --git a/pkgs/tools/networking/hp2p/python3.patch b/pkgs/tools/networking/hp2p/python3.patch deleted file mode 100644 index 13043d9f09f11..0000000000000 --- a/pkgs/tools/networking/hp2p/python3.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -u -r source.orig/src/vizhp2p source/src/vizhp2p ---- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 -@@ -94,25 +94,25 @@ - with open(hostfile) as fd: - for line in fd: - if line.startswith(motif_rank): -- print line -+ print(line) - c,v = line[len(motif_rank)+1:-1].split(separator) - nodes[c] = v - - # display k worst nodes indices -- print "\nTop %d bad mean:" % k -+ print("\nTop %d bad mean:" % k) - mean_order = np.argsort(a_mean) -- print [nodes[str(c)] for c in mean_order[:k]] -+ print([nodes[str(c)] for c in mean_order[:k]]) - mean_st = "Top nodes with bad mean:\n" - for i in range(0, k, hostname_per_line): - mean_st += repr([nodes[str(c)] for c - in mean_order[i:i + hostname_per_line]]) + "\n" - -- print "Top %d bad std:" % k -- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] -+ print("Top %d bad std:" % k) -+ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) - -- print "Top %d bad mean/std:" % k -+ print("Top %d bad mean/std:" % k) - pen_order = np.argsort(a_mean / a_std) -- print [nodes[str(c)] for c in pen_order[:k]] -+ print([nodes[str(c)] for c in pen_order[:k]]) - pen_st = "Top nodes with bad mean/std:\n" - for i in range(0, k, hostname_per_line): - pen_st += repr([nodes[str(c)] for c -@@ -293,9 +293,9 @@ - # and 'p' (snapshot) - def onrefresh(event): - if event.key == 'r': -- print "refreshing...", -+ print("refreshing...", end=' ') - loop() -- print "ok" -+ print("ok") - elif event.key == 'q': - exit() - elif event.key == 'p': -@@ -303,9 +303,9 @@ - fig1.savefig(snapfile) - snapfile = outputname + "_snapshot_time.png" - fig2.savefig(snapfile) -- print 'snapshot saved (%s)' % snapfile -+ print('snapshot saved (%s)' % snapfile) - else: -- print "The answer to %s is 42." % event.key -+ print("The answer to %s is 42." % event.key) - - - if __name__ == "__main__": -@@ -356,11 +356,11 @@ - countfile = outputname + ".count.bin" - - print("visu_hp2p configuration:") -- print(" DATAFILE : %s"%resfile) -- print(" BIN_TIMER_FILE : %s"%resfile_time) -- print(" HOSTFILE : %s"%hostfile) -- print(" Bad nodes to display: %d"%k) -- print(" GUI resolution : %s"%resolution) -+ print((" DATAFILE : %s"%resfile)) -+ print((" BIN_TIMER_FILE : %s"%resfile_time)) -+ print((" HOSTFILE : %s"%hostfile)) -+ print((" Bad nodes to display: %d"%k)) -+ print((" GUI resolution : %s"%resolution)) - - hostname_per_line = 4 # for GUI layout - refresh_in_sec = 60 -@@ -377,7 +377,7 @@ - # wait for resfile - while not os.path.exists(resfile) : - time.sleep(5) -- print "Waiting for input files..." -+ print("Waiting for input files...") - - # add callback on key press event - cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) -Only in source/src: vizhp2p.bak -diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html ---- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 -+++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 -@@ -118,7 +118,7 @@ - hostfile = args.hostfile - clustername = args.clustername - if len(args.OutputName) == 0: -- print "No DATAFILE given! Please provide Hp2p output files name !" -+ print("No DATAFILE given! Please provide Hp2p output files name !") - exit(0) - else: - outputname = args.OutputName.split('.')[0] -@@ -134,13 +134,13 @@ - else: - outfile = args.outfile - -- print "%s configuration:"%commandname -- print " DATAFILE : %s"%resfile -- print " HOSTFILE : %s"%hostfile -- print " CLUSTER : %s"%clustername -- print " OUTPUTFILE : %s"%outfile -+ print("%s configuration:"%commandname) -+ print(" DATAFILE : %s"%resfile) -+ print(" HOSTFILE : %s"%hostfile) -+ print(" CLUSTER : %s"%clustername) -+ print(" OUTPUTFILE : %s"%outfile) - if not os.path.exists(resfile): -- print "%s doesn't exist...Exiting"%resfile -+ print("%s doesn't exist...Exiting"%resfile) - exit(0) - - # Data management -Only in source/src: vizhp2p_html.bak diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index e4eb2eeaac41f..9b1723a4d122a 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl /* for `whois' */ ]; buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; + env = lib.optionalAttrs stdenv.isDarwin { + # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. + # A commit to revert this change will be included in the fix PR targeting staging. + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # Don't use help2man if cross-compiling # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index aaa26a38c3ae4..637214809d41e 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.isDarwin "format"; + env = lib.optionalAttrs stdenv.isDarwin { + # Required to build with clang 16 or `configure` will fail to detect several standard functions. + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + configureFlags = [ "--with-openssl" "--with-readline=${readline.dev}" diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/tools/networking/mdk4/default.nix index 903504633ac8f..979584db432d7 100644 --- a/pkgs/tools/networking/mdk4/default.nix +++ b/pkgs/tools/networking/mdk4/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A tool that injects data into wireless networks"; homepage = "https://github.com/aircrack-ng/mdk4"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index a968191b05f18..20f5d52ff6888 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -18,7 +18,7 @@ , gobject-introspection , python3 , gtk3 -, libappindicator-gtk3 +, libayatana-appindicator , glib }: @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { jansson glib glib-networking - libappindicator-gtk3 + libayatana-appindicator gnome.adwaita-icon-theme ]; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 9f928224ca7eb..5490977df12d0 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.44.0"; + version = "1.44.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-7coJY30YL4BrOxLYxWI9e629c8zKGuY74g0vKYd5+58="; + sha256 = "sha256-S1i/OsV+LO+1ZS79CUXrC0vDamPZKmGrRx2LssmkIOE="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index 75a00531f2b7e..ef2b4e3d235d8 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/3iiMKzJiBb/ngrok-v3-3.3.4-linux-386", - "sha256": "e46b1bfa8afe28b2c5a7630773ab2d8fc1c91ac42e262356c1cec1197e754419", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", + "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", + "version": "3.4.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/99d4KobYYHN/ngrok-v3-3.3.4-linux-amd64", - "sha256": "11536e5a001de5efa9a6d9d6f33b0ed2dc653216278fe0314f9ca98c20137a7f", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", + "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", + "version": "3.4.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/2VZGKNPHQqs/ngrok-v3-3.3.4-linux-arm", - "sha256": "08d7b27407005c9a34a850090527c1398e86a1a2fa090aea2caee40cb18902fe", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", + "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", + "version": "3.4.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/2XmLxPHmx2B/ngrok-v3-3.3.4-linux-arm64", - "sha256": "1e12cedb3378d25012c3cd94f960123b4d8b99301d52ad9c30df9e698ed1fa2d", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", + "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", + "version": "3.4.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/mos87CnnNu3/ngrok-v3-3.3.4-darwin-amd64", - "sha256": "700311045d531f603a5f472c7e4b8271810ac75e368c65430a62f5e178abe9dc", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", + "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", + "version": "3.4.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/ngMbyRxxdNN/ngrok-v3-3.3.4-darwin-arm64", - "sha256": "e609d3d78d004ec4f795581cba35f38ba43e7b0b5ae1cd80aa21650402e531d0", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", + "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", + "version": "3.4.0" } } diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix index c3fdd57a592e4..e76cc4544e329 100644 --- a/pkgs/tools/networking/norouter/default.nix +++ b/pkgs/tools/networking/norouter/default.nix @@ -31,7 +31,5 @@ buildGoModule rec { homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; maintainers = with maintainers; [ blaggacao ]; - # out is empty - broken = true; }; } diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 3fd3bc49c9168..03028ca580a18 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.6.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eC0EiBD0FQ/Ucvjh5q1htZLVmpzzOzKAVmHW6/Krc0Q="; + sha256 = "sha256-QZEDp+XCc3ZWQ1UTlMUpdvJCbuO6VCYnJj1Jj9o+Ovs="; }; - cargoSha256 = "sha256-AmFDi5l55tJ3yZwTH4DyxOsium8WoSW7JVmn1L+lRpU="; + cargoSha256 = "sha256-JEbsAJ9NbWw03qYUQqLx7sA04Xq990zdBuludVbxoIg="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/tools/networking/opendrop/default.nix b/pkgs/tools/networking/opendrop/default.nix index 6a89372151057..a617eadfc410f 100644 --- a/pkgs/tools/networking/opendrop/default.nix +++ b/pkgs/tools/networking/opendrop/default.nix @@ -1,24 +1,37 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub , fleep +, ifaddr , libarchive-c , pillow , requests-toolbelt , setuptools -, zeroconf }: +, zeroconf +, pytestCheckHook +, openssl +}: buildPythonApplication rec { pname = "opendrop"; version = "0.13.0"; + format = "setuptools"; - src = fetchPypi { - inherit version pname; - sha256 = "sha256-FE1oGpL6C9iBhI8Zj71Pm9qkObJvSeU2gaBZwK1bTQc="; + src = fetchFromGitHub { + owner = "seemoo-lab"; + repo = "opendrop"; + rev = "v${version}"; + hash = "sha256-4FeVQO7Z6t9mjIgesdjKx4Mi+Ro5EVGJpEFjCvB2SlA="; }; + nativeBuildInputs = [ + # Tests fail if I put it on buildInputs + openssl + ]; + propagatedBuildInputs = [ fleep + ifaddr libarchive-c pillow requests-toolbelt @@ -26,16 +39,26 @@ buildPythonApplication rec { zeroconf ]; - # There are tests, but getting the following error: - # nix_run_setup: error: argument action: invalid choice: 'test' (choose from 'receive', 'find', 'send') - # Opendrop works as intended though - doCheck = false; + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath nativeBuildInputs}" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Solves PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; meta = with lib; { description = "An open Apple AirDrop implementation written in Python"; homepage = "https://owlink.org/"; + changelog = "https://github.com/seemoo-lab/opendrop/releases/tag/${src.rev}"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "opendrop"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix index 8e799b7d41fd3..a4ba12b29489d 100644 --- a/pkgs/tools/networking/redfang/default.nix +++ b/pkgs/tools/networking/redfang/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A small proof-of-concept application to find non discoverable bluetooth devices"; homepage = "https://gitlab.com/kalilinux/packages/redfang"; license = licenses.gpl2Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 9467904fe6983..60240094b4366 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nixosTests , rustPlatform -, targetPlatform +, hostPlatform , installShellFiles , cmake , libsodium @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rosenpass"; - version = "unstable-2023-09-28"; + version = "0.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "b15f17133f8b5c3c5175b4cfd4fc10039a4e203f"; - hash = "sha256-UXAkmt4VY0irLK2k4t6SW+SEodFE3CbX5cFbsPG0ZCo="; + rev = "v${version}"; + hash = "sha256-t5AeJqeV16KCUoBm1GUzj/U6q382CRCR/XG6B2MiBU4="; }; - cargoHash = "sha256-N1DQHkgKgkDQ6DbgQJlpZkZ7AMTqX3P8R/cWr14jK2I="; + cargoHash = "sha256-caYJP3SNpZxtV9y3D62CuzJ5RjMoq98D9W0Fms5E3Nc="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString targetPlatform.isAarch64 '' + preBuild = lib.optionalString hostPlatform.isAarch64 '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 93f1e64171689..0d75f874a1987 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.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-qwXBuU/hajWvR+VqMnOUGLDuTuLjbazSPjQ5jvVImJM="; + hash = "sha256-djbRt4VdrZ2a0yLbNaFNhKIN0AwuCCJATIcwFhnw5aM="; }; - vendorHash = "sha256-2pGnpsgm4mvApvO1sMnRPTRS1unvpVPH9PGlr/S0KbY="; + vendorHash = "sha256-qoW9+t427k5Ea9BhAdWIh+utD7EnIU1OLKJfsmYlEt8="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index f51a6be9914d9..c4d26ae53d962 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.6.1"; + version = "2.7.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-3gLcSZv8GpEio+yvPyBVVceb1nO0HzhpQKhEgf4nQvU="; + sha256 = "sha256-vurNOJuu9bKmyLM3Agr8wHwMybLrtrJFSrlrc+lWiWQ="; }; - vendorHash = "sha256-MjxDB9fcPM6nIeGk6YvJOKXI/ThlMrxqJl9ROAREwXk="; + vendorHash = "sha256-Bjd3HIVEQgrcBffcZPQhQygN/ZOPWTbN9oimmX4B1oQ="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index c34aa7ab4c226..3fcbbf969e642 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.7.4.4"; + version = "1.8.0.0"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+9Qr0vDlSjr20BvfFThThKuC28Dk8aXhU7PgvhtjgKw="; + hash = "sha256-4d5oPdIu4OOmxrv/Jpq+GKsMnX62UCBPElFVuQBfrKc="; }; postPatch = '' diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 2a74445ec270d..f258a207db16d 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.7"; + version = "1.6.9"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7wUgmIScrj47QigIKHLMcvaJ/LTRHcMnJGKPBUTzVYo="; + hash = "sha256-VaaUFUkPXAMzT+wyLOrOw85sgJzWCYx5k6oTfRcIHuU="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index 8a71f6d99fd40..6c690fe4064e7 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -15,6 +15,6 @@ fetchFromGitHub { description = "Unified hosts file with base extensions"; homepage = "https://github.com/StevenBlack/hosts"; license = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 4030e3d14ec1a..cdde4191577d6 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.88"; + version = "1.0.89"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tLc+viPufR6P5texDs9lU8wsOTzrjSK0Qz/r4/L8M5k="; + sha256 = "sha256-sgflHkG4FncQ31+BwcZsp7LRgqeqANCIKGysxUk8aEs="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 34f1fd4833510..cbaeead5a4ba4 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.8.0"; + version = "5.11.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-fMAPlPn53GkYKpraRS58XTF//IMZtzssaQpBkirEWfw="; + hash = "sha256-wiAK3dzZ9TGYkt7MmBkYTD+Mi5BEid8sziDM1nI3Z80="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-un3faML5u9kmlsJw/hitoRcGYtVukF+V/dJMFyGhr8Q="; + vendorHash = "sha256-pC3KXx1KBvQx6eZZG1czaGjCOd0xAB42B5HmKn7p52c="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 9d87db3408ef5..63ca778c6db47 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-L+qHcC5SQPHiflTc4vYmVyME1KyfG9wug3fO7ib7Ffk="; + sha256 = "sha256-e3AGegW0V7JK6iLy0PaMwSeA9+2wSouzX5QIYUg8HCk="; }; - cargoSha256 = "sha256-W6fqZJcyKm5+4DFm+lFxIACw3nvQ6TK3sZJdIrkxjjw="; + cargoSha256 = "sha256-JE8SKxc7fKlK637NCZnTKkbF4GNrrvJQ/2kGxK4WXpg="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 9109b60eaa27f..f763c609aae80 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-k261Kg/TkMHviQxFVCDZXOIAYv4TbsCSfgI+K69Q9Uk="; + sha256 = "sha256-IZ1/JbviUkdxOAWrAswSJ5iYyHB0PBquPCsLGIIZGWA="; }; buildInputs = [ jre ]; diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 7420942a1c76a..7b49b4a26b973 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-c/MLhCmfoC5qbIH8psHqVexjKGb6P9vxMag7igFKt84="; - aarch64-linux = "sha256-CaZr0Izhwkdb6Hf3wRdOskoDg3m9LNgCPgfxka+ZwWo="; - armv7l-linux = "sha256-YVqm2tfcti5a6adN9Rn8X41nTTT5bajSJ0qIEvgk/8s="; + x86_64-linux = "sha256-6oYZY1Ry4U/nR99DNsr7ZqTd/AAot+yrOHY75UXEuWY="; + aarch64-linux = "sha256-/XAv/ptvUsWLF/iIOiqm/PoCLhVTL3Cnmd0YdqLBthk="; + armv7l-linux = "sha256-CbtzY2q7HnqCcolTFyTphWbHN/VdSt/rs8q3tjHHNqc="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.10"; + version = "0.4.15"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; diff --git a/pkgs/tools/nix/manix/default.nix b/pkgs/tools/nix/manix/default.nix index 6975e61fa6cb2..082f99f4de747 100644 --- a/pkgs/tools/nix/manix/default.nix +++ b/pkgs/tools/nix/manix/default.nix @@ -1,25 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: - +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, +}: rustPlatform.buildRustPackage rec { pname = "manix"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitHub { - owner = "mlvzk"; - repo = pname; - rev = "v${version}"; - sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; + repo = pname; + owner = "lecoqjacob"; + rev = "${version}"; + hash = "sha256-kTQbeOIGG1HmbsXKfXw5yCZ49kGufbGiCkkIRMTwcsg="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - - cargoSha256 = "1yivx9vzk2fvncvlkwq5v11hb9llr1zlcmy69y12q6xnd9rd8x1b"; + buildInputs = lib.optionals stdenv.isDarwin [Security]; + cargoSha256 = "sha256-7SHUi1qH9Dr4Oi7A6gRmZqhAIr8RzLNU1l1x4WGtQYI="; meta = with lib; { + license = [licenses.mpl20]; + platforms = platforms.unix; + homepage = "https://github.com/lecoqjacob/manix"; description = "A Fast Documentation Searcher for Nix"; - homepage = "https://github.com/mlvzk/manix"; - license = [ licenses.mpl20 ]; - maintainers = [ maintainers.mlvzk ]; - platforms = platforms.unix; + maintainers = [maintainers.lecoqjacob]; }; } diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 5aa2e3bd9cedd..f2c709a2e3127 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Serve NAR file contents via HTTP"; homepage = "https://github.com/numtide/nar-serve"; license = licenses.mit; - maintainers = with maintainers; [ rizary ]; + maintainers = with maintainers; [ rizary zimbatm ]; }; } diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index f7f6f4e04dbf6..183e7f019e628 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.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-QgKzpFdzisWD6DZxs1LsKINBr/bSYQILpEu5RdcNgbc="; + sha256 = "sha256-g1PBPpvK3kg0bJEDXsifVgcl3+v54q08Ae3nZ4cJ+Xs="; }; - cargoHash = "sha256-MztvOV1yAOgpwPYOUUZb7XHKhhhd/fvKPIFbsnMdhAQ="; + cargoHash = "sha256-E5SJfwGfy1DcLC0cF/5FTbVEJs/WYb2KO+OdOo2fgQk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec { description = "Generate documentation for Nix functions"; homepage = "https://github.com/nix-community/nixdoc"; license = [ licenses.gpl3 ]; - maintainers = [ maintainers.asymmetric ]; + maintainers = with maintainers; [ + infinisil + asymmetric + ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/tools/package-management/ciel/default.nix index 7ccd34c665dc1..d6040c4a07632 100644 --- a/pkgs/tools/package-management/ciel/default.nix +++ b/pkgs/tools/package-management/ciel/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { # FIXME: remove this patch after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged (fetchpatch { name = "use-canonicalize-path-to-find-libexec.patch"; - url = "https://github.com/AOSC-Dev/ciel-rs/pull/16.patch"; + url = "https://github.com/AOSC-Dev/ciel-rs/commit/17f41538ed1057e855540f5abef7faf6ea4abf5c.patch"; sha256 = "sha256-ELK2KpOuoBS774apomUIo8q1eXYs/FX895G7eBdgOQg="; }) ]; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 79bf6f8c5083f..59e259541992d 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.0"; + version = "1.22.1"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-q+kP0PuQyGKuKahA1/TwtJG380a/sNR433xZhxvGO9M="; + hash = "sha256-63XRO3Img+XS2F5Krb5DAw0LMhtxB+eJi754O03Lx8Q="; }; configureFlags = [ diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index 4760514bebe49..fd1ce1063245b 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-LzStxaqoez144LhqLjLP3yNgCj/HFqKSy+JcAW/FwM8="; + hash = "sha256-XtnK54HvZMKZGSCrVD0FO5PQLMo3Vkj8ezUlsfqStq0="; }; - cargoHash = "sha256-4DXIMsT69PhxqZX1j2aJ/XDLjvX76WbzEN0yxrnP9v0="; + cargoHash = "sha256-oQVHrfNPhslYk6APB/bhW+h+vk/gNTW/ZypoGGb5zPk="; nativeBuildInputs = [ pkg-config nix diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 755286ec87054..20d5c3105e97c 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda mic92 zowoq ]; + mainProgram = "nix-update"; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 798c7cc918d53..d61384ec10554 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub +{ lib +, fetchFromGitHub , version , suffix ? "" , hash ? null , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; } , patches ? [ ] +, maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ] }: assert (hash == null) -> (src != null); let @@ -27,6 +29,8 @@ in , callPackage , coreutils , curl +, docbook_xsl_ns +, docbook5 , editline , flex , gnutar @@ -37,6 +41,8 @@ in , libarchive , libcpuid , libsodium +, libxml2 +, libxslt , lowdown , mdbook , mdbook-linkcheck @@ -86,13 +92,17 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals atLeast24 [ autoconf-archive autoreconfHook bison flex jq - ] ++ lib.optionals (atLeast24 && enableDocumentation) [ + ] ++ lib.optionals (enableDocumentation && !atLeast24) [ + libxslt + libxml2 + docbook_xsl_ns + docbook5 + ] ++ lib.optionals (enableDocumentation && atLeast24) [ (lib.getBin lowdown) mdbook ] ++ lib.optionals (atLeast213 && enableDocumentation) [ @@ -111,13 +121,12 @@ self = stdenv.mkDerivation { openssl sqlite xz - ] ++ lib.optionals stdenv.isDarwin [ - Security - ] ++ lib.optionals atLeast24 [ gtest libarchive lowdown - ] ++ lib.optionals (atLeast24 && stdenv.isx86_64) [ + ] ++ lib.optionals stdenv.isDarwin [ + Security + ] ++ lib.optionals (stdenv.isx86_64) [ libcpuid ] ++ lib.optionals atLeast214 [ rapidcheck @@ -133,13 +142,6 @@ self = stdenv.mkDerivation { nlohmann_json ]; - NIX_LDFLAGS = lib.optionals (!atLeast24) [ - # https://github.com/NixOS/nix/commit/3e85c57a6cbf46d5f0fe8a89b368a43abd26daba - (lib.optionalString enableStatic "-lssl -lbrotlicommon -lssh2 -lz -lnghttp2 -lcrypto") - # https://github.com/NixOS/nix/commits/74b4737d8f0e1922ef5314a158271acf81cd79f8 - (lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic") - ]; - postPatch = '' patchShebangs --build tests ''; @@ -180,9 +182,6 @@ self = stdenv.mkDerivation { "--enable-gc" ] ++ lib.optionals (!enableDocumentation) [ "--disable-doc-gen" - ] ++ lib.optionals (!atLeast24) [ - # option was removed in 2.4 - "--disable-init-state" ] ++ lib.optionals atLeast214 [ "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" ] ++ lib.optionals stdenv.isLinux [ @@ -246,7 +245,7 @@ self = stdenv.mkDerivation { ''; homepage = "https://nixos.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco lovesegfault artturin ]; + inherit maintainers; platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; mainProgram = "nix"; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2bf354fbc69f9..dd5d35375e30e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -145,15 +145,13 @@ let pkg; in lib.makeExtensible (self: ({ - nix_2_3 = (common rec { - version = "2.3.16"; - src = fetchurl { - url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz"; - hash = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw="; - }; + nix_2_3 = (common { + version = "2.3.17"; + hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4="; patches = [ patch-monitorfdhup ]; + maintainers = with lib.maintainers; [ flokli raitobezarius ]; }).override { boehmgc = boehmgc-nix_2_3; }; nix_2_10 = common { diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index aabdf17244113..725e23bbdec04 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -32,25 +32,15 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.10.1"; + version = "2.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0WZTHGWfxJBZM1RlRN0uFs9kjCum2JjIISatakIReoE="; + hash = "sha256-Rtr8ik/iaMRkeYduUsaWf3qao4Xh5XTmQkhnCjezWP8="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/issues/265883 - # https://github.com/pdm-project/pdm/pull/2379 - (fetchpatch { - name = "fix-template-permission.patch"; - url = "https://github.com/pdm-project/pdm/commit/f0efdcefe589bc58c28ccf6ce2d23cad9a81dccc.patch"; - hash = "sha256-NnHDSz2N63JzSzh2t9a5f/QQWM6Hyd5Cn5JY2zem6Ac="; - }) - ]; - nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index f4a10a8ff2efb..6de9219529bd9 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 = poetry.version; + version = "1.8.1"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = version; - hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; + hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; }; }); } // (plugins self); diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix index d040c32c4834e..fba027bc19c28 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bX7Mqpe7SYQQVrPNVOl8Bwmeiq7owIiUhw0sp5+Gwck="; + hash = "sha256-6U96O0mCQpviBr4I67ZfHytsooXG4oCNTx8YqrrIzYo="; }; postPatch = '' diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 751db3ceec994..e384c96e1f8ed 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , installShellFiles , pythonRelaxDepsHook , build @@ -42,7 +41,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.6.1"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,18 +50,9 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/OvYT4Vix1t5Yx/Tx0z3E9L9qJ4OdI4maQqUVl8H524="; + hash = "sha256-au+4TOh/sA1+XZqXvWkKxfSdurusBR4l8jsPg6acUM8="; }; - patches = [ - # Backport patch to fix pypa/build 1.0 incompatibility - # FIXME: remove in next release - (fetchpatch { - url = "https://github.com/python-poetry/poetry/commit/a16863d1a448ff91a7cc4e48042d3a8669b78b34.patch"; - hash = "sha256-dWa5W1jFS7h5cTgoFy89o1Rbtmyddvme4sus+lld058="; - }) - ]; - nativeBuildInputs = [ installShellFiles pythonRelaxDepsHook @@ -132,6 +122,8 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_env_system_packages_are_relative_to_lib" + "test_install_warning_corrupt_root" "test_installer_with_pypi_repository" # touches network "git" @@ -148,6 +140,7 @@ buildPythonPackage rec { # 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" diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index c948c66b47f12..07aa1a7accc15 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; - version = "0.59.1"; + version = "0.59.2"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; + hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14="; }; nativeBuildInputs = [ pkg-config which ]; @@ -17,16 +17,17 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch - # fix openssl 3 - (fetchpatch { - url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch"; - hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ="; - }) ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; postPatch = '' + # _BSD_SOURCE causes cpp warning + # https://github.com/void-linux/xbps/issues/576 + substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \ + --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \ + --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE' + # fix unprefixed ranlib (needed on cross) substituteInPlace lib/Makefile \ --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index b34be9a37710d..0168ddc4cc902 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre }: +{ lib, stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux, pcre2, pkg-config, libgcrypt }: stdenv.mkDerivation rec { pname = "aide"; - version = "0.17.4"; + version = "0.18.6"; src = fetchurl { url = "https://github.com/aide/aide/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-yBUFJG8//C52A21Dp3ISroKJW1iB2bniXBNhsam3qEY="; + sha256 = "sha256-j/Ns5H030MyYd2LV2WE0bUdd50u6ihgy/QBttu3TwQ4="; }; - buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre ]; + buildInputs = [ flex bison libmhash zlib acl attr libselinux pcre2 libgcrypt ]; + nativeBuildInputs = [ pkg-config ]; configureFlags = [ "--with-posix-acl" @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://aide.github.io/"; description = "A file and directory integrity checker"; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ happysalada ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/baboossh/default.nix b/pkgs/tools/security/baboossh/default.nix index e9ad7b260efea..ee69130e67dd1 100644 --- a/pkgs/tools/security/baboossh/default.nix +++ b/pkgs/tools/security/baboossh/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -15,6 +16,12 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-dorIqnJuAS/y9W6gyt65QjwGwx4bJHKLmdqRPzY25yA="; }; + patches = fetchpatch { + name = "py3compat-utils.patch"; + url = "https://github.com/cybiere/baboossh/commit/f7a75ebeda0c69ab5b119894b9e1488fc0a935a8.patch"; + hash = "sha256-gctuu/Qd3nmJIWv2mTyrGwjlQD1U+OhGK6Zh/Un06/E="; + }; + propagatedBuildInputs = with python3.pkgs; [ cmd2 tabulate diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 67ed396b53805..f3c836fd38600 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -5,6 +5,7 @@ , dbus , electron_25 , fetchFromGitHub +, fetchpatch2 , glib , gnome , gtk3 @@ -27,26 +28,35 @@ let electron = electron_25; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.10.0"; + version = "2023.10.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; + hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws="; }; + patches = [ + (fetchpatch2 { + # https://github.com/bitwarden/clients/issues/6812#issuecomment-1806830091 + url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch"; + hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw="; + }) + ]; + nodejs = nodejs_18; makeCacheWritable = true; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; + npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; - inherit src; + inherit patches src; + patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-I7wENo4cCxcllEyT/tgAavHNwYPrQkPXxg/oTsl/ClA="; + hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -164,5 +174,6 @@ in buildNpmPackage rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ amarshall kiwi ]; platforms = [ "x86_64-linux" ]; + mainProgram = "bitwarden"; }; } diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index 37724d87394df..39b35d6944ded 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -6,16 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "boofuzz"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.2"; + pyproject = true; src = fetchFromGitHub { owner = "jtpereyda"; - repo = pname; + repo = "boofuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-mbxImm5RfYWq1JCCSvvG58Sxv2ad4BOh+RLvtNjQCKE="; + hash = "sha256-ffZVFmfDAJ+Qn3hbeHY/CvYgpDLxB+jaYOiYyZqZ7mo="; }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ attrs click @@ -42,8 +46,6 @@ python3.pkgs.buildPythonApplication rec { "TestNoResponseFailure" "TestProcessMonitor" "TestSocketConnection" - # SyntaxError: invalid syntax, https://github.com/jtpereyda/boofuzz/issues/663 - "test_msg_60_bytes" ] ++ lib.optionals stdenv.isDarwin [ "test_time_repeater" ]; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 821d0a8d6be66..5006007035eeb 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ pcsclite libusb1 ]; + # The resulting shared object ends up outside of the default paths which are + # usually getting stripped. + stripDebugList = ["pcsc"]; + meta = with lib; { description = "ccid drivers for pcsclite"; homepage = "https://ccid.apdu.fr/"; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index e2318c853f112..da62e7d0568eb 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -35,7 +35,9 @@ in # TODO: remove patch when PR is merged. patches = [ (fetchpatch { - url = "https://github.com/cloudflare/certmgr/pull/51.patch"; + # https://github.com/cloudflare/certmgr/pull/51 + name = "cloudflare-certmgr-pull-51.patch"; + url = "https://github.com/cloudflare/certmgr/compare/232e0adf8379db28ab74c46e0dd3eddb3cd8f2ea...55c595a4a2dc871726b3c8337469daf5597718a3.patch"; sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs"; }) ]; diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/tools/security/chain-bench/default.nix index fef69399cc142..e123cf30b43ff 100644 --- a/pkgs/tools/security/chain-bench/default.nix +++ b/pkgs/tools/security/chain-bench/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chain-bench"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vQzxTOShxQGitZRCuR8izSxCkZdPWm2ohoXBOvAkwfw="; + sha256 = "sha256-eNCQbmqTnCBBwrppFL2yvmiwgj439sosYVkk2ryMa0I="; }; vendorHash = "sha256-sAZIMJRx/E+l12Zyp/vKfuiaCMeaonRbEcsRIRXbXm8="; diff --git a/pkgs/tools/security/cherrybomb/default.nix b/pkgs/tools/security/cherrybomb/default.nix index 9f1478a8d231e..4bb975d3394c5 100644 --- a/pkgs/tools/security/cherrybomb/default.nix +++ b/pkgs/tools/security/cherrybomb/default.nix @@ -1,30 +1,22 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "cherrybomb"; - version = "1.0.0"; + version = "1.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-qZ1eKcRAwCzrzvw6QR28oZ8sGnsXmoOW/bWLQTlpqlo="; + hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; - cargoHash = "sha256-eosK7MQ3UB8rxKHCrb3s3+BVarv19h0cL+uzwg95Hc8="; + cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/security/cmospwd/default.nix b/pkgs/tools/security/cmospwd/default.nix index fa04ac6520744..969298918055b 100644 --- a/pkgs/tools/security/cmospwd/default.nix +++ b/pkgs/tools/security/cmospwd/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8pbSl5eUsKa3JrgK/JLk0FnGXcJhKksJN3wWiDPYYvQ="; }; + makeFlags = [ "CC:=$(CC)" ]; + preConfigure = '' cd src @@ -32,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cgsecurity.org/wiki/CmosPwd"; license = licenses.gpl2Plus; maintainers = with maintainers; [ t4ccer ]; - platforms = platforms.linux; + platforms = platforms.x86_64; }; }) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index e235ec5f746fc..f910cf8467ed8 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -13,17 +13,17 @@ in assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-xhj7RUurBRq9ZIDAlcq7KyYGnLqc+vTjaf2VMNStpVQ"; + hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI="; }; mvnParameters = "-Dmaven.test.skip=true"; - mvnHash = "sha256-XAIwKn8wMqILMQbg9wM4kHAaRSGWQaBx9AXQyJuUO5k="; + mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA="; preBuild = '' VERSION=${version} @@ -42,11 +42,13 @@ mavenJdk.buildMavenPackage rec { --add-flags "--enable-preview" \ --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ --add-flags "--module-path '$out/share/cryptomator/mods'" \ - --add-flags "-Dcryptomator.logDir='~/.local/share/Cryptomator/logs'" \ - --add-flags "-Dcryptomator.pluginDir='~/.local/share/Cryptomator/plugins'" \ - --add-flags "-Dcryptomator.settingsPath='~/.config/Cryptomator/settings.json'" \ - --add-flags "-Dcryptomator.ipcSocketPath='~/.config/Cryptomator/ipc.socket'" \ - --add-flags "-Dcryptomator.mountPointsDir='~/.local/share/Cryptomator/mnt'" \ + --add-flags "-Dfile.encoding='utf-8'" \ + --add-flags "-Dcryptomator.logDir='@{userhome}/.local/share/Cryptomator/logs'" \ + --add-flags "-Dcryptomator.pluginDir='@{userhome}/.local/share/Cryptomator/plugins'" \ + --add-flags "-Dcryptomator.settingsPath='@{userhome}/.config/Cryptomator/settings.json'" \ + --add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \ + --add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \ + --add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \ --add-flags "-Dcryptomator.showTrayIcon=false" \ --add-flags "-Dcryptomator.buildNumber='nix'" \ --add-flags "-Dcryptomator.appVersion='${version}'" \ diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index dc6ef20497235..bcb086410723d 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,8 +1,8 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_6.9.0.1467_amd64.deb", - "sha256": "fe405f7119d45822164da3ad009b99c5cd516685198c1d335b7803d84e5ba2ca", - "version": "6.9.0.1467" + "path": "pool/main/e/enpass/enpass_6.9.2.1563_amd64.deb", + "sha256": "013a6ecab29ad6b1a91203fea3cd771d039d777ea24c03d0a74ec5aa86b720ff", + "version": "6.9.2.1563" }, "i386": { "path": "pool/main/e/enpass/enpass_5.6.9_i386.deb", diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 509501d52cd40..6bb2a5a0e6b7b 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 = "2023-11-11"; + version = "2023-11-18"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oB28qKIvGHh/h726Wsy8C/zt3rFLBHcP5iRZe3U76U0="; + hash = "sha256-7W7HwHvRfm+nRms4H4TgB1la5OhGHv5lRHwbvjwRTMw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix index 3831ff4d8e228..e0e5976c75101 100644 --- a/pkgs/tools/security/ffuf/default.nix +++ b/pkgs/tools/security/ffuf/default.nix @@ -1,23 +1,38 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch }: buildGoModule rec { pname = "ffuf"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "ffuf"; + repo = "ffuf"; rev = "refs/tags/v${version}"; - hash = "sha256-TfPglATKQ3RIGODcIpSRL6FjbLyCjDzbi70jTLKYlLk="; + hash = "sha256-+wcNqQHtB8yCLiJXMBxolCWsYZbBAsBGS1hs7j1lzUU="; }; - vendorHash = "sha256-nqv45e1W7MA8ElsJ7b4XWs26OicJ7IXmh93+wkueZg4="; + vendorHash = "sha256-SrC6Q7RKf+gwjJbxSZkWARw+kRtkwVv1UJshc/TkNdc="; + + patches = [ + # Fix CSV test, https://github.com/ffuf/ffuf/pull/731 + (fetchpatch { + name = "fix-csv-test.patch"; + url = "https://github.com/ffuf/ffuf/commit/7f2aae005ad73988a1fa13c1c33dab71f4ae5bbd.patch"; + hash = "sha256-/v9shGICmsbFfEJe4qBkBHB9PVbBlrjY3uFmODxHu9M="; + }) + ]; + + ldflags = [ + "-w" + "-s" + ]; meta = with lib; { - description = "Fast web fuzzer written in Go"; + description = "Tool for web fuzzing"; longDescription = '' FFUF, or “Fuzz Faster you Fool” is an open source web fuzzing tool, intended for discovering elements and content within web applications diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 03ddf76e8ffe2..7fb7d53e352fc 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,112 +1,129 @@ diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle -index f4dbd3cd0..6108e8534 100644 +index 9e1c57faf..3a3242eb5 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle +++ b/Ghidra/Debug/Debugger-gadp/build.gradle -@@ -23,42 +23,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" +@@ -18,11 +18,16 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" ++apply plugin: 'com.google.protobuf' apply plugin: 'eclipse' -+apply plugin: 'com.google.protobuf' eclipse.project.name = 'Debug Debugger-gadp' --configurations { -- allProtocArtifacts -- protocArtifact --} -- - def platform = getCurrentPlatformName() - --dependencies { -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- -- if (isCurrentWindows()) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' -- } -- if (isCurrentLinux()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' -- } -- } -- if (isCurrentMac()) { -- if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' -- } -- else { -- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' -- } +buildscript { + dependencies { + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' - } ++ } +} - -+dependencies { + dependencies { api project(':Framework-AsyncComm') api project(':Framework-Debugging') - api project(':ProposedUtils') -@@ -73,37 +49,3 @@ dependencies { - } - }*/ - --task generateProto { -- ext.srcdir = file("src/main/proto") -- ext.src = fileTree(srcdir) { -- include "**/*.proto" -- } -- ext.outdir = file("build/generated/source/proto/main/java") -- outputs.dir(outdir) -- inputs.files(src) -- dependsOn(configurations.protocArtifact) -- doLast { -- def exe = configurations.protocArtifact.first() -- if (!isCurrentWindows()) { -- exe.setExecutable(true) -- } -- exec { -- commandLine exe, "--java_out=$outdir", "-I$srcdir" -- args src -- } -- } --} -- --tasks.compileJava.dependsOn(tasks.generateProto) --tasks.eclipse.dependsOn(tasks.generateProto) --rootProject.tasks.prepDev.dependsOn(tasks.generateProto) -- --sourceSets { -- main { -- java { -- srcDir tasks.generateProto.outdir -- } -- } --} --zipSourceSubproject.dependsOn generateProto -- diff --git a/Ghidra/Debug/Debugger-isf/build.gradle b/Ghidra/Debug/Debugger-isf/build.gradle -index 6bf945c2e..3225d095d 100644 +index d135294a0..785681ca2 100644 --- a/Ghidra/Debug/Debugger-isf/build.gradle +++ b/Ghidra/Debug/Debugger-isf/build.gradle -@@ -20,42 +20,18 @@ apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" +@@ -18,11 +18,15 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" - - apply plugin: 'eclipse' +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" +- +apply plugin: 'com.google.protobuf' + apply plugin: 'eclipse' eclipse.project.name = 'Debug Debugger-isf' ++buildscript { ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' ++ } ++} + dependencies { + api project(':Framework-AsyncComm') + api project(':Framework-Debugging') +diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle +index eec00786e..666cccafc 100644 +--- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle ++++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle +@@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" + apply from: "${rootProject.projectDir}/gradle/jacocoProject.gradle" + apply from: "${rootProject.projectDir}/gradle/javaTestProject.gradle" + apply from: "${rootProject.projectDir}/gradle/distributableGhidraModule.gradle" +-apply from: "${rootProject.projectDir}/gradle/debugger/hasProtobuf.gradle" ++apply plugin: 'com.google.protobuf' + apply from: "${rootProject.projectDir}/gradle/debugger/hasPythonPackage.gradle" + + apply plugin: 'eclipse' + eclipse.project.name = 'Debug Debugger-rmi-trace' + ++buildscript { ++ dependencies { ++ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' ++ } ++} + dependencies { + api project(':Debugger') + } +@@ -36,7 +41,7 @@ task generateProtoPy { + ext.outdir = file("build/generated/source/proto/main/py") + outputs.dir(outdir) + inputs.files(src) +- dependsOn(configurations.protocArtifact) ++ dependsOn(protobuf.generateProtoTasks.all()) + doLast { + def exe = configurations.protocArtifact.first() + if (!isCurrentWindows()) { +diff --git a/build.gradle b/build.gradle +index b0c717fb1..5f56506a5 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) { + jcenter() + flatDir name: "flat", dirs:["$flatRepo"] + } ++ buildscript { ++ repositories { ++ mavenLocal() ++ mavenCentral() ++ } ++ } + } + } + else { +diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/debugger/hasProtobuf.gradle +deleted file mode 100644 +index 23b4ce74b..000000000 +--- a/gradle/debugger/hasProtobuf.gradle ++++ /dev/null +@@ -1,94 +0,0 @@ +-/* ### +- * IP: GHIDRA +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +-/*plugins { +- id 'com.google.protobuf' version '0.8.10' +-}*/ +- -configurations { - allProtocArtifacts - protocArtifact -} - - def platform = getCurrentPlatformName() - +-def platform = getCurrentPlatformName() +- +- -dependencies { - allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' - allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' @@ -132,20 +149,15 @@ index 6bf945c2e..3225d095d 100644 - else { - protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' - } -+buildscript { -+ dependencies { -+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' - } -+} - -+dependencies { - api project(':Framework-AsyncComm') - api project(':Framework-Debugging') - api project(':ProposedUtils') -@@ -64,40 +40,6 @@ dependencies { - testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts') - } - +- } +-} +- +-/*protobuf { +- protoc { +- artifact = 'com.google.protobuf:protoc:3.21.8' +- } +-}*/ +- -task generateProto { - ext.srcdir = file("src/main/proto") - ext.src = fileTree(srcdir) { @@ -179,24 +191,3 @@ index 6bf945c2e..3225d095d 100644 - } -} -zipSourceSubproject.dependsOn generateProto -- - // Include buildable native source in distribution - rootProject.assembleDistribution { - from (this.project.projectDir.toString()) { -diff --git a/build.gradle b/build.gradle -index b0c717fb1..5f56506a5 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -74,6 +74,12 @@ if (flatRepo.isDirectory()) { - jcenter() - flatDir name: "flat", dirs:["$flatRepo"] - } -+ buildscript { -+ repositories { -+ mavenLocal() -+ mavenCentral() -+ } -+ } - } - } - else { diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 16bc1dbe5cd71..50fd64656f4a8 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -10,18 +10,19 @@ , icoutils , xcbuild , protobuf +, fetchurl }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.3.3"; + version = "10.4"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-KDSiZ/JwAqX6Obg9UD8ZQut01l/eMXbioJy//GluXn0="; + hash = "sha256-g0JM6pm1vkCh9yBB5mfrOiNrImqoyWdQcEe2g+AO6LQ="; }; gradle = gradle_7; @@ -36,24 +37,6 @@ let }; # postPatch scripts. - # Tells ghidra to use our own protoc binary instead of the prebuilt one. - fixProtoc = '' - cat >>Ghidra/Debug/Debugger-gadp/build.gradle <<HERE -protobuf { - protoc { - path = '${protobuf}/bin/protoc' - } -} -HERE - cat >>Ghidra/Debug/Debugger-isf/build.gradle <<HERE -protobuf { - protoc { - path = '${protobuf}/bin/protoc' - } -} -HERE - ''; - # Adds a gradle step that downloads all the dependencies to the gradle cache. addResolveStep = '' cat >>build.gradle <<HERE @@ -85,7 +68,7 @@ HERE inherit version src; patches = [ ./0001-Use-protobuf-gradle-plugin.patch ]; - postPatch = fixProtoc + addResolveStep; + postPatch = addResolveStep; nativeBuildInputs = [ gradle perl ] ++ lib.optional stdenv.isDarwin xcbuild; buildPhase = '' @@ -116,13 +99,21 @@ in stdenv.mkDerivation { inherit pname version src; nativeBuildInputs = [ - gradle unzip makeWrapper icoutils + gradle unzip makeWrapper icoutils protobuf ] ++ lib.optional stdenv.isDarwin xcbuild; dontStrip = true; - patches = [ ./0001-Use-protobuf-gradle-plugin.patch ]; - postPatch = fixProtoc; + patches = [ + ./0001-Use-protobuf-gradle-plugin.patch + # we use fetchurl since the fetchpatch normalization strips the whole diff + # https://github.com/NixOS/nixpkgs/issues/266556 + (fetchurl { + name = "0002-remove-executable-bit.patch"; + url = "https://github.com/NationalSecurityAgency/ghidra/commit/e2a945624b74e5d42dc85e9c1f992315dd154db1.diff"; + sha256 = "07mjfl7hvag2akk65g4cknp330qlk07dgbmh20dyg9qxzmk91fyq"; + }) + ]; buildPhase = '' export HOME="$NIX_BUILD_TOP/home" diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 34dcca4b4ca34..5f9346937b36c 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.3.1"; - versiondate = "20230614"; + version = "10.4"; + versiondate = "20230928"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-I4FUEbBF/iwMP/iiA9Hjf36J4sAInhO80hLTbxWmUFc="; + hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 96c4b0f4e1553..7fc15a3fb2b11 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.18.0"; + version = "8.18.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-659wQBv8DuYB4vI+qnBLS9u22kGlg4ne4DyKFoomlOw="; + hash = "sha256-v0d/ulxYJRkyyhVctnQjKW2ODWtu+gSwp/qSkVLQ1Jo="; }; - vendorHash = "sha256-PPEEQ2Bt20UK+mQL59jVnX8HtzCsqW4uRwR3mOdhDis="; + vendorHash = "sha256-lPfvoeHPYWSnFPuAR9CxG6+pQ++cZEw/jYuGgDrm57E="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index aac7deb19d5fd..5c38ed942233e 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.8"; + version = "1.15.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-gp/5ZBAxngQKRmr924f7ZQ4GX3uYHz2ULw1Gn+d7vug="; + hash = "sha256-8gHOWi4Xa5McbKVWborclgFqOpuQApUDW9wV849855I="; }; - vendorHash = "sha256-IXY8w5TLXA3SIT2Jyjqt+pPtZ35zQnG0wY08OB1spDw="; + vendorHash = "sha256-znmBV6sLx0g7zKkkv3S4TfVQu79ch5epq8l2uImF/Go="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 590b183194eb4..c114f541c7204 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.8"; + version = "1.15.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-dNzvC+ubkZPHx40bVwFT2R7TMrPdeD5oJz0lAd0vtw0="; + hash = "sha256-ngLtxzRupvQF5BERdHhq+Ywf8F2rBpBSx/eH/JgA+IY="; }; - vendorHash = "sha256-zaB8xrzqk3moR/ScXdHtqIgA9lZqWFzLWi4NAqbs0XU="; + vendorHash = "sha256-yvimjsDaEXXLBUHtCovNSz4GUQ9TlvAogMgw+HSX0Mg="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index b00b4bf014799..9301b2cf6d13d 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.8"; + version = "1.15.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-CL9PcztiFCCy1T7w0v2SzLmwkA6z8aPUx65ye5AJDr4="; + hash = "sha256-p1z1jFk+Fmh7kMyMI5kMCkmp62q/CC8BqsbHHpfGWaI="; }; - vendorHash = "sha256-Czlp3MyxRGcIV5uFZzF8t0JrucLzPzxyCUCtjICjPM0="; + vendorHash = "sha256-bFHm2mSWI00lVAfFK8DSjt0hgM52IycpHGRADk0QSoQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index ec29abdb614d4..294c0e0302f39 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.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-oLx8fyFmK6SyFLw4yDwa+z5CpuAqebQdEH3JCbt9cg0="; + hash = "sha256-FiCY9dZDZ92c6MayloS97Ff1trc5w4M/AIS6XORZf5U="; }; - vendorHash = "sha256-QggYz5vAzhqagYIRCa7R09px8qXaqsTcj659XIV/LR4="; + vendorHash = "sha256-++vCyunRkLn9K1u+zXSN4TzIS9J8emc/w85ToqmG7gY="; subPackages = [ "cmd/httpx" diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 012d492aacad6..de260e0682490 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, lib, openssl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, openssl +}: stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; @@ -9,6 +14,18 @@ stdenv.mkDerivation rec { hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48="; }; + patches = [ + # Backport openssl-3.1 from development branch. + # Can be removed with next release. + (fetchpatch { + name = "openssl-3.1.patch"; + url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch"; + includes = [ "TpmToOsslMath.h" ]; + stripLen = 1; + hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY="; + }) + ]; + buildInputs = [ openssl ]; sourceRoot = "src"; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 6d05f3972499a..d0bd3bb415ba6 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.44"; + version = "1.0.48"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-qjo5vpT+CtNiNBS0enLzQcsyq/dqRrOTHVB1qqOReM8="; + hash = "sha256-E/gqt8+eD/syOHczq9k07YIq39W84vC5VFScMxxj4uI="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4d7b793a84b58..539e6b8bc8d9c 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.42" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.43" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 58929753c597a..adc032baf2139 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: adf413fba45b298c4e16f7f1043dc69f99d2fbdb - ref: refs/tags/6.3.42 + revision: 58dcabe21524d8b2c4d05618ca8509dc42cc6515 + ref: refs/tags/6.3.43 specs: - metasploit-framework (6.3.42) + metasploit-framework (6.3.43) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 44b672cd6e4bd..6f88b96cd6ad9 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.42"; + version = "6.3.43"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-6ddW6VlbWV71BERJISF67UPRcwLQY8Hpw4kf80lCNBE="; + sha256 = "sha256-IWdSxXhJFGbNTo9xqEjBJNEWB6imzdwzgnXoUbfao/g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 8ba7f0e698afb..cf24944c40303 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "adf413fba45b298c4e16f7f1043dc69f99d2fbdb"; - sha256 = "049l894z67w9qglw2qyh09rx2hzdg8hj2ja40ksmwnavb7lmdmz9"; + rev = "58dcabe21524d8b2c4d05618ca8509dc42cc6515"; + sha256 = "1y53vavm3s3mh8rxrkd6m03idl94q54ahwcg9v6nc529g32m4rr1"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.42"; + version = "6.3.43"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 3d35b4d07750c..a3e3a82ec2347 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.1.2"; + version = "2.1.4"; pyproject = true; disabled = python3.pythonOlder "3.9"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Nitrokey"; repo = "nitrokey-app2"; rev = "v${version}"; - hash = "sha256-VyhIFNXxH/FohgjhBeZXoQYppP7PEz+ei0qzsWz1xhk="; + hash = "sha256-loOCa6XlLx1YEfqR0SUUalVIEPCoYsNEHFo2MIKexeA="; }; # https://github.com/Nitrokey/nitrokey-app2/issues/152 @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/Nitrokey/nitrokey-app2"; changelog = "https://github.com/Nitrokey/nitrokey-app2/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ _999eagle ]; + maintainers = with maintainers; [ _999eagle panicgh ]; mainProgram = "nitrokeyapp"; }; } diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 8cba4e1e3634b..ca34c7af28e5b 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yqpSkKebhX3kszL4mSbKUd9JR7rJizLdrk7tHlh6zlc="; + hash = "sha256-S8YU25JA1yBdbDQpy9kxl3I/4PkMN9BrueCiXrZXAEI="; }; - vendorHash = "sha256-pekirk3nYXDLzoy4iBJblYvN9fkViyMUsRFC0Dx1r9M="; + vendorHash = "sha256-4i6jLRe9yDxC6FPOpFrwaLWjg16HR9PqkHNamlwT3PA="; subPackages = [ "cmd/nuclei/" diff --git a/pkgs/tools/security/onlykey/default.nix b/pkgs/tools/security/onlykey/default.nix index 018c53b0c083c..c63173d889b2e 100644 --- a/pkgs/tools/security/onlykey/default.nix +++ b/pkgs/tools/security/onlykey/default.nix @@ -1,9 +1,11 @@ { lib , node_webkit , pkgs -, runCommand +, copyDesktopItems +, makeDesktopItem , stdenv , writeShellScript +, wrapGAppsHook }: let @@ -47,7 +49,26 @@ let ${node_webkit}/bin/nw ${onlykey}/lib/node_modules/${onlykey.packageName}/build ''; in -runCommand "${onlykey.packageName}-${onlykey.version}" { } '' - mkdir -p $out/bin - ln -s ${script} $out/bin/onlykey -'' +stdenv.mkDerivation { + pname = "${onlykey.packageName}"; + inherit (onlykey) version; + dontUnpack = true; + nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ]; + desktopItems = [ + (makeDesktopItem { + name = onlykey.packageName; + exec = script; + icon = "${onlykey}/lib/node_modules/${onlykey.packageName}/resources/onlykey_logo_128.png"; + desktopName = onlykey.packageName; + genericName = onlykey.packageName; + }) + ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s ${script} $out/bin/onlykey + + runHook postInstall + ''; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 478cca8be0e2f..a4ae25715c3fe 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -8,7 +8,7 @@ , python3 , dbus , polkit -, systemdMinimal +, systemdLibs , IOKit , pname ? "pcsclite" , polkitSupport ? false @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config perl ]; buildInputs = [ python3 ] - ++ lib.optionals stdenv.isLinux [ systemdMinimal ] + ++ lib.optionals stdenv.isLinux [ systemdLibs ] ++ lib.optionals stdenv.isDarwin [ IOKit ] ++ lib.optionals polkitSupport [ dbus polkit ]; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index a6c59919e28fe..3f6d1754aa235 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.17140"; + version = "4.17511"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - hash = "sha256-l66syIpTM4P0733eJKEjnEYHvQlIc7KKxXLcc7XBnHE="; + hash = "sha256-L842Hvdy3M+k67IPiWMcxxpuD0ggCF7j6TDs8YdISZ4="; }; patches = [ diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index fdefbdea9e503..19dd99b871b0e 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sqop"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { # generated etc repo = "sequoia-sop"; rev = "v${version}"; - hash = "sha256-2fRlHkT2jhUp1dIqKe8r7ktSbgudCmzuiiyF0WcbYIE="; + hash = "sha256-qGSVmjLdx84YphAXt1MRF1cIfk7xLOvtUj+3e7vO+jA="; }; - cargoHash = "sha256-/LLW0AHCgqi2pAOkhZXNGlmNF/+u0TmSstd/B6mDr6M="; + cargoHash = "sha256-y4n6UPAYwI9P+jw59TOf98xSdNvzEgJp5n/GtiixsIU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index d381be73e0fa2..30954f4c171b2 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 = "0.7.9"; + version = "0.7.10"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-CWoVVvhprqBW4bmcAHtgJbbOPxGbBsikNu6bwyDdIcc="; + hash = "sha256-Sy9adkmR7Vu7kI75XG0PXihFogPaNwzHH2U5uSz9mZA="; }; postPatch = '' diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 55207b1231f4e..6f5999978a107 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-AsOuNJ5adI7/8A6siK4MzLtpBstsU7JxX1d6WWVJHAY="; + hash = "sha256-6teCWzv9DXhGSBjyIurRW3ymSTwMUlbJGjuXmsqpkUc="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 424f5811a486e..0cb3f77332437 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.62.1"; + version = "3.63.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-dDz8czTYRxmhyFaYuSoqnBwT7lMZDENBuH+F0HpaouE="; + hash = "sha256-7heKPssACk6CI0O29U2astkwJAYk3a043l8Cqz6swMg="; }; vendorHash = "sha256-+Boe/bzCsmihspGqmiJ3jOcRJ9KPjkzu6MBmgtAgwjE="; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 709558fad5084..7233a41142edc 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.130"; + version = "1.0.131"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQg3segJamYrM8RRP5BEE7O1Jepr20ucdNUVwNllQlw="; + sha256 = "sha256-92OpvUt+0iN+UdEGjDdVCjUUlbuOjUgOjc+DGMUnx9U="; }; - cargoHash = "sha256-8DEvGRerIV9PB4uPAzFwymb67gcg9wdO8rruENR2M6Q="; + cargoHash = "sha256-FaQwxt3XcDOXlzcKEdMyE9TpmGykQOnJdxtM3EqMpfU="; 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 757e6bcd9dd32..17f6af921c788 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098 preConfigure = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace "-flto" "" + substituteInPlace GNUMakefile --replace "-flto=auto" "" ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index b350558887ff3..5dcd854483756 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://github.com/collectd/collectd/commit/3f575419e7ccb37a3b10ecc82adb2e83ff2826e1.patch"; sha256 = "0jwjdlfl0dp7mlbwygp6h0rsbaqfbgfm5z07lr5l26z6hhng2h2y"; }) + (fetchpatch { + name = "no_include_longintrepr.patch"; + url = "https://github.com/collectd/collectd/commit/623e95394e0e62e7f9ced2104b786d21e9c0bf53.patch"; + hash = "sha256-0eD7yNW3TWVyNMpLsADhYFDvy6COoCaI0kS1XJrwDgM="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index c3d0394c658db..bec4a31141021 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.1"; + version = "2.8.5"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-kNfA/MQuXauQPWQhUspreqo4oOKb+qBqh9NdmQM1Q+A="; + hash = "sha256-9qsHZTbK2RCDiQ5wlo2D79GeI5dbCvL2LofPnF7f8Cc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { "-X main.builtBy=nixpkgs" ]; - vendorHash = "sha256-8cTegiNVtGSZdf9O+KVoOgnjjMIv8w7YBSkFhk7gHfk="; + vendorHash = "sha256-B3uIFJaEsj9tpjPBiU+rXVlfcgVwZUQe3VSSoZQqBG8="; nativeBuildInputs = [ installShellFiles ]; @@ -44,7 +44,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.8.1.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.8.5.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 82316541f4c73..831791a2f8be6 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/which/which-${version}.tar.gz"; - sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; + hash = "sha256-9KJFuUEks3fYtJZGv0IfkVXTaqdhS26/g3BdP/x26q0="; }; strictDeps = true; @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { lib.optional stdenv.hostPlatform.is32bit "-D_FILE_OFFSET_BITS=64" ); - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; - platforms = platforms.all; - license = licenses.gpl3; + license = lib.licenses.gpl3Plus; + mainProgram = "which"; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix index f4003ed934d69..91ce2ed8f6a87 100644 --- a/pkgs/tools/system/zps/default.nix +++ b/pkgs/tools/system/zps/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zps"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "orhun"; repo = "zps"; rev = version; - hash = "sha256-t0kVMrJn+eqUUD98pp3iIK28MoLwOplLk0sYgRJkO4c="; + hash = "sha256-+evCYiTiH8tRmhvsse+49WlKGRP5XQtep7wGoCySvJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock index d061c364b2701..29c643c10bd4a 100644 --- a/pkgs/tools/system/zram-generator/Cargo.lock +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys", @@ -107,9 +107,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[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", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "liboverdrop" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "log" @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -259,9 +259,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", diff --git a/pkgs/tools/system/zram-generator/default.nix b/pkgs/tools/system/zram-generator/default.nix index 81bf4082d5c14..3d55d7c19613e 100644 --- a/pkgs/tools/system/zram-generator/default.nix +++ b/pkgs/tools/system/zram-generator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, rust , rustPlatform , pkg-config , ronn @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock substituteInPlace Makefile \ - --replace 'target/$(BUILDTYPE)' 'target/${rust.toRustTargetSpec stdenv.hostPlatform}/$(BUILDTYPE)' + --replace 'target/$(BUILDTYPE)' 'target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$(BUILDTYPE)' substituteInPlace src/generator.rs \ --replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ --replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 1db60b38a8dee..98c3db975edcd 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , testers , difftastic +, stdenv }: let @@ -32,6 +33,11 @@ rustPlatform.buildRustPackage rec { }; }; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + postPatch = '' patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \ -p1 < ${mimallocPatch} diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix index 1f975823fa1d4..230d1328d457a 100644 --- a/pkgs/tools/text/frawk/default.nix +++ b/pkgs/tools/text/frawk/default.nix @@ -6,6 +6,7 @@ , zlib , features ? [ "default" ] , llvmPackages_12 +, stdenv }: rustPlatform.buildRustPackage rec { @@ -30,6 +31,11 @@ rustPlatform.buildRustPackage rec { export RUSTC_BOOTSTRAP=1 ''; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + # depends on cpu instructions that may not be available on builders doCheck = false; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 4925ce3971900..e151a1467446a 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-sfw+Si6g6NVUWZdB6q3wnoabMAqIR9/KT1HsXtbafDY="; + hash = "sha256-KFEYkhCLMcJ4NkHu0kkuG70EvJQ3HYDvicmomcMJZjc="; }; - vendorHash = "sha256-3g47EuDElz1lrw7pgzD1jtTAs2Up97WWWFHe6aFE9zk="; + vendorHash = "sha256-rvVrVv73gW26UUy1MyxKDjUgX1mrMMii+l8qU2hLOek="; subPackages = [ "cmd/gtree" diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index fff3e44baf694..7ef802e925fb5 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace /bin/echo echo \ --replace CXX=unknown ':' + '' + lib.optionalString stdenv.cc.isClang '' + substituteInPlace HTMLParser.C \ + --replace "register " "" ''; # the --prefix has no effect diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index fd5ead9e0c359..aed1bd2afd50f 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "invoice2data"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = "invoice-x"; repo = pname; rev = "v${version}"; - hash = "sha256-ss2h8cg0sga+lzJyQHckrZB/Eb63Oj3FkqmGqWCzCQ8="; + hash = "sha256-pAvkp8xkHYi/7ymbxaT7/Jhu44j2P8emm8GyXC6IBnI="; }; patches = [ @@ -38,6 +38,7 @@ python3.pkgs.buildPythonApplication rec { pdfminer-six pillow pyyaml + setuptools ]; makeWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix new file mode 100644 index 0000000000000..d69c7e4fdd864 --- /dev/null +++ b/pkgs/tools/text/mdbook-footnote/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, CoreServices +}: +rustPlatform.buildRustPackage rec { + pname = "mdbook-footnote"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "daviddrysdale"; + repo = "mdbook-footnote"; + rev = "v${version}"; + hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses="; + }; + + cargoSha256 = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = with lib; { + description = "A preprocessor for mdbook to support the inclusion of automatically numbered footnotes"; + homepage = "https://github.com/daviddrysdale/mdbook-footnote"; + license = licenses.asl20; + maintainers = with maintainers; [ brianmcgillion ]; + }; +} diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index e0529c77917b8..95483b8465ed1 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, nix, rustPlatform, CoreServices, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "mdbook"; @@ -13,8 +13,17 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-D0XhrweO0A1+81Je4JZ0lmnbIHstNvefpmogCyB4FEE="; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd mdbook \ + --bash <($out/bin/mdbook completions bash) \ + --fish <($out/bin/mdbook completions fish) \ + --zsh <($out/bin/mdbook completions zsh ) + ''; + passthru = { tests = { inherit nix; diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index 572ec28c07500..ea572104238c8 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -15,5 +15,9 @@ finalAttrs: { "--with-charset=utf8" ]; + # mecab uses several features that have been removed in C++17. + # Force the language mode to C++14, so that it can compile with clang 16. + makeFlags = [ "CXXFLAGS=-std=c++14" ]; + doCheck = true; } diff --git a/pkgs/tools/text/pomsky/Cargo.lock b/pkgs/tools/text/pomsky/Cargo.lock index 9c93b91631e17..2064e8c6a1ffc 100644 --- a/pkgs/tools/text/pomsky/Cargo.lock +++ b/pkgs/tools/text/pomsky/Cargo.lock @@ -3,65 +3,39 @@ version = 3 [[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[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", ] [[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" +checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859" dependencies = [ "derive_arbitrary", ] [[package]] name = "assert_cmd" -version = "2.0.10" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", "doc-comment", - "predicates 3.0.1", + "predicates 3.0.4", "predicates-core", "predicates-tree", "wait-timeout", @@ -69,31 +43,20 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d5bf7e5441c6393b5a9670a5036abe6b4847612f594b870f7332dbf10cf6fa" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ "anstyle", "doc-comment", "globwalk", - "predicates 3.0.1", + "predicates 3.0.4", "predicates-core", "predicates-tree", "tempfile", ] [[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" @@ -103,22 +66,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" name = "benchmark" version = "0.1.3" dependencies = [ - "criterion", + "divan", "melody_compiler", "pomsky", ] [[package]] name = "bindgen" -version = "0.59.2" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", - "clap 2.34.0", - "env_logger", "lazy_static", "lazycell", "log", @@ -128,6 +89,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -138,6 +100,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-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -148,35 +116,23 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] [[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[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.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -195,37 +151,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -234,124 +163,43 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", + "clap_builder", ] [[package]] -name = "clap" -version = "3.2.23" +name = "clap_builder" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ - "bitflags", + "anstyle", "clap_lex", - "indexmap", - "textwrap 0.16.0", + "terminal_size 0.3.0", ] [[package]] name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "criterion" -version = "0.3.6" -source = "git+https://github.com/bheisler/criterion.rs?branch=version-0.4#935c6327e152e44f2b9178797682b9b99b5123a5" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.23", - "criterion-plot", - "itertools", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.5" -source = "git+https://github.com/bheisler/criterion.rs?branch=version-0.4#935c6327e152e44f2b9178797682b9b99b5123a5" -dependencies = [ - "cast", - "itertools", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[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" +name = "condtype" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] +checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] -name = "crossbeam-utils" -version = "0.8.15" +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "cfg-if", + "libc", ] [[package]] @@ -366,13 +214,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -383,68 +231,65 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[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", ] [[package]] -name = "doc-comment" -version = "0.3.3" +name = "divan" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "fab20f5802e0b897093184f5dc5d23447fa715604f238dc798f6da188b230019" +dependencies = [ + "clap", + "condtype", + "divan-macros", + "linkme", + "regex-lite", +] [[package]] -name = "either" -version = "1.8.1" +name = "divan-macros" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "1c5d6354551e0b5c451a948814fc47fe745a14eac7835c087d60162661019db4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] -name = "env_logger" -version = "0.9.3" +name = "doc-comment" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] -name = "errno" -version = "0.2.8" +name = "either" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "float-cmp" @@ -463,26 +308,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", ] [[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -490,9 +324,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -507,61 +341,31 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] [[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] name = "helptext" version = "0.1.0" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "libc", + "windows-sys", ] [[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] name = "ignore" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -579,45 +383,14 @@ dependencies = [ ] [[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", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", -] - -[[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -636,27 +409,27 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.6" +name = "itertools" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] [[package]] -name = "jobserver" -version = "0.1.26" +name = "itoa" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] -name = "js-sys" -version = "0.3.61" +name = "jobserver" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ - "wasm-bindgen", + "libc", ] [[package]] @@ -679,9 +452,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -694,25 +467,42 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "linkme" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" +dependencies = [ + "linkme-impl", +] [[package]] -name = "log" -version = "0.4.17" +name = "linkme-impl" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ - "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] name = "melody_compiler" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c65dfed91963cb9aa714e283edbc99cfffc3a971f9ea816eed3dbf593d378d6" +checksum = "7684213d4adcea6264d0fd61379a0eb9968d0866de0f05c75dee3af02a6c6ff8" dependencies = [ "once_cell", "pest", @@ -722,24 +512,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "miette" -version = "5.6.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749fb52853e739208049fb513287c6f448de9103dfa78b05ae01f2fc5809bb" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ "is-terminal", "miette-derive", @@ -748,21 +529,21 @@ dependencies = [ "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size", - "textwrap 0.15.2", + "terminal_size 0.1.17", + "textwrap", "thiserror", "unicode-width", ] [[package]] name = "miette-derive" -version = "5.6.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a07ad93a80d1b92bb44cb42d7c49b49c9aab1778befefad49cceb5e4c5bf460" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -789,28 +570,18 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "onig" @@ -818,7 +589,7 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "once_cell", "onig_sys", @@ -827,8 +598,7 @@ dependencies = [ [[package]] name = "onig_sys" version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +source = "git+https://github.com/rust-onig/rust-onig#fa90c0e97e90a056af89f183b23cd417b59ee6a2" dependencies = [ "bindgen", "cc", @@ -836,18 +606,6 @@ dependencies = [ ] [[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -855,21 +613,20 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pcre2" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1" +checksum = "9deb1d02d6a373ee392128ba86087352a986359f32a106e2e3b08cc90cc659c9" dependencies = [ "libc", "log", "pcre2-sys", - "thread_local", ] [[package]] name = "pcre2-sys" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec30e5e9ec37eb8fbf1dea5989bc957fd3df56fbee5061aa7b7a99dbb37b722" +checksum = "ae234f441970dbd52d4e29bee70f3b56ca83040081cb2b55b7df772b16e0b06e" dependencies = [ "cc", "libc", @@ -884,19 +641,20 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pest" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "35513f630d46400a977c4cb58f78e1bfbe01434316e60c37d27b9ad6139c66d8" dependencies = [ "pest", "pest_generator", @@ -904,22 +662,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "1df74e9e7ec4053ceb980e7c0c8bd3594e977fde1af91daba9c928e8e8c6708d" dependencies = [ "once_cell", "pest", @@ -928,47 +686,17 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pomsky" -version = "0.10.0" +version = "0.11.0" dependencies = [ "arbitrary", - "atty", "lexopt", "miette", - "once_cell", "pomsky-syntax", "regex", "regex-test", @@ -976,14 +704,14 @@ dependencies = [ [[package]] name = "pomsky-bin" -version = "0.10.0" +version = "0.11.0" dependencies = [ "assert_cmd", "assert_fs", - "atty", "helptext", "lexopt", "miette", + "pcre2", "pomsky", "predicates 2.1.5", "serde", @@ -993,17 +721,17 @@ dependencies = [ [[package]] name = "pomsky-macro" -version = "0.10.0" +version = "0.11.0" dependencies = [ "pomsky", ] [[package]] name = "pomsky-syntax" -version = "0.10.0" +version = "0.11.0" dependencies = [ "arbitrary", - "strsim 0.10.0", + "strsim", ] [[package]] @@ -1014,7 +742,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -1022,13 +750,13 @@ dependencies = [ [[package]] name = "predicates" -version = "3.0.1" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba7d6ead3e3966038f68caa9fc1f860185d95a793180bbcfe0d0da47b3961ed" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools", + "itertools 0.11.0", "predicates-core", ] @@ -1050,58 +778,48 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[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", ] [[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" +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", + "bitflags 1.3.2", ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "regex" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "bitflags", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.2" +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1109,16 +827,16 @@ dependencies = [ ] [[package]] -name = "regex-automata" -version = "0.1.10" +name = "regex-lite" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regex-test" @@ -1137,23 +855,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.11" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys", ] [[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 = "same-file" @@ -1165,36 +882,30 @@ dependencies = [ ] [[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.158" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -1203,9 +914,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1214,21 +925,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "strsim" @@ -1238,9 +943,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -1248,9 +953,9 @@ dependencies = [ [[package]] name = "supports-hyperlinks" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ "is-terminal", ] @@ -1277,9 +982,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.4" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1288,34 +993,35 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "terminal_size" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ - "winapi-util", + "libc", + "winapi", ] [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1326,15 +1032,6 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" @@ -1345,29 +1042,23 @@ dependencies = [ ] [[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.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.38", ] [[package]] @@ -1381,54 +1072,34 @@ 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 = "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 = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[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-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[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" @@ -1447,93 +1118,24 @@ 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", ] [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] @@ -1554,9 +1156,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", ] @@ -1569,33 +1171,18 @@ 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", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1608,42 +1195,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/tools/text/pomsky/default.nix index 45e44b06e8a5b..474ea404c937a 100644 --- a/pkgs/tools/text/pomsky/default.nix +++ b/pkgs/tools/text/pomsky/default.nix @@ -1,23 +1,36 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, oniguruma }: rustPlatform.buildRustPackage rec { pname = "pomsky"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "pomsky-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-V4WztquClcBQF74c8WalWITT+SRymEawLXmvTflNEGk="; + hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "criterion-0.3.6" = "sha256-biFm0+AjKLwV9yHgCaK6E6L6W+6sRbnY2QOKVhv/1C8="; + "onig_sys-69.8.1" = "sha256-NJv/Dooh93yQ9KYyuNBhO1c4U7Gd7X007ECXyRsztrY="; }; }; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + oniguruma + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + # thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: invalid option '--test-threads'' doCheck = false; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index cd5e2caa8f0da..8b71eeec4818f 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.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-yrIZsCxoFV9LFh96asYxpAYv1KvrLq+RlqL8gZXaeak="; + hash = "sha256-cW43nt8Go4VjEwXpCieGYIXwG1XMexslgriMsZ0BB1g="; }; - cargoHash = "sha256-tO49qAEW15q76hLcHOtniwLqGy29MZ/dabyZHYAsiME="; + cargoHash = "sha256-phTo0XvCiTnBFF5r5myvwmiWnpcYLnkaMLcaXw4oL/Y="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index c8a775e644591..d20b3692f31c3 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -14,16 +14,24 @@ stdenv.mkDerivation rec { patches = [ # gcc-11 compat upstream patch (fetchpatch { - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; - sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + hash = "sha256-h9DyD+pmlQT5dmKjWI9t0gCIYHe7pYkP55LnOqsE0vI="; excludes = [ "ChangeLog" ]; }) # Upstream fix for clang-13 and gcc-12 test support (fetchpatch { name = "gcc-12.patch"; - url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; - sha256 = "1v33zd2766k7cdgmajw2lffw9wd7v4f8z01f40z53f6bp608nr62"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; + hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w="; + }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Adds compatibility with C++17 by removing the `register` storage class specifier. + (fetchpatch { + name = "remove-register-keyword"; + url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=416b39758dba2c74515584514a959ad1b0ad50d1"; + hash = "sha256-R5A7IGHhU82EqceMCsuNBanhRz4dFVqiaH8637dr7jw="; + includes = [ "lib/*" ]; }) ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index c347ac967cc8f..a8acf6f1aa425 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,7 +2,9 @@ , stdenv , fetchFromGitHub , boost +, brotli , bzip2 +, bzip3 , lz4 , pcre2 , xz @@ -12,18 +14,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-0yg68lBEHiyRD3FE5oe67hMhhEHOFf7/PMA+88J9LuI="; + hash = "sha256-GYqIunSApnBfct+olre0eGy8KuOtbaiPvW0tQIcBRLQ="; }; buildInputs = [ boost + brotli bzip2 + bzip3 lz4 pcre2 xz @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultra fast grep with interactive query UI"; homepage = "https://github.com/Genivia/ugrep"; changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}"; - maintainers = with maintainers; [ numkem ]; + maintainers = with maintainers; [ numkem mikaelfangel ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index d4ed3ba55a951..7ae0de13ed9f7 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.29.6"; + version = "2.29.7"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-0btFCTpVB50097yQEggpm1rmm4aciTgfdLAkczQ1mj4="; + hash = "sha256-5fOEZG+ucp9EpizNHvKzqksnDzV8x0miGSKnTelxmzs="; }; - vendorHash = "sha256-EbhLz4agDWAlALfBcGUbVNz+teUvgroxzaSN8T19AJY="; + vendorHash = "sha256-FnzuumOIvjpoDr+yBaRc8UjMDNW8mgrJiz1ZyzNW0Ts="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 6b5498656b0eb..3c64e8872019b 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "sile"; - version = "0.14.12"; + version = "0.14.13"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${finalAttrs.version}/sile-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-iyxNi4Y2zaeR6HUf/IVW1M7mB0WhM2yxOqDkb1oAkHg="; + sha256 = "sha256-PU9Yfanmyr4nAQMQu/unBQSQCvV2hyo0i8lR0MnuFcA="; }; configureFlags = [ diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/tools/typesetting/tex/blahtexml/default.nix index ce071c7006f25..43981eb2ae92d 100644 --- a/pkgs/tools/typesetting/tex/blahtexml/default.nix +++ b/pkgs/tools/typesetting/tex/blahtexml/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-DL5DyfARHHbwWBVHSa/VwHzNaAx/v7EDdnw1GLOk+y0="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace makefile \ + --replace "\$(CXX)" "\$(CXX) -std=c++98" + ''; + outputs = [ "out" "doc" ]; nativeBuildInputs = [ texliveFull ]; # scheme-full needed for ucs package diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 402c0c247e958..2d7f859c809cd 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -310,12 +310,21 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation rec { +dvisvgm = stdenv.mkDerivation { pname = "texlive-dvisvgm.bin"; inherit version; inherit (common) src; + patches = [ + (fetchpatch { + url = "https://github.com/mgieseki/dvisvgm/commit/629544928877362d0c6d64f20695f7df3073c5eb.patch"; + stripLen = 1; + extraPrefix = "texk/dvisvgm/dvisvgm-src/"; + hash = "sha256-CBCbc/woaFeLw7aBG/kSVYc3a5Q56zbAB64kK6mRy4g="; + }) + ]; + preConfigure = "cd texk/dvisvgm"; configureFlags = common.configureFlags diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 133723cc39113..0074991eaaf62 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -58,7 +58,7 @@ let keySet = p: { key = ((p.name or "${p.pname}-${p.version}") + "-" + p.tlOutputName or p.outputName or ""); inherit p; - tlDeps = p.tlDeps or (p.requiredTeXPackages or (_: [ ]) [ ]); + tlDeps = if p ? tlDeps then ensurePkgSets p.tlDeps else (p.requiredTeXPackages or (_: [ ]) tl); }; in # texlive.combine: the wrapper already resolves all dependencies diff --git a/pkgs/tools/video/blackmagic-desktop-video/default.nix b/pkgs/tools/video/blackmagic-desktop-video/default.nix index dc6f2eff78732..435db1221eab2 100644 --- a/pkgs/tools/video/blackmagic-desktop-video/default.nix +++ b/pkgs/tools/video/blackmagic-desktop-video/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})" + "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" "AppleWebKit/537.36 (KHTML, like Gecko)" "Chrome/77.0.3865.75" "Safari/537.36" diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 3fde1c8a7671d..9b0f9bbe3f705 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-h63Z6y0dMZQaNvnx3fzd/sA2K7cO5h6wHpMkbQVfHLA="; + hash = "sha256-3cWhASwOgSovApNT/MUbhHhmp/o4k3ckgfcSFwJJqI8="; }; - vendorHash = "sha256-GRjadpgIryeMhWfmdzSWKH694cgDp9lfD0RRjuPrYqE="; + vendorHash = "sha256-SV4sMDgUv6Ci0aC7wsam7ftqMSpFwsMGkC9qLpR+O68="; buildFlagArrays = [ "-trimpath" diff --git a/pkgs/tools/video/mjpegtools/c++-17-fixes.patch b/pkgs/tools/video/mjpegtools/c++-17-fixes.patch new file mode 100644 index 0000000000000..018cc7e9beabd --- /dev/null +++ b/pkgs/tools/video/mjpegtools/c++-17-fixes.patch @@ -0,0 +1,44 @@ +diff -ur a/mplex/main.cpp b/mplex/main.cpp +--- a/mplex/main.cpp 2021-09-05 02:14:13.029372000 -0400 ++++ b/mplex/main.cpp 2023-09-23 08:47:07.683450627 -0400 +@@ -50,7 +50,7 @@ + #include "multiplexor.hpp" + + +-using std::auto_ptr; ++using std::unique_ptr; + + + /************************************************************************* +@@ -138,7 +138,7 @@ + void + FileOutputStream::NextSegment( ) + { +- auto_ptr<char> prev_filename_buf( new char[strlen(cur_filename)+1] ); ++ unique_ptr<char> prev_filename_buf( new char[strlen(cur_filename)+1] ); + char *prev_filename = prev_filename_buf.get(); + fclose(strm); + ++segment_num; +diff -ur a/utils/fastintfns.h b/utils/fastintfns.h +--- a/utils/fastintfns.h 2021-09-05 02:14:13.033372000 -0400 ++++ b/utils/fastintfns.h 2023-09-23 08:44:40.147112973 -0400 +@@ -2,12 +2,17 @@ + * + * WARNING: Assumes 2's complement arithmetic. + */ +-static inline int intmax( register int x, register int y ) ++#ifdef __cplusplus ++#define REGISTER ++#else ++#define REGISTER register ++#endif ++static inline int intmax( REGISTER int x, REGISTER int y ) + { + return x < y ? y : x; + } + +-static inline int intmin( register int x, register int y ) ++static inline int intmin( REGISTER int x, REGISTER int y ) + { + return x < y ? x : y; + } diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 675dfc109de13..f231d6ed184da 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-sYBTbX2ZYLBeACOhl7ANyxAJKaSaq3HRnVX0obIQ9Jo="; }; + # Clang 16 defaults to C++17. `std::auto_ptr` has been removed from C++17, and the + # `register` type class specifier is no longer allowed. + patches = [ ./c++-17-fixes.patch ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 70e95cb4f0166..146ff6072544d 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -13,10 +13,7 @@ , buildPackages }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; - -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "rav1e"; version = "0.6.6"; @@ -47,11 +44,11 @@ in rustPlatform.buildRustPackage rec { checkType = "debug"; postBuild = '' - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; postInstall = '' - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; meta = with lib; { diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index aa8e7664e087d..a2c37dfb679eb 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.33.0"; + version = "0.33.1"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-YY/rTrL6zEhZkeaYz2yG/h2s81IefClou4abbmQuDiU="; + sha256 = "sha256-5zFyOWfVxQL/QveOlX4Xkg8FBwo8mZzR7ea2IacSrS4="; }; vendorHash = "sha256-DBcovHOOfIy4dfi8U9zaCUzz5Zz8oIG44JCqMKtdxgg="; diff --git a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch index fc1c472ef3a63..bde1792d40029 100644 --- a/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch +++ b/pkgs/tools/virtualization/multipass/cmake_no_fetch.patch @@ -7,7 +7,7 @@ index 188ebfc6..4a34a922 100644 FetchContent_Declare(gRPC - GIT_REPOSITORY https://github.com/CanonicalLtd/grpc.git -- GIT_TAG ba8e7f72 +- GIT_TAG e3acf245 - GIT_SHALLOW TRUE - GIT_SUBMODULES "third_party/abseil-cpp third_party/cares/cares third_party/protobuf third_party/re2 third_party/zlib" - GIT_SUBMODULES_RECURSE false diff --git a/pkgs/tools/virtualization/multipass/cmake_warning.patch b/pkgs/tools/virtualization/multipass/cmake_warning.patch new file mode 100644 index 0000000000000..846cba0690fb1 --- /dev/null +++ b/pkgs/tools/virtualization/multipass/cmake_warning.patch @@ -0,0 +1,14 @@ +diff --git a/src/cert/CMakeLists.txt b/src/cert/CMakeLists.txt +index d44a0b09..de440f24 100644 +--- a/src/cert/CMakeLists.txt ++++ b/src/cert/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library(cert STATIC + target_include_directories(cert PRIVATE + ${OPENSSL_INCLUDE_DIR}) + +-foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers) ++foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers -Wno-ignored-attributes) + check_cxx_compiler_flag(${flag} SUPPORTED) + if(SUPPORTED) + target_compile_options(cert PRIVATE ${flag}) + diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index bf03b86367993..8be9488c46e5f 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -25,7 +25,7 @@ let pname = "multipass"; - version = "1.12.1"; + version = "1.12.2"; # This is done here because a CMakeLists.txt from one of it's submodules tries # to modify a file, so we grab the source for the submodule here, copy it into @@ -33,8 +33,8 @@ let grpc_src = fetchFromGitHub { owner = "CanonicalLtd"; repo = "grpc"; - rev = "ba8e7f72a57b9e0b25783a4d3cea58c79379f194"; - hash = "sha256-DS1UNLCUdbipn5w4p2aVa8LgHHhdJiAfzfEdIXNO69o="; + rev = "e3acf245"; + hash = "sha256-tDc2iGxIV68Yi4RL8ES4yglJNlu8yH6FlpVvZoWjoXk="; fetchSubmodules = true; }; in @@ -46,13 +46,20 @@ stdenv.mkDerivation owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-8wRho/ECWxiE6rNqjBzaqFaIdhXzOzFuCcQ4zzfSmb4="; + hash = "sha256-1k0jbYMwfYuHmM/Cm76sbo3+mN6WypALMQBwlZ+9d+c="; fetchSubmodules = true; + leaveDotGit = true; + postFetch = '' + # Workaround for https://github.com/NixOS/nixpkgs/issues/8567 + cd $out + rm -rf .git + ''; }; patches = [ ./lxd_socket_path.patch ./cmake_no_fetch.patch + ./cmake_warning.patch ]; postPatch = '' diff --git a/pkgs/tools/wayland/chayang/default.nix b/pkgs/tools/wayland/chayang/default.nix index ccfba6a0cf020..30780ed90a8b0 100644 --- a/pkgs/tools/wayland/chayang/default.nix +++ b/pkgs/tools/wayland/chayang/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - pkgsBuildBuild = [ + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix index 32dcddea6fc49..f6412a3ca745a 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.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "coffebar"; repo = pname; rev = version; - hash = "sha256-eqhGX9rjvOHh6RuWj5dqWPKlFdTnZpAcDUuJbT3Z/E8="; + hash = "sha256-zH0N7m8cvc47MM7+DAIgg/S6onpIwoB9CfcAmRqhtGA="; }; - cargoHash = "sha256-AUkBTHShtY3ZJ8pxCuW9baVuxb2QxzXxJQMgbuVTlPY="; + cargoHash = "sha256-rYTptEB+2Adlb1y7oXO+noqNylwiHBAb49ufZdPL9Qc="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/tools/wayland/swaykbdd/default.nix index c6e59cec2a81c..36ab908dfe503 100644 --- a/pkgs/tools/wayland/swaykbdd/default.nix +++ b/pkgs/tools/wayland/swaykbdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swaykbdd"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "artemsen"; repo = "swaykbdd"; rev = "v${version}"; - sha256 = "sha256-QHNUIFJb5XYjUC07NQo96oD57nU8jd8sUW32iJSW+SU="; + sha256 = "sha256-FtXmn5Lf0PhL99xGl/SHWNaE6vAMOF2Ok4xVJT2Bf/s="; }; strictDeps = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c1acad2e8e90..df1ee47a4f2f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ 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 + alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 alsaLib = alsa-lib; # Added 2021-06-09 alsaOss = alsa-oss; # Added 2021-06-10 alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 @@ -151,6 +152,7 @@ mapAliases ({ clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 + code-server = throw "'code-server' has been removed from nixpkgs, as it was depending on EOL Node.js and is unmaintained."; # Added 2023-10-30 codimd = hedgedoc; # Added 2020-11-29 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 @@ -160,7 +162,6 @@ mapAliases ({ cvs_fast_export = cvs-fast-export; # Added 2021-06-10 # these are for convenience, not for backward compat and shouldn't expire - clang5Stdenv = lowPrio llvmPackages_5.stdenv; clang6Stdenv = lowPrio llvmPackages_6.stdenv; clang7Stdenv = lowPrio llvmPackages_7.stdenv; clang8Stdenv = lowPrio llvmPackages_8.stdenv; @@ -427,6 +428,8 @@ mapAliases ({ keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 kfctl = throw "kfctl is broken and has been archived by upstream" ; # Added 2023-08-21 kgx = gnome-console; # Added 2022-02-19 + kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-30-10 + kibana = kibana7; kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10 kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18 kodiGBM = kodi-gbm; @@ -451,6 +454,7 @@ mapAliases ({ libbencodetools = bencodetools; # Added 2022-07-30 libbpf_1 = libbpf; # Added 2022-12-06 libcap_pam = throw "'libcap_pam' has been replaced with 'libcap'"; # Converted to throw 2023-09-10 + libclc = llvmPackages_latest.libclc; # Added 2023-10-28 libgme = game-music-emu; # Added 2022-07-20 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 @@ -563,6 +567,7 @@ mapAliases ({ MACS2 = macs2; # Added 2023-06-12 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 + mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 @@ -621,10 +626,14 @@ mapAliases ({ nixopsUnstable = nixops_unstable; # Added 2022-03-03 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 + nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 nodejs-16_x = nodejs_16; # Added 2022-11-06 nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 + nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 @@ -726,6 +735,9 @@ mapAliases ({ prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01 + protobuf3_24 = protobuf_24; + protobuf3_23 = protobuf_23; + protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fc16c7c59948..0962ec1f04f1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -292,6 +292,8 @@ with pkgs; cve = with python3Packages; toPythonApplication cvelib; + db-rest = callPackage ../servers/db-rest { }; + fiche = callPackage ../servers/fiche { }; fishnet = callPackage ../servers/fishnet { }; @@ -776,7 +778,7 @@ with pkgs; protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { }; protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; @@ -1100,7 +1102,7 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { @@ -1109,7 +1111,7 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; @@ -2527,7 +2529,9 @@ with pkgs; lab = callPackage ../applications/version-management/lab { }; - labctl = callPackage ../tools/networking/labctl { }; + labctl = callPackage ../tools/networking/labctl { + buildGoModule = buildGo120Module; + }; lefthook = callPackage ../applications/version-management/lefthook { }; @@ -2698,7 +2702,7 @@ with pkgs; gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; goldberg-emu = callPackage ../applications/emulators/goldberg-emu { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; gopsuinfo = callPackage ../tools/system/gopsuinfo { }; @@ -2863,7 +2867,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; stdenv = - if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv + if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; }; @@ -4178,7 +4182,7 @@ with pkgs; amoco = callPackage ../tools/security/amoco { }; anbox = callPackage ../os-specific/linux/anbox { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; androidenv = callPackage ../development/mobile/androidenv { }; @@ -4730,7 +4734,7 @@ with pkgs; common-licenses = callPackage ../data/misc/common-licenses { }; compactor = callPackage ../applications/networking/compactor { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; consul = callPackage ../servers/consul { }; @@ -5541,7 +5545,7 @@ with pkgs; ghdorker = callPackage ../tools/security/ghdorker { }; ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; ghidra-bin = callPackage ../tools/security/ghidra { }; @@ -5779,7 +5783,9 @@ with pkgs; joystickwake = callPackage ../tools/games/joystickwake { }; - juce = darwin.apple_sdk_11_0.callPackage ../development/misc/juce { }; + juce = callPackage ../development/misc/juce { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; jumppad = callPackage ../tools/virtualization/jumppad { }; @@ -5977,10 +5983,6 @@ with pkgs; merriweather-sans = callPackage ../data/fonts/merriweather-sans { }; - meson = callPackage ../development/tools/build-managers/meson { - inherit (darwin.apple_sdk.frameworks) Foundation OpenGL AppKit Cocoa; - }; - # while building documentation meson may want to run binaries for host # which needs an emulator # example of an error which this fixes @@ -6000,7 +6002,7 @@ with pkgs; # outer level, but not its outPath can still be evaluated if the condition # doesn't hold. This ensures that splicing still can work correctly. (if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then - ../development/tools/build-managers/meson/emulator-hook.sh + ../by-name/me/meson/emulator-hook.sh else throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression."); @@ -6791,6 +6793,7 @@ with pkgs; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; cdrtools = callPackage ../tools/cd-dvd/cdrtools { + stdenv = if stdenv.isDarwin then overrideLibcxx llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; @@ -6862,7 +6865,7 @@ with pkgs; clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; @@ -6871,7 +6874,7 @@ with pkgs; circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; - circus = with python3Packages; toPythonApplication circus; + circus = with python310Packages; toPythonApplication circus; cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; @@ -7067,7 +7070,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_21.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf_21.overrideDerivation (_: { stdenv = clangStdenv; }); }; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; @@ -8461,8 +8464,6 @@ with pkgs; fornalder = callPackage ../applications/version-management/fornalder { }; - free42 = callPackage ../applications/misc/free42 { }; - galen = callPackage ../development/tools/galen { }; gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; @@ -9305,7 +9306,10 @@ with pkgs; stdenv = gcc8Stdenv; }; - hylafaxplus = callPackage ../servers/hylafaxplus { }; + hylafaxplus = callPackage ../servers/hylafaxplus { + # libtiff >= 4.6 dropped many executables needed by hylafaxplus + libtiff = libtiff_4_5; + }; hyphen = callPackage ../development/libraries/hyphen { }; @@ -9829,9 +9833,6 @@ with pkgs; kluctl = callPackage ../applications/networking/cluster/kluctl { }; - kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; - kibana = kibana7; - kibi = callPackage ../applications/editors/kibi { }; kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; @@ -9882,7 +9883,11 @@ with pkgs; kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; - kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { + buildGoModule = buildGo120Module; + }; + + kubedock = callPackage ../development/tools/kubedock { }; kubepug = callPackage ../development/tools/kubepug { }; @@ -9987,6 +9992,8 @@ with pkgs; lldpd = callPackage ../tools/networking/lldpd { }; + llm = with python3Packages; toPythonApplication llm; + lnav = callPackage ../tools/misc/lnav { }; lnch = callPackage ../tools/misc/lnch { }; @@ -10169,6 +10176,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-footnote = callPackage ../tools/text/mdbook-footnote { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdcat = callPackage ../tools/text/mdcat { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; inherit (python3Packages) ansi2html; @@ -10268,7 +10279,7 @@ with pkgs; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; netdataCloud = netdata.override { withCloud = !stdenv.isDarwin; @@ -10306,15 +10317,6 @@ with pkgs; nodejs-slim = nodejs-slim_18; corepack = hiPrio corepack_18; - nodejs_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; }; - nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix { - openssl = openssl_1_1; - enableNpm = false; - }; - - nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; corepack_18 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_18; }); @@ -11414,7 +11416,7 @@ with pkgs; nq = callPackage ../tools/system/nq { }; nsjail = callPackage ../tools/security/nsjail { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { }; @@ -11544,7 +11546,7 @@ with pkgs; oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { @@ -11570,7 +11572,9 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { }; + ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { + buildGoModule = buildGo120Module; + }; openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; @@ -11641,10 +11645,6 @@ with pkgs; openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { }; - openrussian-cli = callPackage ../misc/openrussian-cli { - lua = lua5_3; - }; - opensbi = callPackage ../misc/opensbi { }; opensc = callPackage ../tools/security/opensc { @@ -11815,7 +11815,7 @@ with pkgs; p3x-onenote = callPackage ../applications/office/p3x-onenote { }; p4c = callPackage ../development/compilers/p4c { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; p7zip = callPackage ../tools/archivers/p7zip { }; @@ -11915,7 +11915,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; percona-xtrabackup = percona-xtrabackup_8_0; percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { @@ -12504,6 +12504,8 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + qlog = qt6Packages.callPackage ../applications/radio/qlog { }; + qnial = callPackage ../development/interpreters/qnial { }; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; @@ -13921,8 +13923,6 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tinycompress = callPackage ../development/libraries/tinycompress { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; @@ -14505,9 +14505,7 @@ with pkgs; SDL = SDL_sixel; }; - vtm = callPackage ../tools/misc/vtm { - stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; - }; + vtm = callPackage ../tools/misc/vtm { }; witness = callPackage ../tools/security/witness { }; @@ -15037,9 +15035,7 @@ with pkgs; clipnotify = callPackage ../tools/misc/clipnotify { }; - clipboard-jh = callPackage ../tools/misc/clipboard-jh { - stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; - }; + clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; clipbuzz = callPackage ../tools/misc/clipbuzz { }; @@ -15202,7 +15198,7 @@ with pkgs; zasm = callPackage ../development/compilers/zasm { }; zbackup = callPackage ../tools/backup/zbackup { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; zbar = libsForQt5.callPackage ../tools/graphics/zbar { @@ -15263,7 +15259,9 @@ with pkgs; zip = callPackage ../tools/archivers/zip { }; - zincsearch = callPackage ../servers/search/zincsearch { }; + zincsearch = callPackage ../servers/search/zincsearch { + buildGoModule = buildGo120Module; + }; zkfuse = callPackage ../tools/filesystems/zkfuse { }; @@ -15645,7 +15643,6 @@ with pkgs; }; clang = llvmPackages.clang; - clang_5 = llvmPackages_5.clang; clang_6 = llvmPackages_6.clang; clang_7 = llvmPackages_7.clang; clang_8 = llvmPackages_8.clang; @@ -15662,10 +15659,6 @@ with pkgs; llvmPackages = llvmPackages_14; }; - clang-tools_5 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_5; - }; - clang-tools_6 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_6; }; @@ -16598,7 +16591,6 @@ with pkgs; }; lld = llvmPackages.lld; - lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; lld_8 = llvmPackages_8.lld; @@ -16612,7 +16604,6 @@ with pkgs; lld_16 = llvmPackages_16.lld; lldb = lldb_14; - lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; lldb_8 = llvmPackages_8.lldb; @@ -16626,7 +16617,6 @@ with pkgs; lldb_16 = llvmPackages_16.lldb; llvm = llvmPackages.llvm; - llvm_5 = llvmPackages_5.llvm; llvm_6 = llvmPackages_6.llvm; llvm_7 = llvmPackages_7.llvm; llvm_8 = llvmPackages_8.llvm; @@ -16646,11 +16636,11 @@ with pkgs; # This returns the minimum supported version for the platform. The # assumption is that or any later version is good. choose = platform: - /**/ if platform.isDarwin then 11 + /**/ if platform.isDarwin then 16 else if platform.isFreeBSD then 12 else if platform.isAndroid then 12 - else if platform.isLinux then 11 - else if platform.isWasm then 12 + else if platform.isLinux then 16 + else if platform.isWasm then 16 else 14; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then @@ -16659,13 +16649,6 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_5.tools; - targetLlvm = targetPackages.llvmPackages_5.llvm or llvmPackages_5.llvm; - targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries; - }); - llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; @@ -16932,11 +16915,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_72 = callPackage ../development/compilers/rust/1_72.nix { + rust_1_73 = callPackage ../development/compilers/rust/1_73.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_16 = llvmPackages_16.libllvm; }; - rust = rust_1_72; + rust = rust_1_73; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16944,8 +16927,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_72 = rust_1_72.packages.stable; - rustPackages = rustPackages_1_72; + rustPackages_1_73 = rust_1_73.packages.stable; + rustPackages = rustPackages_1_73; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -17005,7 +16988,12 @@ with pkgs; cargo-clone = callPackage ../development/tools/rust/cargo-clone { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { }; + cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { + rustPlatform = makeRustPlatform { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit rustc cargo; + }; + }; cargo-component = callPackage ../development/tools/rust/cargo-component { }; cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; @@ -17296,7 +17284,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; }; - squeak = callPackage ../development/compilers/squeak { }; + squeak = callPackage ../development/compilers/squeak { + stdenv = clangStdenv; + }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { drivers = [ jtds_jdbc mssql_jdbc mysql_jdbc postgresql_jdbc ]; @@ -17754,7 +17744,7 @@ with pkgs; ### End of CuboCore maude = callPackage ../development/interpreters/maude { - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }; me_cleaner = callPackage ../tools/misc/me_cleaner { }; @@ -18031,14 +18021,13 @@ with pkgs; inherit (darwin) libobjc; }; - inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libobjc libunwind; - inherit (darwin.apple_sdk_11_0.frameworks) Foundation; + inherit (darwin.apple_sdk.frameworks) Foundation; }) mkRubyVersion mkRuby ruby_2_7 - ruby_3_0 ruby_3_1 ruby_3_2 ruby_3_3; @@ -18047,7 +18036,6 @@ with pkgs; rubyPackages = rubyPackages_3_1; rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; - rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems; rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems; rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems; rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems; @@ -18170,9 +18158,9 @@ with pkgs; # Needed for autogen guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile_2_2 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/2.2.nix { }; + guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { }; - guile_3_0 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/3.0.nix { }; + guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; guile = guile_3_0; @@ -18332,6 +18320,8 @@ with pkgs; teller = callPackage ../development/tools/teller { }; + yakut = python3Packages.callPackage ../development/tools/misc/yakut { }; + ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; @@ -18892,11 +18882,9 @@ with pkgs; ctmg = callPackage ../tools/security/ctmg { }; - cmake = callPackage ../development/tools/build-managers/cmake { }; - # can't use override - it triggers infinite recursion - cmakeMinimal = callPackage ../development/tools/build-managers/cmake { - isBootstrap = true; + cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix { + isMinimalBuild = true; }; cmakeCurses = cmake.override { @@ -19643,7 +19631,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; mold = callPackage ../development/tools/mold { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_13.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; tbb = tbb_2021_8; }; @@ -19862,8 +19850,7 @@ with pkgs; qtcreator = qt6Packages.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; - stdenv = llvmPackages_14.stdenv; - llvmPackages = llvmPackages_14; + stdenv = llvmPackages.stdenv; }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -20010,8 +19997,10 @@ with pkgs; sca2d = callPackage ../development/tools/sca2d { }; - sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); - scons = sconsPackages.scons_latest; + scons = scons_4_5_2; + scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { }; + scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { }; + scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { }; mill = callPackage ../development/tools/build-managers/mill { }; @@ -20111,12 +20100,12 @@ with pkgs; }; spoofer = callPackage ../tools/networking/spoofer { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; spoofer-gui = callPackage ../tools/networking/spoofer { withGUI = true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; spooles = callPackage ../development/libraries/science/math/spooles { }; @@ -20461,10 +20450,30 @@ with pkgs; aalib = callPackage ../development/libraries/aalib { }; - abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; - abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { }; - abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { }; - abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { }; + abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202206 = callPackage ../development/libraries/abseil-cpp/202206.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202301 = callPackage ../development/libraries/abseil-cpp/202301.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; + abseil-cpp_202308 = callPackage ../development/libraries/abseil-cpp/202308.nix { + # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib. + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; abseil-cpp = abseil-cpp_202301; accountsservice = callPackage ../development/libraries/accountsservice { }; @@ -20859,7 +20868,7 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; codecserver = callPackage ../applications/audio/codecserver { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; coeurl = callPackage ../development/libraries/coeurl { }; @@ -21153,7 +21162,6 @@ with pkgs; fancypp = callPackage ../development/libraries/fancypp { }; far2l = callPackage ../applications/misc/far2l { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System; }; @@ -21373,7 +21381,7 @@ with pkgs; gallia = callPackage ../tools/security/gallia { }; gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; game-music-emu = callPackage ../development/libraries/audio/game-music-emu { }; @@ -21411,7 +21419,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - gensio = callPackage ../development/libraries/gensio { }; + gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { }; geoclue2 = callPackage ../development/libraries/geoclue { }; @@ -21438,7 +21446,9 @@ with pkgs; geomyidae = callPackage ../applications/networking/gopher/geomyidae { }; - geos = callPackage ../development/libraries/geos { }; + geos = callPackage ../development/libraries/geos { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; + }; geos39 = callPackage ../development/libraries/geos/3.9.nix { }; @@ -21750,7 +21760,11 @@ with pkgs; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; - grpc = callPackage ../development/libraries/grpc { }; + grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc { + stdenv = if stdenv.isDarwin && stdenv.isx86_64 + then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; } + else stdenv; + }; gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; @@ -22001,8 +22015,6 @@ with pkgs; hidapi = callPackage ../development/libraries/hidapi { inherit (darwin.apple_sdk.frameworks) Cocoa IOKit; - # TODO: remove once `udev` is `systemdMinimal` everywhere. - udev = systemdMinimal; }; highfive = callPackage ../development/libraries/highfive { }; @@ -22350,7 +22362,9 @@ with pkgs; lerc = callPackage ../development/libraries/lerc { }; - lib2geom = callPackage ../development/libraries/lib2geom { }; + lib2geom = callPackage ../development/libraries/lib2geom { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; + }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -22552,8 +22566,6 @@ with pkgs; libcint = callPackage ../development/libraries/libcint { }; - libclc = callPackage ../development/libraries/libclc { }; - libcli = callPackage ../development/libraries/libcli { }; libclthreads = callPackage ../development/libraries/libclthreads { }; @@ -22710,9 +22722,7 @@ with pkgs; libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { - udev = systemdMinimal; - }; + libfido2 = callPackage ../development/libraries/libfido2 {}; libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; @@ -22735,6 +22745,8 @@ with pkgs; libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { }; + libfprint-2-tod1-elan = callPackage ../development/libraries/libfprint-2-tod1-elan { }; + libfpx = callPackage ../development/libraries/libfpx { }; libgadu = callPackage ../development/libraries/libgadu { }; @@ -23397,7 +23409,7 @@ with pkgs; libptytty = callPackage ../development/libraries/libptytty { }; libpulsar = callPackage ../development/libraries/libpulsar { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; libpwquality = callPackage ../development/libraries/libpwquality { @@ -23502,6 +23514,7 @@ with pkgs; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; libtiff = callPackage ../development/libraries/libtiff { }; + libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -23510,7 +23523,6 @@ with pkgs; libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) SystemConfiguration; python = python3; }; @@ -23590,8 +23602,6 @@ with pkgs; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit Security; - # TODO: remove once `udev` is `systemdMinimal` everywhere. - udev = systemdMinimal; }; libusbgx = callPackage ../development/libraries/libusbgx { }; @@ -24386,9 +24396,10 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_3_6 - libressl_3_7; + libressl_3_7 + libressl_3_8; - libressl = libressl_3_7; + libressl = libressl_3_8; boringssl = callPackage ../development/libraries/boringssl { }; @@ -24404,7 +24415,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 - openssl_3; + openssl_3 + openssl_3_1; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -24546,7 +24558,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = 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 { }; @@ -24559,13 +24573,14 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_24; + protobuf = protobuf_24; - protobuf3_24 = callPackage ../development/libraries/protobuf/3.24.nix { }; - protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { }; - protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.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 { abseil-cpp = abseil-cpp_202103; }; + protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { abseil-cpp = abseil-cpp_202103; }; @@ -24622,14 +24637,15 @@ with pkgs; inherit (__splicedPackages) makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper bison cups dconf harfbuzz libGL perl gtk3 python3 + llvmPackages_15 overrideSDK overrideLibcxx darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; }); # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop @@ -24739,7 +24755,7 @@ with pkgs; qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; qradiolink = callPackage ../applications/radio/qradiolink { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -25410,7 +25426,16 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; + v8 = callPackage ../development/libraries/v8 ( + let + stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" + then overrideLibcxx llvmPackages_15.stdenv + else stdenv; + in + { + stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; + } + ); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -25422,7 +25447,7 @@ with pkgs; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; - protobuf = protobuf3_21.override { + protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; }; @@ -25656,8 +25681,6 @@ with pkgs; xsimd = callPackage ../development/libraries/xsimd { }; - xsimd10 = callPackage ../development/libraries/xsimd/10.nix { }; - xtensor = callPackage ../development/libraries/xtensor { }; xtl = callPackage ../development/libraries/xtl { }; @@ -26248,7 +26271,7 @@ with pkgs; clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; @@ -26520,12 +26543,16 @@ with pkgs; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; - jetty = callPackage ../servers/http/jetty { }; + jetty = jetty_12; + jetty_12 = callPackage ../servers/http/jetty/12.x.nix { }; + jetty_11 = callPackage ../servers/http/jetty/11.x.nix { }; jibri = callPackage ../servers/jibri { }; jicofo = callPackage ../servers/jicofo { }; + jitsi-excalidraw = callPackage ../servers/jitsi-excalidraw { }; + jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; @@ -26587,7 +26614,10 @@ with pkgs; maker-panel = callPackage ../tools/misc/maker-panel { }; - mastodon = callPackage ../servers/mastodon { }; + mastodon = callPackage ../servers/mastodon { + nodejs-slim = nodejs-slim_20; + ruby = ruby_3_2; + }; gotosocial = callPackage ../servers/gotosocial { }; @@ -26894,7 +26924,6 @@ with pkgs; inherit (import ../servers/sql/mariadb pkgs) mariadb_105 mariadb_106 - mariadb_1010 mariadb_1011 mariadb_110 ; @@ -26950,7 +26979,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. icu = icu69; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -27235,7 +27264,7 @@ with pkgs; rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = darwin.cctools; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; rippled = callPackage ../servers/rippled { @@ -27574,19 +27603,9 @@ with pkgs; alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { }; - tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - - alsa-project = callPackage ../os-specific/linux/alsa-project { }; - inherit (alsa-project) - alsa-firmware - alsa-lib - alsa-oss - alsa-plugins - alsa-plugins-wrapper - alsa-tools - alsa-topology-conf - alsa-ucm-conf - alsa-utils; + alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix { + fftw = fftwFloat; + }; apparency = callPackage ../os-specific/darwin/apparency { }; @@ -27719,7 +27738,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk20.override { enableJavaFX = true; }; + jdk = jdk21.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -28060,14 +28079,6 @@ with pkgs; inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) linuxHeaders makeLinuxHeaders; - linuxHeaders_5_19 = linuxHeaders.overrideAttrs rec { - version = "5.19.16"; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - hash = "sha256-oeuvZn4QWa4tcqpjdKTW4v68C4zNpqEkaHrMLqlh4I0="; - }; - }; - klibc = callPackage ../os-specific/linux/klibc { }; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); @@ -28108,6 +28119,7 @@ with pkgs; linuxPackages_testing = linuxKernel.packages.linux_testing; linux_testing = linuxKernel.kernels.linux_testing; + # FIXME: Remove and alias to `linux(Packages)_testing`` after 23.11 is released linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; @@ -28229,10 +28241,6 @@ with pkgs; lsscsi = callPackage ../os-specific/linux/lsscsi { }; lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix { - # udev is the same package as systemd which depends on cryptsetup - # which depends on lvm2 again. But we only need the libudev part - # which does not depend on cryptsetup. - udev = systemdMinimal; # break the cyclic dependency: # util-linux (non-minimal) depends (optionally, but on by default) on systemd, # systemd (optionally, but on by default) on cryptsetup and cryptsetup depends on lvm2 @@ -28382,7 +28390,9 @@ with pkgs; goconst = callPackage ../development/tools/goconst { }; - goconvey = callPackage ../development/tools/goconvey { }; + goconvey = callPackage ../development/tools/goconvey { + buildGoModule = buildGo120Module; + }; go-callvis = callPackage ../development/tools/go-callvis { }; @@ -28440,7 +28450,9 @@ with pkgs; go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { }; - gomacro = callPackage ../development/tools/gomacro { }; + gomacro = callPackage ../development/tools/gomacro { + buildGoModule = buildGo120Module; + }; gomodifytags = callPackage ../development/tools/gomodifytags { }; @@ -28674,7 +28686,7 @@ with pkgs; sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { }; sgx-psw = callPackage ../os-specific/linux/sgx/psw { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; shadow = callPackage ../os-specific/linux/shadow { }; @@ -28762,6 +28774,7 @@ with pkgs; withResolved = false; withShellCompletions = false; withSysupdate = false; + withSysusers = false; withTimedated = false; withTimesyncd = false; withTpm2Tss = false; @@ -28769,11 +28782,14 @@ with pkgs; withUkify = false; withBootloader = false; }; - + systemdLibs = systemdMinimal.override { + pname = "systemd-minimal-libs"; + buildLibsOnly = true; + }; udev = if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero - else systemd; # TODO: change to systemdMinimal + else systemdLibs; systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -30137,6 +30153,12 @@ with pkgs; unscii = callPackage ../data/fonts/unscii { }; + utterly-nord-plasma = callPackage ../data/themes/utterly-nord-plasma { + inherit (libsForQt5) breeze-icons kdeclarative kirigami2 plasma-framework plasma-workspace; + }; + + utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { }; + uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { }; u001-font = callPackage ../data/fonts/u001 { }; @@ -30230,7 +30252,9 @@ with pkgs; dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; - grass = callPackage ../applications/gis/grass { }; + grass = callPackage ../applications/gis/grass { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; @@ -30446,7 +30470,7 @@ with pkgs; astroid = callPackage ../applications/networking/mailreaders/astroid { vim = vim-full.override { features = "normal"; }; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -30958,12 +30982,6 @@ with pkgs; cordless = callPackage ../applications/networking/instant-messengers/cordless { }; - cosmic-comp = callPackage ../applications/window-managers/cosmic/comp { }; - - cosmic-applets = callPackage ../applications/window-managers/cosmic/applets { }; - - cosmic-panel = callPackage ../applications/window-managers/cosmic/panel { }; - cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { }; cosmic-edit = callPackage ../applications/editors/cosmic-edit { }; @@ -31120,7 +31138,7 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker {}) docker_20_10 docker_24; - docker = docker_20_10; + docker = docker_24; docker-client = docker.override { clientOnly = true; }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -31402,7 +31420,9 @@ with pkgs; gigalixir = callPackage ../tools/misc/gigalixir { }; - go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { }; + go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { + buildGoModule = buildGo120Module; + }; go-motion = callPackage ../development/tools/go-motion { }; @@ -32273,10 +32293,7 @@ with pkgs; gpsprune = callPackage ../applications/misc/gpsprune { }; - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { - # rm me as soon as this package gains the support for cuda 11 - inherit (cudaPackages_10) cudatoolkit; - }; + gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; @@ -32465,7 +32482,7 @@ with pkgs; }; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; @@ -32510,8 +32527,6 @@ with pkgs; noson = libsForQt5.callPackage ../applications/audio/noson { }; - offpunk = callPackage ../applications/networking/browsers/offpunk { }; - owl-compositor = callPackage ../applications/window-managers/owl { }; p2pool = callPackage ../applications/misc/p2pool { }; @@ -33084,7 +33099,7 @@ with pkgs; CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; stdenv = if stdenv.isDarwin - then darwin.apple_sdk_11_0.stdenv + then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_12.stdenv else stdenv; # telegram-desktop has random crashes when jemalloc is built with gcc. @@ -33289,7 +33304,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; + stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; @@ -33423,9 +33438,7 @@ with pkgs; linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = callPackage ../applications/misc/llpp { - inherit (ocaml-ng.ocamlPackages_4_14) ocaml; - }; + llpp = callPackage ../applications/misc/llpp { }; lls = callPackage ../applications/networking/lls { }; @@ -33552,7 +33565,9 @@ with pkgs; markscribe = callPackage ../tools/text/markscribe { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { }; + magnetico = callPackage ../applications/networking/p2p/magnetico { + buildGoModule = buildGo120Module; + }; mastodon-bot = nodePackages.mastodon-bot; @@ -33629,7 +33644,7 @@ with pkgs; }; sapling = callPackage ../applications/version-management/sapling { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreGraphics CoreServices Security WebKit; }; mercurialFull = mercurial.override { fullBuild = true; }; @@ -33911,7 +33926,11 @@ with pkgs; normalize = callPackage ../applications/audio/normalize { }; - norouter = callPackage ../tools/networking/norouter { }; + norouter = callPackage ../tools/networking/norouter { + # doesn't build with go 1.21 + # https://github.com/norouter/norouter/issues/165 + buildGoModule = buildGo120Module; + }; nqptp = callPackage ../tools/networking/nqptp { }; @@ -33965,14 +33984,14 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf3_21; + protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -34051,8 +34070,6 @@ with pkgs; nwg-dock-hyprland = callPackage ../applications/misc/nwg-dock-hyprland { }; - nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; - nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-look = callPackage ../applications/misc/nwg-look { }; @@ -34074,9 +34091,9 @@ with pkgs; okteto = callPackage ../development/tools/okteto { }; onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { }; - onlyoffice-bin_7_4 = callPackage ../applications/office/onlyoffice-bin/7_4.nix { }; + onlyoffice-bin_7_5 = callPackage ../applications/office/onlyoffice-bin/7_5.nix { }; onlyoffice-bin = onlyoffice-bin_7_2; - onlyoffice-bin_latest = onlyoffice-bin_7_4; + onlyoffice-bin_latest = onlyoffice-bin_7_5; onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; @@ -34098,7 +34115,7 @@ with pkgs; osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; p4 = callPackage ../applications/version-management/p4 { @@ -34191,10 +34208,6 @@ with pkgs; roxctl = callPackage ../applications/networking/cluster/roxctl { }; - rqbit = callPackage ../applications/networking/p2p/rqbit { - inherit (darwin.apple_sdk.frameworks) Security; - }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; @@ -34204,7 +34217,7 @@ with pkgs; shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -34536,9 +34549,7 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; + orpie = callPackage ../applications/misc/orpie { }; osmo = callPackage ../applications/office/osmo { }; @@ -34567,7 +34578,7 @@ with pkgs; osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { }; osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server { - protobuf = protobuf3_21.override { + protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; }; @@ -35091,7 +35102,7 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; ries = callPackage ../applications/science/math/ries { }; @@ -35417,7 +35428,7 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35700,7 +35711,11 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; - telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { }; + telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv "11.0" + else stdenv; + }; telegram-bot-api = callPackage ../servers/telegram-bot-api { }; @@ -35746,6 +35761,8 @@ with pkgs; texture-synthesis = callPackage ../tools/graphics/texture-synthesis { }; + texturepacker = qt6.callPackage ../applications/graphics/texturepacker { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; termtosvg = callPackage ../tools/misc/termtosvg { }; @@ -35810,7 +35827,7 @@ with pkgs; tijolo = callPackage ../applications/editors/tijolo { }; tilemaker = callPackage ../applications/misc/tilemaker { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -36023,9 +36040,7 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; - }; + ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -36315,13 +36330,6 @@ with pkgs; inherit (nodePackages) node-gyp; }; - code-server = callPackage ../servers/code-server { - nodejs = nodejs_16; - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security; - inherit (darwin) cctools; - inherit (nodePackages) node-gyp; - }; - vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { @@ -36416,13 +36424,17 @@ with pkgs; webex = callPackage ../applications/networking/instant-messengers/webex { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { }; + webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { + stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; + }; websploit = python3Packages.callPackage ../tools/security/websploit { }; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { + electron = electron_27; + }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -37011,11 +37023,11 @@ with pkgs; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { withGui = true; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { mkDerivation = stdenv.mkDerivation; - protobuf = protobuf3_21; + protobuf = protobuf_21; withGui = false; }; @@ -37038,7 +37050,9 @@ with pkgs; dcrctl = callPackage ../applications/blockchains/dcrctl { }; dcrd = callPackage ../applications/blockchains/dcrd { }; - dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; + dcrwallet = callPackage ../applications/blockchains/dcrwallet { + buildGoModule = buildGo120Module; + }; dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { withGui = true; @@ -37378,13 +37392,31 @@ with pkgs; rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { }; slade = callPackage ../games/doom-ports/slade { - wxGTK = wxGTK32.override { + wxGTK = (wxGTK32.overrideAttrs { + patches = [ + (fetchpatch { # required to run slade 3.2.4 on wxGTK 3.2.4, see PR #266945 + url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch"; + excludes = [ "docs/changes.txt" ]; + revert = true; + hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM="; + }) + ]; + }).override { withWebKit = true; }; }; sladeUnstable = callPackage ../games/doom-ports/slade/git.nix { - wxGTK = wxGTK32.override { + wxGTK = (wxGTK32.overrideAttrs { + patches = [ + (fetchpatch { # required to run sladeUnstable unstable-2023-09-30 on wxGTK 3.2.4, see PR #266945 + url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch"; + excludes = [ "docs/changes.txt" ]; + revert = true; + hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM="; + }) + ]; + }).override { withWebKit = true; }; }; @@ -37491,6 +37523,8 @@ with pkgs; angband = callPackage ../games/angband { }; + animatch = callPackage ../games/animatch { }; + anki = callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio; }; @@ -37584,7 +37618,7 @@ with pkgs; ckan = callPackage ../games/ckan { }; cockatrice = libsForQt5.callPackage ../games/cockatrice { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; commandergenius = callPackage ../games/commandergenius { }; @@ -37625,6 +37659,9 @@ with pkgs; deliantra-server = callPackage ../games/deliantra/server.nix { stdenv = gcc10StdenvCompat; + # perl538 defines 'struct object' in sv.h. many conflicts result + perl = perl536; + perlPackages = perl536Packages; }; deliantra-arch = callPackage ../games/deliantra/arch.nix { stdenv = gcc10StdenvCompat; @@ -37639,6 +37676,7 @@ with pkgs; ddnet = callPackage ../games/ddnet { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL Security; }; + ddnet-server = ddnet.override { buildClient = false; }; ddns-go = callPackage ../tools/networking/ddns-go { }; @@ -38177,12 +38215,12 @@ with pkgs; pong3d = callPackage ../games/pong3d { }; pokerth = libsForQt5.callPackage ../games/pokerth { - protobuf = protobuf3_21; + protobuf = protobuf_21; }; pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; - protobuf = protobuf3_21; + protobuf = protobuf_21; }; pokete = callPackage ../games/pokete { }; @@ -38275,7 +38313,6 @@ with pkgs; scid-vs-pc = callPackage ../games/scid-vs-pc { }; scummvm = callPackage ../games/scummvm { - stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; }; @@ -38426,6 +38463,7 @@ with pkgs; teeworlds = callPackage ../games/teeworlds { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + teeworlds-server = teeworlds.override { buildClient = false; }; tengine = callPackage ../servers/http/tengine { modules = with nginxModules; [ rtmp dav moreheaders modsecurity ]; @@ -39270,7 +39308,7 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; - protobuf = protobuf3_21; + protobuf = protobuf_21; # or-tools builds with -std=c++20, so abseil-cpp must # also be built that way abseil-cpp = abseil-cpp_202206.override { @@ -39670,7 +39708,9 @@ with pkgs; btor2tools = callPackage ../applications/science/logic/btor2tools { }; - boolector = callPackage ../applications/science/logic/boolector { }; + boolector = callPackage ../applications/science/logic/boolector { + stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; + }; bitwuzla = callPackage ../applications/science/logic/bitwuzla { }; @@ -39752,6 +39792,8 @@ with pkgs; with3d = false; }; + kicadAddons = recurseIntoAttrs (callPackage ../applications/science/electronics/kicad/addons {}); + librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; ngspice = libngspice.override { @@ -39957,7 +39999,7 @@ with pkgs; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_7.stdenv else stdenv; }); rinetd = callPackage ../servers/rinetd { }; @@ -40176,6 +40218,10 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver; + + dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper; + dcp9020cdwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).driver; dcp9020cdw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp9020cdw { }).cupswrapper; @@ -40990,6 +41036,9 @@ with pkgs; hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; + mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { }; + mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { }; + mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { }; @@ -41236,8 +41285,6 @@ with pkgs; usb-reset = callPackage ../applications/misc/usb-reset { }; - usql = callPackage ../applications/misc/usql { }; - utf8cpp = callPackage ../development/libraries/utf8cpp { }; utf8proc = callPackage ../development/libraries/utf8proc { }; @@ -41405,7 +41452,7 @@ with pkgs; wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; inherit (callPackage ../servers/web-apps/wordpress {}) - wordpress wordpress6_3; + wordpress wordpress6_3 wordpress6_4; wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; @@ -41934,7 +41981,7 @@ with pkgs; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { - wlroots = wlroots_0_15; + wlroots = wlroots_0_16; }; psftools = callPackage ../os-specific/linux/psftools { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 5e25231d957c7..aa3a235553ef2 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -123,6 +123,12 @@ let feature = "build packages with CUDA support by default"; }; + rocmSupport = mkMassRebuild { + type = types.bool; + default = false; + feature = "build packages with ROCm support by default"; + }; + showDerivationWarnings = mkOption { type = types.listOf (types.enum [ "maintainerless" ]); default = []; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index bc35b20656976..2547b0c81cca9 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -13,6 +13,11 @@ let # default. targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + + # Bootstrap `fetchurl` needed to build SDK packages without causing an infinite recursion. + fetchurlBoot = import ../build-support/fetchurl/boot.nix { + inherit (stdenv) system; + }; in makeScopeWithSplicing' { @@ -32,10 +37,13 @@ makeScopeWithSplicing' { apple_sdk_10_12 = pkgs.callPackage ../os-specific/darwin/apple-sdk { inherit (buildPackages.darwin) print-reexports; inherit (self) darwin-stubs; + fetchurl = fetchurlBoot; }; # macOS 11.0 SDK - apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { }; + apple_sdk_11_0 = pkgs.callPackage ../os-specific/darwin/apple-sdk-11.0 { + fetchurl = fetchurlBoot; + }; # Pick an SDK apple_sdk = if stdenv.hostPlatform.isAarch64 then apple_sdk_11_0 else apple_sdk_10_12; @@ -192,26 +200,29 @@ impure-cmds // appleSourcePackages // chooseLibs // { CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; - # TODO: make swift-corefoundation build with apple_sdk_11_0.Libsystem - CF = if useAppleSDKLibs - then - # This attribute (CF) is included in extraBuildInputs in the stdenv. This - # is typically the open source project. When a project refers to - # "CoreFoundation" it has an extra setup hook to force impure system - # CoreFoundation into the link step. - # - # In this branch, we only have a single "CoreFoundation" to choose from. - # To be compatible with the existing convention, we define - # CoreFoundation with the setup hook, and CF as the same package but - # with the setup hook removed. - # - # This may seem unimportant, but without it packages (e.g., bacula) will - # fail with linker errors referring ___CFConstantStringClassReference. - # It's not clear to me why some packages need this extra setup. - lib.overrideDerivation apple_sdk.frameworks.CoreFoundation (drv: { - setupHook = null; - }) - else callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; + # TODO: Remove the CF hook if a solution to the crashes is not found. + CF = + # CF used to refer to the open source version of CoreFoundation from the Swift + # project. As of macOS 14, the rpath-based approach allowing packages to choose + # which version to use no longer seems to work reliably. Sometimes they works, + # but sometimes they crash with the error (in the system crash logs): + # CF objects must have a non-zero isa. + # See https://developer.apple.com/forums/thread/739355 for more on that error. + # + # In this branch, we only have a single "CoreFoundation" to choose from. + # To be compatible with the existing convention, we define + # CoreFoundation with the setup hook, and CF as the same package but + # with the setup hook removed. + # + # This may seem unimportant, but without it packages (e.g., bacula) will + # fail with linker errors referring ___CFConstantStringClassReference. + # It's not clear to me why some packages need this extra setup. + lib.overrideDerivation apple_sdk.frameworks.CoreFoundation (drv: { + setupHook = null; + }); + + # Formerly the CF attribute. Use this is you need the open source release. + swift-corelibs-foundation = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0b970cb44f042..b8f11100d39cd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,37 +1,12 @@ { buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }: let - # These are attributes in compiler and packages that don't support integer-simple. - integerSimpleExcludes = [ - "ghc865Binary" - "ghc8102Binary" - "ghc8107Binary" - "ghc924Binary" - "ghcjs" - "ghcjs810" - "integer-simple" - "native-bignum" - "ghc902" - "ghc90" - "ghc924" - "ghc925" - "ghc926" - "ghc927" - "ghc928" - "ghc92" - "ghc942" - "ghc943" - "ghc944" - "ghc945" - "ghc946" - "ghc947" - "ghc94" - "ghc96" - "ghc962" - "ghc963" - "ghc981" - "ghc98" - "ghcHEAD" + # These are attributes in compiler that support integer-simple. + integerSimpleIncludes = [ + "ghc88" + "ghc884" + "ghc810" + "ghc8107" ]; nativeBignumIncludes = [ @@ -50,6 +25,7 @@ let "ghc945" "ghc946" "ghc947" + "ghc948" "ghc96" "ghc962" "ghc963" @@ -363,7 +339,31 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc94 = compiler.ghc947; + ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { + bootPkgs = + # Building with 9.2 is broken due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* + if stdenv.hostPlatform.isAarch then + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc902 + else + packages.ghc8107Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; + ghc94 = compiler.ghc948; ghc962 = callPackage ../development/compilers/ghc/9.6.2.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -437,7 +437,7 @@ in { # build with integer-simple instead of integer-gmp. integer-simple = let integerSimpleGhcNames = pkgs.lib.filter - (name: ! builtins.elem name integerSimpleExcludes) + (name: builtins.elem name integerSimpleIncludes) (pkgs.lib.attrNames compiler); in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames @@ -558,7 +558,12 @@ in { ghc = bh.compiler.ghc947; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; }; - ghc94 = packages.ghc947; + ghc948 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc948; + ghc = bh.compiler.ghc948; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; + ghc94 = packages.ghc948; ghc962 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc962; ghc = bh.compiler.ghc962; @@ -595,7 +600,7 @@ in { integer-simple = let integerSimpleGhcNames = pkgs.lib.filter - (name: ! builtins.elem name integerSimpleExcludes) + (name: builtins.elem name integerSimpleIncludes) (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a997b12325efa..12ad5a678f213 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -201,17 +201,12 @@ in { then latest else testing; + # FIXME: Remove after 23.11 is released linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.4"; - }; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.dell_xps_regression - ]; - }; + kernel = linux_6_5; + kernelPatches = linux_6_5.kernelPatches; + }; # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 @@ -387,6 +382,8 @@ in { lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; + mstflint_access = callPackage ../os-specific/linux/mstflint_access { }; + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; tbs = callPackage ../os-specific/linux/tbs { }; @@ -616,6 +613,7 @@ in { # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linux_testing = packagesFor kernels.linux_testing; + # FIXME: Remove after 23.11 is released linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 635a8d71c2e2a..516db732bc43c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1046,6 +1046,8 @@ let merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { }; + metadata = callPackage ../development/ocaml-modules/metadata { }; + metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -1604,6 +1606,8 @@ let ringo = callPackage ../development/ocaml-modules/ringo { }; + riot = callPackage ../development/ocaml-modules/riot { }; + rock = callPackage ../development/ocaml-modules/rock { }; rope = callPackage ../development/ocaml-modules/rope { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 79be645162ea7..b1c436d1ccf2b 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -20,7 +20,6 @@ quicklispPackagesSBCL rPackages roundcubePlugins - sconsPackages sourceHanPackages steamPackages ut2004Packages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a0db7fa21656..639bc2ae5d8a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -190,10 +190,10 @@ with self; { AlgorithmCheckDigits = buildPerlModule { pname = "Algorithm-CheckDigits"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; - hash = "sha256-qVbQUXGA1tkEL0fXOqaicot1/L1UaUDS2+Cn589Cj3M="; + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.6.tar.gz"; + hash = "sha256-DySHqP0fMbGcUbJlCELyJkwed9liSHoTtSG74GbEtLw="; }; buildInputs = [ ProbePerl ]; meta = { @@ -248,10 +248,10 @@ with self; { AlienBaseModuleBuild = buildPerlModule { pname = "Alien-Base-ModuleBuild"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz"; - hash = "sha256-E8lDLPQbNMsU3yRUoD5UDivV3J65yCgktq0PTGd5Ov0="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.17.tar.gz"; + hash = "sha256-/nJwrHNa3ehk5GjiHGQqRxuoi6Ja0w2pRXiDITLyufQ="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; @@ -264,10 +264,10 @@ with self; { AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "2.37"; + version = "2.80"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.37.tar.gz"; - hash = "sha256-MAC8vphIJkP3a7z/zkL9SPJMY6ZFf4qiwWlfSBrJ7VE="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.80.tar.gz"; + hash = "sha256-2e3JNrBnBbtcte5aLqi89hEaPogVkU8XfhXjwP7TAfM="; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; @@ -278,6 +278,22 @@ with self; { }; }; + AlienBuildPluginDownloadGitLab = buildPerlPackage { + pname = "Alien-Build-Plugin-Download-GitLab"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-Plugin-Download-GitLab-0.01.tar.gz"; + hash = "sha256-wfCJyOoVKniZCdSKg9v88mJvdz2vMEMchiJYKyarqQI="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ AlienBuild PathTiny URI ]; + meta = { + homepage = "https://metacpan.org/pod/Alien::Build::Plugin::Download::GitLab"; + description = "Alien::Build plugin to download from GitLab"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienFFI = buildPerlPackage { pname = "Alien-FFI"; version = "0.27"; @@ -331,15 +347,15 @@ with self; { AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz"; - hash = "sha256-c7RSRPC1w25TMsM1abgqGrLDPiY/HQB4XSADvK7GjbM="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.19.tar.gz"; + hash = "sha256-9KZ0CZu9V0fAw7derYQfOyRJNdnvQro1NoAkvWERdMk="; }; strictDeps = true; nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; + buildInputs = [ pkgs.libxml2 AlienBuildPluginDownloadGitLab MojoDOM58 SortVersions Test2Suite URI ]; meta = { description = "Install the C libxml2 library on your system"; homepage = "https://metacpan.org/pod/Alien::Libxml2"; @@ -434,10 +450,10 @@ with self; { Alienm4 = buildPerlPackage { pname = "Alien-m4"; - version = "0.19"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.19.tar.gz"; - hash = "sha256-SdvvZKGoDGtKc3T85ovix+6eZdHA3/Uxw5u1lBRG0PY="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-m4-0.21.tar.gz"; + hash = "sha256-qypAXIA5RP0BxR+h6fK+/VhxqwPxdE3sKlZonyFI02E="; }; propagatedBuildInputs = [ AlienBuild ]; buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; @@ -654,10 +670,10 @@ with self; { ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; - version = "3.30"; + version = "3.31"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.30.tar.gz"; - hash = "sha256-H3G5TT1VqVCksy2uTpD252yBV1CKfiruUGIbF5qtsfs="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.31.tar.gz"; + hash = "sha256-ByhnLrmLzWZSWWenXXxNYXwLTEEWIBOsmkzv5G99/3w="; }; buildInputs = [ ApacheTest ]; propagatedBuildInputs = [ ClassLoad HTTPBody HashMultiValue WWWFormUrlEncoded ]; @@ -720,10 +736,10 @@ with self; { ApacheTest = buildPerlPackage { pname = "Apache-Test"; - version = "1.42"; + version = "1.43"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz"; - hash = "sha256-BoHwfX2KlCnQ7fioxa1qZVvn/oGtoUJnCyuOd2s7s+s="; + url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.43.tar.gz"; + hash = "sha256-qZmfAqeBpYkhi1ibGHnBHEladFrwlXXly7It/LZWgKw="; }; doCheck = false; meta = { @@ -734,10 +750,10 @@ with self; { AppCLI = buildPerlPackage { pname = "App-CLI"; - version = "0.50"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz"; - hash = "sha256-UdP1gzq1GftG5VUrYOVFXk+cHGgn0e7kFT0LQJ8qk0U="; + url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.52.tar.gz"; + hash = "sha256-Ur1D9VWRPML/1kBfmVHSqr1Gr2PXAdm140amMycJ8M4="; }; propagatedBuildInputs = [ CaptureTiny ClassLoad ]; buildInputs = [ TestKwalitee TestPod ]; @@ -756,7 +772,7 @@ with self; { }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; buildInputs = [ DataDump FileWhich Readonly TestDifferences TestTrap ]; - preCheck = "rm t/30cluster.t"; # do not run failing tests + preCheck = "rm t/30cluster.t t/15config.t"; # do not run failing tests postInstall = '' mkdir -p $out/share/bash-completion/completions mv $out/bin/clusterssh_bash_completion.dist \ @@ -776,10 +792,10 @@ with self; { AppCmd = buildPerlPackage { pname = "App-Cmd"; - version = "0.331"; + version = "0.336"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz"; - hash = "sha256-Sl098ABr0niIDQH0lXqqZSqPkf6PZuk633D7oMPstoA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.336.tar.gz"; + hash = "sha256-35ZrV9WauxluADBIheW/EXypWBgq4/Tu3xchjqKDjoE="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; @@ -820,10 +836,10 @@ with self; { Appcpanminus = buildPerlPackage { pname = "App-cpanminus"; - version = "1.7045"; + version = "1.7047"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7045.tar.gz"; - hash = "sha256-rE5K3CP+wKtU8IispRH1pX2V5sl6EqHLmO7R/g/g6Zw="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7047.tar.gz"; + hash = "sha256-lj5jxuGocl/y9iTpCGOWrhUNtR3QozfDeB0JqZSvBaU="; }; # Use TLS endpoints for downloads and metadata by default preConfigure = '' @@ -844,10 +860,10 @@ with self; { Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.997011"; + version = "0.997014"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz"; - hash = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997014.tar.gz"; + hash = "sha256-LdTAPFQDnC0CzN0u+VvG/1bPvbdGzQdvywqVR8UEmQg="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; @@ -866,10 +882,10 @@ with self; { Applify = buildPerlPackage { pname = "Applify"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.22.tar.gz"; - hash = "sha256-iiSlTkuhclGss88IO2drzqCYsClF9iMsV4nQd3ImxHg="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.23.tar.gz"; + hash = "sha256-fI3Z55e9DsJgDTAOzUnul4EZgxxlay0L3q7OoENIoRI="; }; meta = { description = "Write object oriented scripts with ease"; @@ -881,12 +897,12 @@ with self; { AppMusicChordPro = buildPerlPackage { pname = "App-Music-ChordPro"; - version = "6.010"; + version = "6.030"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.010.tar.gz"; - hash = "sha256-SqTkbR2bWIMcU5gSRf2WW6s1ckHtJVPkxj/bBO9X4kM="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Music-ChordPro-6.030.tar.gz"; + hash = "sha256-a+5H8U5gmYPkrBUyxxwajPQy9m6sWeDlaeHTfg2cwnc="; }; - buildInputs = [ PodParser ]; + buildInputs = [ ObjectPad ]; propagatedBuildInputs = [ AppPackager FileLoadLines FileHomeDir IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] ++ lib.optionals (!stdenv.isDarwin) [ Wx ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -911,10 +927,10 @@ with self; { AppPackager = buildPerlPackage { pname = "App-Packager"; - version = "1.430.1"; + version = "1.440"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/App-Packager-1.430.1.tar.gz"; - hash = "sha256-V/TQFEWDh/ni7S39hhXR4lRbimUEsQryJIZXjYvjdKM="; + url = "mirror://cpan/authors/id/J/JV/JV/App-Packager-1.440.tar.gz"; + hash = "sha256-VoFBa+b9eJe+mEg8TqKOsN3gzGWzwg5o1HswRN7PKHo="; }; meta = { description = "Abstraction for Packagers"; @@ -924,10 +940,10 @@ with self; { Appperlbrew = buildPerlModule { pname = "App-perlbrew"; - version = "0.89"; + version = "0.98"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.89.tar.gz"; - hash = "sha256-D/pYdfYMe0L3yDK5Qtyaq+L8KHYXEjvd6bj8rW31eQI="; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.98.tar.gz"; + hash = "sha256-oWD3ESJYjdU12pTbsLgwHkjlONJaRCobE/cZCWKIWTI="; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ]; @@ -957,11 +973,11 @@ with self; { }; AppSqitch = buildPerlModule { - version = "1.3.1"; + version = "1.4.0"; pname = "App-Sqitch"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.3.1.tar.gz"; - hash = "sha256-9edo0pjNQEfuKuQjGXgujCzaMSc3vL2/r1gL1H7+i5Q="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.0.tar.gz"; + hash = "sha256-sNs4cDH3dWJmLgA7xV16EComOAtK1/25qKO61XaeUBw="; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ]; @@ -1068,10 +1084,10 @@ with self; { ArrayCompare = buildPerlModule { pname = "Array-Compare"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.7.tar.gz"; - hash = "sha256-ROMQ9pnresGYGNunIh7ohCoecESLdFWMUSaWKy7ZU9w="; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.8.tar.gz"; + hash = "sha256-MEc7XpEBU4QNJDHqlGO55W5SPN56PFBhadaaK5dC2DQ="; }; buildInputs = [ TestNoWarnings ]; @@ -1153,6 +1169,20 @@ with self; { }; }; + AsyncUtil = buildPerlPackage { + pname = "Async-Util"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WH/WHITNEY/Async-Util-0.01.tar.gz"; + hash = "sha256-jzKxHKvFD2Xjh79W8mWBV6IsNah5Nmbhtfis/hMQkQY="; + }; + buildInputs = [ AnyEvent ListMoreUtils ]; + meta = { + description = "Utilities for doing common async operations"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ArchiveCpio = buildPerlPackage { pname = "Archive-Cpio"; version = "0.10"; @@ -1169,10 +1199,10 @@ with self; { ArchiveExtract = buildPerlPackage { pname = "Archive-Extract"; - version = "0.86"; + version = "0.88"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz"; - hash = "sha256-ms0JzbjozwttCCEKO4A0IwDImjWYVTGb9rAMFMSqtoc="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.88.tar.gz"; + hash = "sha256-z/zxNc0GIih9OwIVT31nFklUSfyu0DlmYhlI4l6l90I="; }; meta = { description = "Generic archive extracting mechanism"; @@ -1182,10 +1212,10 @@ with self; { ArchiveTar = buildPerlPackage { pname = "Archive-Tar"; - version = "2.38"; + version = "3.02"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.38.tar.gz"; - hash = "sha256-xeSPU1FCiBhYMM7ZO/Phb731zdzpfe0dHYqbCiHqKHs="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-3.02.tar.gz"; + hash = "sha256-gWM8h/c3hGGD01wPTJ1ALalHqEa0iBswzObZ6+PInRk="; }; meta = { description = "Manipulates TAR archives"; @@ -1225,10 +1255,10 @@ with self; { AstroFITSHeader = buildPerlModule rec { pname = "Astro-FITS-Header"; - version = "3.07"; + version = "3.09"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${pname}-${version}.tar.gz"; - hash = "sha256-Uw1Z7wwJNfmGLRhxh6LXWDsSxjm7Z9sU+YMyKxYYktk="; + url = "mirror://cpan/authors/id/G/GS/GSB/Astro-FITS-Header-3.09.tar.gz"; + hash = "sha256-cq1oveWku+zv8VFtZ3A/4tACFDlwQpo81pplFlLVaYY="; }; meta = { description = "Object-oriented interface to FITS HDUs"; @@ -1237,6 +1267,18 @@ with self; { }; }; + AudioCuefileParser = buildPerlPackage { + pname = "Audio-Cuefile-Parser"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTK/Audio-Cuefile-Parser-0.02.tar.gz"; + hash = "sha256-ulbQcMhz2WxoatmoH99P6JuETkPrSd/gAL+c70PFtmk="; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AudioFLACHeader = buildPerlPackage { pname = "Audio-FLAC-Header"; version = "2.4"; @@ -1411,10 +1453,10 @@ with self; { AuthenSASL = buildPerlPackage { pname = "Authen-SASL"; - version = "2.16"; + version = "2.1700"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz"; - hash = "sha256-ZhT6dRjwlPhTdBtjxz82JxaMXTrKibHQKxAW3DKFTgk="; + url = "mirror://cpan/authors/id/E/EH/EHUELS/Authen-SASL-2.1700.tar.gz"; + hash = "sha256-uG1aV2uNOHruJPOfR6VK/RS7ZrCQA9tQZQAfHeA6js4="; }; propagatedBuildInputs = [ DigestHMAC ]; meta = { @@ -1613,10 +1655,10 @@ with self; { BCOW = buildPerlPackage { pname = "B-COW"; - version = "0.004"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz"; - hash = "sha256-/K+3de2EpFvCwGxf/XE0LLPAb7C9zVwbUbDBL4tYX1E="; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.007.tar.gz"; + hash = "sha256-EpDa8ifosJiJoxzxguKRBvHPnxpOm/d1L53pLtEVi0Q="; }; meta = { description = "B::COW additional B helpers to check COW status"; @@ -1689,10 +1731,10 @@ with self; { BHooksEndOfScope = buildPerlPackage { pname = "B-Hooks-EndOfScope"; - version = "0.24"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz"; - hash = "sha256-A6o9/l0KpkcalvQ/6DGBedGXlNSmQHCPAoj5IW7HrMY="; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.26.tar.gz"; + hash = "sha256-Od8vjAB6dUZyB1+VuQeXuuvpetptlEsZemNScJyzBnE="; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { @@ -1965,10 +2007,10 @@ with self; { BusinessISBN = buildPerlPackage { pname = "Business-ISBN"; - version = "3.005"; + version = "3.008"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz"; - hash = "sha256-ZTD7rkDFY3bbTmaGw0r42j21xLqtDRBAR7HvPiT+Lio="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.008.tar.gz"; + hash = "sha256-GcSh1NmaDddpWpAZKxNASg4+7r7fy+l6AgLjayOMDmk="; }; propagatedBuildInputs = [ BusinessISBNData ]; meta = { @@ -1980,10 +2022,10 @@ with self; { BusinessISBNData = buildPerlPackage { pname = "Business-ISBN-Data"; - version = "20191107"; + version = "20231006.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz"; - hash = "sha256-hExPZPGT04k0C0RlodW8NMYPDI5C5caayK/j07vFyg0="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20231006.001.tar.gz"; + hash = "sha256-KhazbjIzXOjI337m8ig2LzSuc8T8wSNQCVCiyMd/F0g="; }; meta = { description = "Data pack for Business::ISBN"; @@ -1994,10 +2036,10 @@ with self; { BusinessISMN = buildPerlPackage { pname = "Business-ISMN"; - version = "1.201"; + version = "1.203"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz"; - hash = "sha256-SjIxoWRWv4y/F/JrZSQ/JHB4tRRdmgOqdYa68JV37LI="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.203.tar.gz"; + hash = "sha256-T1Ou2rLmh9Th9yhW6vwiFZOQYhEj2q955FBqiX4pPog="; }; propagatedBuildInputs = [ TieCycle ]; meta = { @@ -2009,10 +2051,10 @@ with self; { BusinessISSN = buildPerlPackage { pname = "Business-ISSN"; - version = "1.004"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.004.tar.gz"; - hash = "sha256-l+yrFdJNEeKFK/Cyj4TIeYvThAKgpp4Xvg5mibJycV4="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.005.tar.gz"; + hash = "sha256-OwmwJn8KZmD7krb1DEx3lu9qJjtirTu+qgcYmgx8ObM="; }; meta = { description = "Perl extension for International Standard Serial Numbers"; @@ -2067,10 +2109,10 @@ with self; { CacheFastMmap = buildPerlPackage { pname = "Cache-FastMmap"; - version = "1.54"; + version = "1.57"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.54.tar.gz"; - hash = "sha256-NULiALmAJ3rkVqvjbgyp+bjyvya7FVivJOFAgUrWeVI="; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.57.tar.gz"; + hash = "sha256-4Es6KNmJ7bj7lur6zcK4f57MuE8EfrLifLJqp9CMx7g="; }; buildInputs = [ TestDeep ]; meta = { @@ -2112,11 +2154,12 @@ with self; { CacheMemcachedFast = buildPerlPackage { pname = "Cache-Memcached-Fast"; - version = "0.26"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.26.tar.gz"; - hash = "sha256-Xo5G2SLMpuTzhRMsLLLHHu9/S171j702o5n5Fp3qoJo="; + url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.28.tar.gz"; + hash = "sha256-fEJMJTtl/2LPFXe7QYgCGSoYgF6jH6/Ap65YnkRsidI="; }; + buildInputs = [ Test2Suite ]; meta = { description = "Perl client for memcached, in C language"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -2153,10 +2196,10 @@ with self; { Cairo = buildPerlPackage { pname = "Cairo"; - version = "1.108"; + version = "1.109"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.108.tar.gz"; - hash = "sha256-YELLfcUWdasjQ3BZxjhHE8X7vOhExMYAF9LgYZSPBdo="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.109.tar.gz"; + hash = "sha256-ghlzbkAcIxHaX1FXdd5D/YfmOEtQTaNqGS8rIXZDB38="; }; buildInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; @@ -2282,10 +2325,10 @@ with self; { CarpAssert = buildPerlPackage { pname = "Carp-Assert"; - version = "0.21"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz"; - hash = "sha256-kk+OK048s9iyYka1+cB82qS4gAzvNF+ggR1ykw1zpU4="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Carp-Assert-0.22.tar.gz"; + hash = "sha256-gH6pfGvtdqwuSWnvun2uSP7+ufKHl/ESZxs6yKSTVfc="; }; meta = { description = "Executable comments"; @@ -2295,10 +2338,10 @@ with self; { CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.24"; + version = "2.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.24.tar.gz"; - hash = "sha256-ulzBZichfdu/tbGk9rGEv500LvuBSNkdo0SfCwN1sis="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-2.3.0.tar.gz"; + hash = "sha256-/2nqCb2maiAPygiK3ZHFww5lcqt7ujF6f58zxRKzzqc="; }; propagatedBuildInputs = [ CarpAssert ]; buildInputs = [ TestException ]; @@ -2324,10 +2367,10 @@ with self; { Carton = buildPerlPackage { pname = "Carton"; - version = "1.0.34"; + version = "1.0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz"; - hash = "sha256-d9QrknMrz8GKWdNB5WzkdiBbHE04Dqs6ByJPV0XCPkU="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.35.tar.gz"; + hash = "sha256-nEVYypfNCLaf37UrKMPdwgQ+9S8GJ7kOU9BaQIc0QXU="; }; propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { @@ -2419,10 +2462,10 @@ with self; { CatalystAuthenticationStoreLDAP = buildPerlPackage { pname = "Catalyst-Authentication-Store-LDAP"; - version = "1.016"; + version = "1.017"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; - hash = "sha256-CFeBKmF83Y1FcdDZonm1hmEy9dhFBv0kK8Bh3HdKozI="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.017.tar.gz"; + hash = "sha256-keW4vd/XOGYqNh6/6nPYQrO6Me1wne2xqE7DRB3O7sU="; }; propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ]; @@ -2525,10 +2568,10 @@ with self; { CatalystModelDBICSchema = buildPerlPackage { pname = "Catalyst-Model-DBIC-Schema"; - version = "0.65"; + version = "0.66"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz"; - hash = "sha256-JqkR7173/8gbbOZcMVb3H7NQg8RWrSfm2C0twCST7uo="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Model-DBIC-Schema-0.66.tar.gz"; + hash = "sha256-GST0wA6PD/HF0a+hbv5PhW8cXnT+VW7Cxfj1v2OtA0g="; }; buildInputs = [ DBDSQLite TestException TestRequires ]; propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; @@ -2540,10 +2583,10 @@ with self; { CatalystRuntime = buildPerlPackage { pname = "Catalyst-Runtime"; - version = "5.90128"; + version = "5.90131"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90128.tar.gz"; - hash = "sha256-pt87Da9fZsW0NxDDvyLjSL6LBTdf8dloYIfm9pRiYPk="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90131.tar.gz"; + hash = "sha256-nWQe+s8PmTXm7LmPWjtHbJYbH4Gb0vjyOmR9HYZ+GEk="; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; @@ -2733,12 +2776,12 @@ with self; { CatalystPluginSession = buildPerlPackage { pname = "Catalyst-Plugin-Session"; - version = "0.41"; + version = "0.43"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz"; - hash = "sha256-hWEKF8ofQOuZ3b615TRi8ebVaOiv2Z1Pl1uwf1IKhSg="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Plugin-Session-0.43.tar.gz"; + hash = "sha256-Xn180rlbH8IkS8buuPRPg11gPqB/WjkRCIHbYJKLFMQ="; }; - buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; + buildInputs = [ TestDeep TestException TestNeeds ]; propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; @@ -2833,10 +2876,10 @@ with self; { CatalystPluginStaticSimple = buildPerlPackage { pname = "Catalyst-Plugin-Static-Simple"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz"; - hash = "sha256-Nrczj5a+9PJoX3pFVbFRl5Oud4O9PW0iyX87cY8wlFQ="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.37.tar.gz"; + hash = "sha256-Wk2Fo1iM1Og/GwAlgUEufXG31X9mBW5dh6Nvk9icnnw="; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ]; @@ -2862,10 +2905,10 @@ with self; { CatalystViewCSV = buildPerlPackage { pname = "Catalyst-View-CSV"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz"; - hash = "sha256-5BMmtgmYkfJEtDKSHtEAlqxhnzK4xPi0FjMxO9VGYts="; + url = "mirror://cpan/authors/id/J/JM/JMREIN/Catalyst-View-CSV-1.8.tar.gz"; + hash = "sha256-vKcEaDzDXEevuJrDjHFRAu2+gIF57gcz0qDrMRojbN8="; }; buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; propagatedBuildInputs = [ CatalystRuntime TextCSV ]; @@ -2905,10 +2948,10 @@ with self; { CatalystViewTT = buildPerlPackage { pname = "Catalyst-View-TT"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-TT-0.45.tar.gz"; - hash = "sha256-KN8SU3w9Xg5aSJ/GZL2+rgEyfZvegkW/QJjfgt+870s="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-TT-0.46.tar.gz"; + hash = "sha256-7aRFfbv4GkJBtzWl1GnZcn2KMJHSSvGuPJog8CTeUcw="; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { @@ -2997,10 +3040,10 @@ with self; { Catmandu = buildPerlModule { pname = "Catmandu"; - version = "1.2013"; + version = "1.2020"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2013.tar.gz"; - hash = "sha256-OHIYl8hKwsKNVYHBHTtGevkwwfN34L0uwzCPAiXGBGo="; + url = "mirror://cpan/authors/id/H/HO/HOCHSTEN/Catmandu-1.2020.tar.gz"; + hash = "sha256-1jIbR+NkGvkb7vZjNhWZVk88wzwAc5isa7opuO5A4cU="; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; @@ -3043,10 +3086,10 @@ with self; { CGI = buildPerlPackage { pname = "CGI"; - version = "4.51"; + version = "4.59"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.51.tar.gz"; - hash = "sha256-C9IV5wEvn1Lmp9P+aV7jDvlZ15bo5TRy+g7YxT+6YAo="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.59.tar.gz"; + hash = "sha256-be5LibiLEOd8lvPAjRm1hq74M7F6Ql1hiq19KMJi+Rw="; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; @@ -3059,10 +3102,10 @@ with self; { CGICompile = buildPerlModule { pname = "CGI-Compile"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.25.tar.gz"; - hash = "sha256-9Et07t+9Hrjw+WiPndrhVCLl+kiueL4hsK/LnjJJDqU="; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.26.tar.gz"; + hash = "sha256-TzhcEMLJd+tgPzjNFT4OA2jfA3H9vSP1qm7nL0/GXcg="; }; propagatedBuildInputs = [ Filepushd SubName ]; buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; @@ -3118,10 +3161,10 @@ with self; { CGIFast = buildPerlPackage { pname = "CGI-Fast"; - version = "2.15"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz"; - hash = "sha256-5TQt89xZPt+3JMev6FCxoO51P01zP1GT4DewRjPf7s4="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.16.tar.gz"; + hash = "sha256-AiPX+RuAA3ud/183NgZAtx9dyNvZiaBZPV0i8/c8s9Q="; }; propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; @@ -3189,14 +3232,13 @@ with self; { }; }; - CGISimple = buildPerlModule { + CGISimple = buildPerlPackage { pname = "CGI-Simple"; - version = "1.25"; + version = "1.280"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.25.tar.gz"; - hash = "sha256-5ebPNuoG8OZ7vc3Zz7aY80yZNR6usy3U+mNviZQ+9H4="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.280.tar.gz"; + hash = "sha256-GOAen/uBTl5O6neshImyBp/oNlGFUPN/bCIT61Wcar8="; }; - propagatedBuildInputs = [ IOStringy ]; buildInputs = [ TestException TestNoWarnings ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; @@ -3220,10 +3262,10 @@ with self; { CHI = buildPerlPackage { pname = "CHI"; - version = "0.60"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz"; - hash = "sha256-x/Gis1cKj+3khOkz+Juhcp4KvQWTV5HRRsUi3RIO6FE="; + url = "mirror://cpan/authors/id/A/AS/ASB/CHI-0.61.tar.gz"; + hash = "sha256-WDVFyeUxK7QZOrFt6fVf+PS0p97RKM7o3SywIdRni1s="; }; preConfigure = '' # fix error 'Unescaped left brace in regex is illegal here in regex' @@ -3239,12 +3281,13 @@ with self; { Chart = buildPerlPackage { pname = "Chart"; - version = "2.4.10"; + version = "2.403.9"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz"; - hash = "sha256-hL2ZoaDOckd7FeNYgeYSA5i7P1U67rXo1ysIhSDk9r8="; + url = "mirror://cpan/authors/id/L/LI/LICHTKIND/Chart-v2.403.9.tar.gz"; + hash = "sha256-V8aCi7TIpyFw/rZ9wfFIq/Gcqzgnd54wh3tGEe1n86s="; }; - propagatedBuildInputs = [ GD ]; + buildInputs = [ TestWarn ]; + propagatedBuildInputs = [ GD GraphicsToolkitColor ]; meta = { description = "A series of charting modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -3266,10 +3309,10 @@ with self; { CLASS = buildPerlPackage { pname = "CLASS"; - version = "1.00"; + version = "1.1.8"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/CLASS-1.00.tar.gz"; - hash = "sha256-xRhWIIFXAbP+whMUzNjFaT5r/VGUMVJ9ozcKgWQiBnE="; + url = "mirror://cpan/authors/id/J/JD/JDEGUEST/CLASS-v1.1.8.tar.gz"; + hash = "sha256-IZAaUmXL29iRJ36X/Gs0X3nby/B3RFePX/iGaltddgM="; }; meta = { description = "Alias for __PACKAGE__"; @@ -3451,10 +3494,10 @@ with self; { ClassDataInheritable = buildPerlPackage { pname = "Class-Data-Inheritable"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz"; - hash = "sha256-mWf+zuoVIn5ELsgYcjFj621zuJR+MfFquAb24jka8Uo="; + url = "mirror://cpan/authors/id/R/RS/RSHERER/Class-Data-Inheritable-0.09.tar.gz"; + hash = "sha256-RAiNbpBxLhh7ilsFDKWxxw7+K6oyrhI+m9j1nynwbk0="; }; meta = { description = "Inheritable, overridable class data"; @@ -3585,6 +3628,19 @@ with self; { }; }; + ClassMember = buildPerlPackage { + pname = "Class-Member"; + version = "1.6"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OP/OPI/Class-Member-1.6.tar.gz"; + hash = "sha256-p1KK8in6OhIF3NJakd59dKxvp9lSgbmTtV6Lb0+HuZE="; + }; + meta = { + description = "A set of modules to make the module developement easier"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ClassMethodMaker = buildPerlPackage { pname = "Class-MethodMaker"; version = "2.24"; @@ -3602,10 +3658,10 @@ with self; { ClassMethodModifiers = buildPerlPackage { pname = "Class-Method-Modifiers"; - version = "2.13"; + version = "2.15"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz"; - hash = "sha256-q1gH9xAYqELea3pIJtbB8kuNWwn8zlAFozCc9upA/WM="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.15.tar.gz"; + hash = "sha256-Zc2Fv+R10GbpGG96jMY2BwmFswsOuxzehoHPBiwuFfw="; }; buildInputs = [ TestFatal TestNeeds ]; meta = { @@ -3734,10 +3790,10 @@ with self; { ClassObservable = buildPerlPackage { pname = "Class-Observable"; - version = "1.04"; + version = "2.004"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz"; - hash = "sha256-PvGHM6DwPBE/O8+KxQR24Jyh/mI09KqsqiTfypUWgJQ="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Class-Observable-2.004.tar.gz"; + hash = "sha256-bfMun+XwCIkfxO+k5PReqhQE0wIgRZyPyKUB8KfPLmk="; }; propagatedBuildInputs = [ ClassISA ]; meta = { @@ -3836,13 +3892,13 @@ with self; { CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; - version = "1.8"; + version = "2.0"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-1.8.tar.gz"; - hash = "sha256-In25W2MzgnAkVUzDLvcI0wwaf/uW39RCX4/g46/18cE="; + url = "mirror://cpan/authors/id/B/BL/BLHOTSKY/CLI-Helpers-2.0.tar.gz"; + hash = "sha256-yhpPFnTzsfMmjyekfJiAszgmrenxI34sEUXnAqfIePY="; }; buildInputs = [ PodCoverageTrustPod TestPerlCritic ]; - propagatedBuildInputs = [ CaptureTiny RefUtil SubExporter TermReadKey YAML ]; + propagatedBuildInputs = [ CaptureTiny IOInteractive RefUtil TermReadKey YAML ]; meta = { description = "Subroutines for making simple command line scripts"; homepage = "https://github.com/reyjrar/CLI-Helpers"; @@ -3852,10 +3908,10 @@ with self; { Clipboard = buildPerlModule { pname = "Clipboard"; - version = "0.26"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.26.tar.gz"; - hash = "sha256-iGrkPchTj5v8Tgf9vPCbf71u5Zwx82RhjIWd4UlTxYo="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.28.tar.gz"; + hash = "sha256-no15AVGUJjNXwloPXQlIAP/0O9v5+GAew7DtXrCWbSY="; }; propagatedBuildInputs = [ CGI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. @@ -3873,10 +3929,10 @@ with self; { Clone = buildPerlPackage { pname = "Clone"; - version = "0.45"; + version = "0.46"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz"; - hash = "sha256-y7buNIr6lUMuSHiJO0Z1JUnnDcaP5tnkMNHS6ZB5qeY="; + url = "mirror://cpan/authors/id/G/GA/GARU/Clone-0.46.tar.gz"; + hash = "sha256-qt7tXkyL1rvfaMDdAGbLUT4Wq55bQ4LcSgqv1ViQaXs="; }; buildInputs = [ BCOW ]; meta = { @@ -3915,10 +3971,10 @@ with self; { CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.78"; + version = "0.83"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz"; - hash = "sha256-Ml67QdhZAG7jK2Qmu+hlhnjqywPAESCqYoZZ9uY3ubY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.83.tar.gz"; + hash = "sha256-FqBS0DprF/xYqEqZb68p5C7O124sQMRyc+uKsxzBXKE="; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -4033,10 +4089,10 @@ with self; { CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.101"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.101.tar.gz"; - hash = "sha256-DJsTT9OIKQ4w6Q/J9jkAlmEn+Y52sFTs1IHrO1UAuNg="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.206.tar.gz"; + hash = "sha256-ISuB2xwK6CLRmShhmmA70QjLXVxHAPxn3HyxaeDMZSU="; }; # Don't build a private copy of bzip2. @@ -4053,10 +4109,10 @@ with self; { CompressRawLzma = buildPerlPackage { pname = "Compress-Raw-Lzma"; - version = "2.101"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.101.tar.gz"; - hash = "sha256-uyZ/0xmB7aEfREA4+KD8pLlKUa5hsttxJGq/ak0yKjY="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.206.tar.gz"; + hash = "sha256-4BpwQLhL3GdZLRPuwMeIWQ4faW0dTwfHCXvXKk+IbrQ="; }; preConfigure = '' cat > config.in <<EOF @@ -4073,11 +4129,11 @@ with self; { CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.103"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.103.tar.gz"; - hash = "sha256-1p0mIMoCTcG0JPf0Io/hFpsrd0FrswMQ6JDTvn2kff8="; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.206.tar.gz"; + hash = "sha256-Rnhaajg6HIQ4lbf58l1ddZ58MFFZ+dHgSjYE63THc3Q="; }; preConfigure = '' @@ -4087,6 +4143,7 @@ with self; { LIB = ${pkgs.zlib.out}/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT + USE_ZLIB_NG = False EOF ''; @@ -4114,10 +4171,10 @@ with self; { ConfigAny = buildPerlPackage { pname = "Config-Any"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz"; - hash = "sha256-aNoqXPJfrt1NJM89DVcJlcGZ1blQEIot541A3s7TYVA="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.33.tar.gz"; + hash = "sha256-wGaOtfLNNVvyBVfwTcGKJUdLegvPp5Vi4xZdmjx4kzM="; }; propagatedBuildInputs = [ ModulePluggable ]; meta = { @@ -4128,10 +4185,10 @@ with self; { ConfigAutoConf = buildPerlPackage { pname = "Config-AutoConf"; - version = "0.319"; + version = "0.320"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz"; - hash = "sha256-ME9mzCZTJkwP4SfSFmnobT0YzXLyV02PUTG+7DGgoz4="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Config-AutoConf-0.320.tar.gz"; + hash = "sha256-u1epWO9J0/cWInba4Up71a9D/R2FEyMa811mVFlFQCM="; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -4143,10 +4200,10 @@ with self; { ConfigGeneral = buildPerlPackage { pname = "Config-General"; - version = "2.63"; + version = "2.65"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz"; - hash = "sha256-Cpv5d7iqvnY0PogJXSKWyKQiQQ/SoFoZAfKyDi4fb60="; + url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.65.tar.gz"; + hash = "sha256-TW1XVL46nzCQaDbwzBDlVMiDLhTnoTQe+xWwXXBvxY8="; }; meta = { description = "Generic Config Module"; @@ -4185,10 +4242,10 @@ with self; { ConfigINI = buildPerlPackage { pname = "Config-INI"; - version = "0.025"; + version = "0.029"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz"; - hash = "sha256-Yov3bVuR+J3eItSBPsAzAm6/cbdyu2HM2pCdoAyGlzI="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.029.tar.gz"; + hash = "sha256-C755enMCEGRKkH2QzUqisjrVgMsnvTk5O/xqfvn9/eo="; }; propagatedBuildInputs = [ MixinLinewise ]; meta = { @@ -4262,10 +4319,10 @@ with self; { ConfigMVP = buildPerlPackage { pname = "Config-MVP"; - version = "2.200011"; + version = "2.200013"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz"; - hash = "sha256-I8lWZvxDxK2uvMCTsbVgke/CpqotdTZqIW0Y7alq1xY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200013.tar.gz"; + hash = "sha256-AY0WFiPuOmf4YNnmgOIuYbeermAY8OfDtSX8k09bfUU="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; @@ -4278,10 +4335,10 @@ with self; { ConfigMVPReaderINI = buildPerlPackage { pname = "Config-MVP-Reader-INI"; - version = "2.101463"; + version = "2.101465"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz"; - hash = "sha256-aakWvzcR68nn1MqqcPPGlekYuTpZI5WHczA+DaC21EU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101465.tar.gz"; + hash = "sha256-E8eqJ8HfmM0zraOZ5Z/zj6v6nWVRPkKvAvcsLT9jYkc="; }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { @@ -4333,10 +4390,10 @@ with self; { ConfigTiny = buildPerlPackage { pname = "Config-Tiny"; - version = "2.24"; + version = "2.29"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz"; - hash = "sha256-EGSUjkvFfobjGNvIeRxTyludlblYzEdDZ8MneYETUjI="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.29.tgz"; + hash = "sha256-PeebDqA6jWqT6dkSj+hF+1ViIrFGmaT28NXKBXrjMzs="; }; buildInputs = [ TestPod ]; meta = { @@ -4363,10 +4420,10 @@ with self; { Connector = buildPerlModule { pname = "Connector"; - version = "1.47"; + version = "1.53"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.47.tar.gz"; - hash = "sha256-I2R4pAq53cIVgu4na6krnjgbP8XtljkKLe2o4nSGeoM="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.53.tar.gz"; + hash = "sha256-1D50VEcZ/7lKDgZFhqetRXVbKTZPGJHZ4ncEFqsSTPo="; }; buildInputs = [ ModuleBuildTiny ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; @@ -4417,10 +4474,10 @@ with self; { ConvertASN1 = buildPerlPackage { pname = "Convert-ASN1"; - version = "0.33"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz"; - hash = "sha256-H98ARSDHnjokTPlohhYpNRbBF5PXRsdh82dJbrPQYHY="; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.34.tar.gz"; + hash = "sha256-pijXydOQVo+3Y1mXX6A/YmzlfxDcF5gOjjWH13E+Tuc="; }; meta = { description = "ASN.1 Encode/Decode library"; @@ -4458,12 +4515,12 @@ with self; { ConvertColor = buildPerlModule { pname = "Convert-Color"; - version = "0.11"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz"; - hash = "sha256-tBIXxykxA0ukQX16nh4pmfBFgNTmsxxwmT/tzMJEDTg="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.17.tar.gz"; + hash = "sha256-5/jDN8VSXqoDd3xXaD6hGvm5j/HQURojSvH4CkMiTsc="; }; - buildInputs = [ TestNumberDelta ]; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ ListUtilsBy ModulePluggable ]; meta = { description = "Color space conversions and named lookups"; @@ -4500,10 +4557,10 @@ with self; { curry = buildPerlPackage { pname = "curry"; - version = "1.001000"; + version = "2.000001"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; - hash = "sha256-ixhgeSAgZPs9zCXPcpCqP11VHZjRuG1YRHBqdgwfVtQ="; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-2.000001.tar.gz"; + hash = "sha256-yY/iBQ+t7KOYGdboDVROkSGE/oRsvnNTnGhpT7G1HAg="; }; meta = { description = "Create automatic curried method call closures for any class or object"; @@ -4619,10 +4676,10 @@ with self; { CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.29"; + version = "2.36"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz"; - hash = "sha256-H1VnLv1QWpuqz6GSTRFTYhIKpr+O+rehfHywkLF8zEE="; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.36.tar.gz"; + hash = "sha256-HXKl60DliOPBDx88hckC6HGxaDdH1ncjOvd3yCv8kJ4="; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ]; meta = { @@ -4634,10 +4691,10 @@ with self; { CPANAudit = buildPerlPackage { pname = "CPAN-Audit"; - version = "20230309.004"; + version = "20230826.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/CPAN-Audit-20230309.004.tar.gz"; - hash = "sha256-RzrvktoYTMY1SqiG8QvwRnjvovHpmxZ/o+nvXOGmS14="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/CPAN-Audit-20230826.001.tar.gz"; + hash = "sha256-DXU7O9fdpXweIKycWScKcKTNkfttfN4mJEPoVUy2Geo="; }; buildInputs = [ CaptureTiny YAMLTiny ]; propagatedBuildInputs = [ CPANDistnameInfo IOInteractive JSON ModuleCPANfile ModuleExtractVERSION PerlIOgzip Mojolicious ]; @@ -4650,10 +4707,10 @@ with self; { CPANMini = buildPerlPackage { pname = "CPAN-Mini"; - version = "1.111016"; + version = "1.111017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; - hash = "sha256-Wil6/D42etgIEUZNTrfk3Tyv+LpJnN0rVY9ieUQ6dlc="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111017.tar.gz"; + hash = "sha256-8gQpO+JqyEGsyHBEoYjbD1kegIgTFseiiK7A7s4wYVU="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; @@ -4672,10 +4729,10 @@ with self; { CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.36"; + version = "4.37"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.36.tar.gz"; - hash = "sha256-7OhHQhfLLt8E5PUaGM7aN4e1sd//7iyJGbLrEJpnJu0="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.37.tar.gz"; + hash = "sha256-wkFhWg4X/3Raqoa79Gam4pzSQFFeZfBqegUBe2GebUs="; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -4686,10 +4743,10 @@ with self; { CPAN02PackagesSearch = buildPerlModule { pname = "CPAN-02Packages-Search"; - version = "0.001"; + version = "0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/CPAN-02Packages-Search-0.001.tar.gz"; - hash = "sha256-Z1wVLOaOcz9MQPVuzcGhkVxv/1X2IrBEFCqlrOjFrwk="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/CPAN-02Packages-Search-0.100.tar.gz"; + hash = "sha256-prabrHmiUwA0RrKD76bzrv+mCdDBxStCCYeCEtpw+as="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ TieHandleOffset ]; @@ -4760,10 +4817,10 @@ with self; { CPANMetaCheck = buildPerlPackage { pname = "CPAN-Meta-Check"; - version = "0.014"; + version = "0.018"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz"; - hash = "sha256-KKBXK/wcBnjZzn2kjPUhCXraIw+W6z0GP8uuHP5qNR8="; + url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.018.tar.gz"; + hash = "sha256-9hnS316g/ZHIz4PrVKzMteQ9nm7Bo/cns9CsFdDPN4o="; }; buildInputs = [ TestDeep ]; meta = { @@ -4774,10 +4831,10 @@ with self; { CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "5.20201120"; + version = "5.20230920"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20201120.tar.gz"; - hash = "sha256-c2ByY+fKTXwrKu7EUR06vAtYz5CHFSS373iaUoyoUuM="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20230920.tar.gz"; + hash = "sha256-MbyTiJR2uOx1iRjdmSSmKYPgh7BsjN6Sb7mnp+h60cA="; }; meta = { description = "Mapping Perl releases on CPAN to the location of the tarballs"; @@ -4788,10 +4845,10 @@ with self; { CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9908"; + version = "0.9914"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9908.tar.gz"; - hash = "sha256-WPastH15HtjjCm68wlCJIYusrZbkbajmIakrd4xWndQ="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9914.tar.gz"; + hash = "sha256-dsPl2mI6SvYP5krexEj7H44Mrp9nmKNraIZZdAROm2c="; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -4804,10 +4861,10 @@ with self; { CPANUploader = buildPerlPackage { pname = "CPAN-Uploader"; - version = "0.103015"; + version = "0.103018"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103015.tar.gz"; - hash = "sha256-jgh+/jYl3suBaymR/4195K1xkPmGPQSQlnAU9nGfu8U="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103018.tar.gz"; + hash = "sha256-xP/k7enbebOW47/F583w4umCHh8eCH9SO8+nTJ/J4kg="; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { @@ -4820,10 +4877,10 @@ with self; { CryptArgon2 = buildPerlModule { pname = "Crypt-Argon2"; - version = "0.010"; + version = "0.019"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.010.tar.gz"; - hash = "sha256-PqHABvEO9m/UF+UCpWnfFcTMHHdrCE41Y5dRxBzmZxo="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.019.tar.gz"; + hash = "sha256-+Fm+6NL2tAf11EZFwiOu4hL+AFkd/YLlBlrhvnio5Dg="; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; meta = { @@ -4887,17 +4944,11 @@ with self; { CryptCurve25519 = buildPerlPackage { pname = "Crypt-Curve25519"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz"; - hash = "sha256-n0hwPbTuyiluqCwtZuShOfInC437C+38T/lEVLt7IMc="; + url = "mirror://cpan/authors/id/K/KA/KARASIK/Crypt-Curve25519-0.07.tar.gz"; + hash = "sha256-Z6mIcTclIdb34R/dYnyq21wdVAFCag6c9CFnpDxbSx0="; }; - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382"; - hash = "sha256-Dq431QnMuI9V34BKy7SNaQMXD4lykDuo3wab278sAFA="; - }) - ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; homepage = "https://metacpan.org/release/Crypt-Curve25519"; @@ -5008,10 +5059,10 @@ with self; { CryptFormat = buildPerlPackage { pname = "Crypt-Format"; - version = "0.10"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz"; - hash = "sha256-id3AEKbJHVvnoYdKUo7tbto58sQBwY5j2A3fv3En4t0="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.12.tar.gz"; + hash = "sha256-p1cdS+9XeOGln0O2XPLVaAtJ+nu78z89IfRSL0Pmp9o="; }; buildInputs = [ TestException TestFailWarnings ]; meta = { @@ -5061,10 +5112,10 @@ with self; { CryptJWT = buildPerlPackage { pname = "Crypt-JWT"; - version = "0.029"; + version = "0.035"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.029.tar.gz"; - hash = "sha256-D8z/KQZaAJju8VHe6zPBLA1o4WoctOdGWybrvUwYzS8="; + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.035.tar.gz"; + hash = "sha256-XPvVX63DrtNtZ0/AU6zoZ7XT4aTOiiDPu3wmef3wlkE="; }; propagatedBuildInputs = [ CryptX JSON ]; meta = { @@ -5089,10 +5140,10 @@ with self; { CryptPassphraseArgon2 = buildPerlPackage { pname = "Crypt-Passphrase-Argon2"; - version = "0.003"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.003.tar.gz"; - hash = "sha256-cCkLtb3GfBcBKN8+UWexfQS7eTkzqubAWnWGfao/OTg="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.009.tar.gz"; + hash = "sha256-M39AVZY6EG2bt7tcJvwPSHCGYJ2XKHVgucpEwEPCF1I="; }; propagatedBuildInputs = with perlPackages; [ CryptArgon2 CryptPassphrase ]; meta = { @@ -5116,12 +5167,12 @@ with self; { }; }; - CryptPasswdMD5 = buildPerlModule { + CryptPasswdMD5 = buildPerlPackage { pname = "Crypt-PasswdMD5"; - version = "1.40"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz"; - hash = "sha256-t31q7qJTAa975nn3RS6JTKiK+XEL/9bgHWZaFBw5GUg="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.42.tgz"; + hash = "sha256-/Tlubn9E7rkj6TyZOUC49nqa7Vb8dKrK8Dj8QFPvO1k="; }; meta = { description = "Provide interoperable MD5-based crypt() functions"; @@ -5131,12 +5182,12 @@ with self; { CryptPKCS10 = buildPerlModule { pname = "Crypt-PKCS10"; - version = "2.001"; + version = "2.005"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz"; - hash = "sha256-95RbdqLY9Njs9iey646k9B0AHmqRXv6C5x1rl/6j/6k="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.005.tar.gz"; + hash = "sha256-LdEv0JHCPjp8NKZqw1rDq/kHQCOUtVV0mO3kj8QUU6c="; }; - buildInputs = [ pkgs.unzip ModuleBuildTiny ]; + buildInputs = [ CryptX ModuleBuildTiny pkgs.unzip ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { description = "Parse PKCS #10 certificate requests"; @@ -5163,10 +5214,10 @@ with self; { CryptRandom = buildPerlPackage rec { pname = "Crypt-Random"; - version = "1.52"; + version = "1.54"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.52.tar.gz"; - hash = "sha256-qTwG3kCeby6y6YaOptTmU9mfL3kAssGDHh9lrODE74Q="; + url = "mirror://cpan/authors/id/V/VI/VIPUL/Crypt-Random-1.54.tar.gz"; + hash = "sha256-1m+OF+3Dh3zHl/3VneU045kGNvjxpecmBiFZr35n2sw="; }; propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; meta = { @@ -5221,10 +5272,10 @@ with self; { CryptRandPasswd = buildPerlPackage { pname = "Crypt-RandPasswd"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz"; - hash = "sha256-sb2QR42cx19MffpNvub9DApAoaUpKI33JpeHMwgpSDE="; + url = "mirror://cpan/authors/id/J/JA/JANITOR/Crypt-RandPasswd-0.07.tar.gz"; + hash = "sha256-bd26Sdx+DwBRr6oKvhbxN4OiRM0eu1+B2qEay2KKSWE="; }; meta = { description = "Random password generator based on FIPS-181"; @@ -5264,10 +5315,10 @@ with self; { CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.15.tar.gz"; - hash = "sha256-oJibVZkNeQXRtb9STNi0aq3A3neEFNTKjUBqoqpZQWM="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.16.tar.gz"; + hash = "sha256-ZUAIXjgEuCpvB1LBEiz3jK3SIZkBNt1v1MCX0FbITUA="; }; meta = { description = "Crypt::CBC compliant Rijndael encryption module"; @@ -5290,10 +5341,10 @@ with self; { CryptURandom = buildPerlPackage { pname = "Crypt-URandom"; - version = "0.36"; + version = "0.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz"; - hash = "sha256-gf7JkhrcXTyRy+CtjLK7ibBFxPsN6cs8Q/F+WOR3+KE="; + url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.39.tar.gz"; + hash = "sha256-Jol7PPualWAJFRLWCHMaPVv08pn20Pj3LIXzmQEkQSI="; }; meta = { description = "Provide non blocking randomness"; @@ -5394,11 +5445,12 @@ with self; { CryptOpenSSLAES = buildPerlPackage { pname = "Crypt-OpenSSL-AES"; - version = "0.02"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz"; - hash = "sha256-tm+rUU7fl/wy9Y2iV1gnBKIQwrNeKX1cMbf6L/0I6Qg="; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Crypt-OpenSSL-AES-0.17.tar.gz"; + hash = "sha256-7+GBsYxtIqc/LlNWOQ6Fdyes5UY2JeIhHdhgIyvtO7c="; }; + buildInputs = [ CryptOpenSSLGuess FileWhich pkgs.openssl ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; meta = { @@ -5473,10 +5525,10 @@ with self; { CryptOpenSSLX509 = buildPerlPackage rec { pname = "Crypt-OpenSSL-X509"; - version = "1.914"; + version = "1.915"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.914.tar.gz"; - hash = "sha256-ScV1JX5kCK1aiQEeW1gA1Zj5zK/fQucQBO2Byy9E7no="; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz"; + hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; @@ -5510,13 +5562,13 @@ with self; { CryptPerl = buildPerlPackage { pname = "Crypt-Perl"; - version = "0.34"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; - hash = "sha256-DhyyI98AQfbZsBDxHm+XqXq1WhGKJzk460/oXUA/GxE="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.38.tar.gz"; + hash = "sha256-eJdUj7AeFqIK5JDt3UZX+Br3sZKEFLkvbbQsY10ax+A="; }; nativeCheckInputs = [ pkgs.openssl MathBigIntGMP ]; - buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; + buildInputs = [ CallContext ExtUtilsMakeMakerCPANfile FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; meta = { description = "Cryptography in pure Perl"; @@ -5527,10 +5579,10 @@ with self; { CryptEd25519 = buildPerlPackage { pname = "Crypt-Ed25519"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz"; - hash = "sha256-WFBKYedGQB6HiEEE/MmNAxM51T9IfElV//tesdAykMs="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.05.tar.gz"; + hash = "sha256-sdEaWU/rUeQG2BsUfcDRClV8z0yrgcDbP4mBAmd9JKg="; }; nativeBuildInputs = [ CanaryStability ]; @@ -5567,6 +5619,13 @@ with self; { url = "mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz"; hash = "sha256-Zbl46/PDmF5V7jK7baHp+upJSoXTAFxjuux+lphZ8CY="; }; + + patches = [ + # Replace apostrophe as package separator + # https://rt.cpan.org/Public/Bug/Display.html?id=146661 + ../development/perl-modules/CSSDOM-replace-apostrophe.patch + ]; + propagatedBuildInputs = [ Clone ]; meta = { description = "Document Object Model for Cascading Style Sheets"; @@ -5587,14 +5646,15 @@ with self; { }; }; - CSSMinifierXS = buildPerlModule { + CSSMinifierXS = buildPerlPackage { pname = "CSS-Minifier-XS"; - version = "0.09"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; - hash = "sha256-iKaZf6DfazlNHjRr0OV81WWFfiF9gHtlLxdrAGvm2tc="; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.13.tar.gz"; + hash = "sha256-xBnjCM3IKvHCXWuNB7L/JjR6Yit6Y+wghWq+jbQFH4I="; }; perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + buildInputs = [ TestDiagINC ]; meta = { description = "XS based CSS minifier"; homepage = "https://metacpan.org/release/CSS-Minifier-XS"; @@ -5619,13 +5679,17 @@ with self; { Curses = buildPerlPackage { pname = "Curses"; - version = "1.37"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.37.tar.gz"; - hash = "sha256-dHB6460Zs1u+/aKx1r0x9XtAzayKuHIXHIcUyIlU2yA="; + url = "mirror://cpan/authors/id/G/GI/GIRAFFED/Curses-1.44.tar.gz"; + hash = "sha256-ou+4x8iG1pL/xNshNhx2gJoGXliOQ/rQ1n5E751CvTA="; }; + preConfigure = '' + substituteInPlace makeConfig \ + --replace '#! /usr/bin/perl' '#!${perl}/bin/perl' + ''; propagatedBuildInputs = [ pkgs.ncurses ]; - NIX_CFLAGS_LINK = "-lncurses"; + NIX_CFLAGS_LINK = "-L${pkgs.ncurses.out}/lib -lncurses"; meta = { description = "Perl bindings to ncurses"; license = with lib.licenses; [ artistic1 ]; @@ -5662,10 +5726,10 @@ with self; { CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.078"; + version = "0.080"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.078.tar.gz"; - hash = "sha256-kxYLEkL31XQ8s8kxuO/HyzmCHQ4y+U+Wkz8eiOYYvL0="; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.080.tar.gz"; + hash = "sha256-tFe3khlKbJwT8G/goLXqFYllwygvOFypPh8AorM+fok="; }; meta = { description = "Cryptographic toolkit"; @@ -5675,10 +5739,10 @@ with self; { CryptX509 = buildPerlPackage { pname = "Crypt-X509"; - version = "0.53"; + version = "0.55"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz"; - hash = "sha256-0v9hT5RX3IerJ3uBvO01MsPtMJtzuaYarvvpSIyeZg8="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.55.tar.gz"; + hash = "sha256-FHlrEdFfdq10ROeKYZtw/92RMIaN0LANhYV5yTA4Icc="; }; propagatedBuildInputs = [ ConvertASN1 ]; meta = { @@ -5718,12 +5782,26 @@ with self; { }; }; + DataCompactReadonly = buildPerlPackage { + pname = "Data-CompactReadonly"; + version = "0.1.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-CompactReadonly-0.1.0.tar.gz"; + hash = "sha256-fVYJCEz1E7p6d4u1lSNHDoNXdn1ZHL1CxYTgPfO+xug="; + }; + propagatedBuildInputs = [ DataIEEE754 DevelStackTrace ScalarType StringBinaryInterpolation TestDifferences TestException ]; + meta = { + description = "A Compact Read Only Database that consumes very little memory"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + DataCompare = buildPerlPackage { pname = "Data-Compare"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz"; - hash = "sha256-gYog8fOPdOZSU8+Lz2/tf5SlqN1mL3UzDcr0sRfO6L0="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.29.tar.gz"; + hash = "sha256-U8nbO5MmPIiqo8QHLYGere0CTXo2s4wMN3N9KI1a+ow="; }; propagatedBuildInputs = [ Clone FileFindRule ]; meta = { @@ -5734,10 +5812,10 @@ with self; { DataDump = buildPerlPackage { pname = "Data-Dump"; - version = "1.23"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz"; - hash = "sha256-r1OwXvE4e0yrRCfmeJF5KD5PDajPA26NtRbds0RRK2U="; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Dump-1.25.tar.gz"; + hash = "sha256-pKpuDdvznVrUm93+D4nZ2oZOO8APYnEl0bxYBHL1P70="; }; meta = { description = "Pretty printing of data structures"; @@ -5818,10 +5896,10 @@ with self; { DataGUID = buildPerlPackage { pname = "Data-GUID"; - version = "0.049"; + version = "0.051"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz"; - hash = "sha256-uK9DfUn9BCWiPr/z5ZidrmTe6vDgRqpfQTZlzTFpp3s="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.051.tar.gz"; + hash = "sha256-aOp3xz/KiROC8gbhJEkJRQG2+/Llf1SQLVBkInz9ji4="; }; propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { @@ -5833,10 +5911,10 @@ with self; { DataHexDump = buildPerlPackage { pname = "Data-HexDump"; - version = "0.02"; + version = "0.04"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz"; - hash = "sha256-Gp2EPn9mfBxvd8Z69dd+dGL/I7QZN8sXRU0DU1zZvnA="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Data-HexDump-0.04.tar.gz"; + hash = "sha256-vDb0BEOKw2rSuSlVOSJ9Nvmc0WI/HjR693xZTEDMvPg="; }; meta = { description = "Hexadecial Dumper"; @@ -5919,10 +5997,10 @@ with self; { DataMessagePack = buildPerlModule { pname = "Data-MessagePack"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.01.tar.gz"; - hash = "sha256-j6DtAQHQTmYYIae3jo1izj4ZspknW7/tF44rqJEmY+o="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-MessagePack-1.02.tar.gz"; + hash = "sha256-wz20R5CqjSVBR4guI3jf/pcK1gMxNQveBi0XlTSCsbc="; }; buildInputs = [ ModuleBuildXSUtil TestRequires ]; meta = { @@ -5936,10 +6014,10 @@ with self; { DataOptList = buildPerlPackage { pname = "Data-OptList"; - version = "0.110"; + version = "0.114"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz"; - hash = "sha256-NmEXyylmRz8lWfL0V1/2rmnoTGmg8woHc+G1GkV+9cM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.114.tar.gz"; + hash = "sha256-n9EJO5F6Ift5rhYH21PRE7TgrY/grndssHen5QBE/fM="; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { @@ -6009,10 +6087,10 @@ with self; { DataPrinter = buildPerlPackage { pname = "Data-Printer"; - version = "0.40"; + version = "1.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz"; - hash = "sha256-YGkwEH2CdcyuLyVFQ6N270gWE3rVZimAIcypcj+CUlo="; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-1.001001.tar.gz"; + hash = "sha256-q64DMVUU0rcxxkYrjwZ2SN2ZChA1SyFgbHeM/ZHUe4A="; }; propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; meta = { @@ -6037,10 +6115,10 @@ with self; { DataSection = buildPerlPackage { pname = "Data-Section"; - version = "0.200007"; + version = "0.200008"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz"; - hash = "sha256-zZN+W3DjSquIX/QU4qbRnkeDt8KPw82lFFsjBRTrtN4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200008.tar.gz"; + hash = "sha256-g6zHpV091+026deNNQrzE4xpz6F4pEdlgicS/0M7mQ4="; }; propagatedBuildInputs = [ MROCompat SubExporter ]; buildInputs = [ TestFailWarnings ]; @@ -6169,12 +6247,12 @@ with self; { DataULID = buildPerlPackage { pname = "Data-ULID"; - version = "1.0.0"; + version = "1.2.1"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.0.0.tar.gz"; - hash = "sha256-TXV0dYk9utUWXwplxEbTi0fzkBnTb3fanSnJjL8nIG8="; + url = "mirror://cpan/authors/id/B/BA/BALDUR/Data-ULID-1.2.1.tar.gz"; + hash = "sha256-SbThGyY0inXfNONGF0UuMZ/XpygasJQgYvFieeqKHSc="; }; - propagatedBuildInputs = [ DateTime EncodeBase32GMP MathRandomSecure ]; + propagatedBuildInputs = [ CryptX ]; meta = { description = "Universally Unique Lexicographically Sortable Identifier"; homepage = "https://metacpan.org/release/Data-ULID"; @@ -6198,10 +6276,10 @@ with self; { DataUtil = buildPerlModule { pname = "Data-Util"; - version = "0.66"; + version = "0.67"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz"; - hash = "sha256-w10520UglupaaVtUZo2Z1YuVTHL8nvgi4+CmJ/EVxvQ="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.67.tar.gz"; + hash = "sha256-tVypHHafgTN8xrCrIMMmg4eOWyZj8cwljFEamZpd/dM="; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -6260,10 +6338,10 @@ with self; { DataValidateDomain = buildPerlPackage { pname = "Data-Validate-Domain"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz"; - hash = "sha256-RHDyU7jScgpN0/o65VCZVBfCJp875/8DDgGvoEo6lCE="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.15.tar.gz"; + hash = "sha256-PJ95GHsNPHGt0fj1WbgN8VmTAKbSA+CxYcvhjhdqqzY="; }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ NetDomainTLD ]; @@ -6276,10 +6354,10 @@ with self; { DataValidateIP = buildPerlPackage { pname = "Data-Validate-IP"; - version = "0.27"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz"; - hash = "sha256-4aqSI13LnG/ZtsjNoYTRr3NTfMd/T4Og+IIHqL+/t9Y="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.31.tar.gz"; + hash = "sha256-c0r/hrb5ytQOHE2oHyj68Y4IAsdqVm2V5WE9QxgYL8E="; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ NetAddrIP ]; @@ -6306,10 +6384,10 @@ with self; { DataVisitor = buildPerlPackage { pname = "Data-Visitor"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Visitor-0.31.tar.gz"; - hash = "sha256-K7FpMou80tzO3Lk4Yn6HIOf0w/jjGCMCD7TCBQXTTG4="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Visitor-0.32.tar.gz"; + hash = "sha256-sZQpDyV8xidaA5N0ERVUxmahZQ5MAa15nB4KJ39HkX0="; }; buildInputs = [ TestNeeds ]; propagatedBuildInputs = [ Moose TieToObject namespaceclean ]; @@ -6351,10 +6429,10 @@ with self; { DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.83"; + version = "6.92"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.83.tar.gz"; - hash = "sha256-9JGy4dh2wiKllWOxu9iTwQNCB+0DNzBL85YxHZ6Rmfo="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.92.tar.gz"; + hash = "sha256-q5Yr05ygnsb8/n5aaRKvcbDB9vA+TtK+9uRHHJ02ehM="; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -6398,12 +6476,12 @@ with self; { DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.54"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.54.tar.gz"; - hash = "sha256-sS7abZAHE/Inlk3E3A4u+4bSlOi8Lxa+npW2WflTsuc="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.59.tar.gz"; + hash = "sha256-3j6aY84VRwtNtK2tS6asjsKX2IwMbGs1SwgYg7CmdpU="; }; - buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; + buildInputs = [ CPANMetaCheck TestFatal TestWarnings TestWithoutModule ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object for Perl"; @@ -6414,10 +6492,10 @@ with self; { DateTimeCalendarJulian = buildPerlPackage { pname = "DateTime-Calendar-Julian"; - version = "0.102"; + version = "0.107"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz"; - hash = "sha256-RouCo0qopmY/sFWAnu2KcAx6PM8mfgKWl1cboypsJUk="; + url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.107.tar.gz"; + hash = "sha256-/LK0JIRLsTvK1GsceqI5taCbqyVW9TvR8n+tkMJg0z0="; }; propagatedBuildInputs = [ DateTime ]; meta = { @@ -6485,10 +6563,10 @@ with self; { DateTimeFormatFlexible = buildPerlPackage { pname = "DateTime-Format-Flexible"; - version = "0.32"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz"; - hash = "sha256-UKe5/rKHuxSycyOlPCMkSGGBo6tss/THZi1CvpAa2O4="; + url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.34.tar.gz"; + hash = "sha256-g2rvXSXm/4gnMIpDv/dBkeXSAiDao9ISAFC8w0FI/PE="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; buildInputs = [ TestException TestMockTime TestNoWarnings ]; @@ -6528,10 +6606,10 @@ with self; { DateTimeFormatISO8601 = buildPerlPackage { pname = "DateTime-Format-ISO8601"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.15.tar.gz"; - hash = "sha256-FJdow2i5134fJdM5bH8D4kKRAB/RTCxdq2p2JbKm2qk="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ISO8601-0.16.tar.gz"; + hash = "sha256-WChH9uApBlM0oAVk8gzXwo9OXNTsIVE9D2klMe07VuE="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; buildInputs = [ Test2Suite ]; @@ -6558,13 +6636,13 @@ with self; { DateTimeFormatNatural = buildPerlModule { pname = "DateTime-Format-Natural"; - version = "1.11"; + version = "1.18"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.11.tar.gz"; - hash = "sha256-c4+w+xTkL/rhQqMi9J9HHIzBImlM++bTNYA2MgP0RVI="; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.18.tar.gz"; + hash = "sha256-2TRqRhUDVFnYvO4PrD1OuuoDj09DsoT2nt9z9u1XUf4="; }; - buildInputs = [ ModuleUtil TestMockTime ]; - propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; + buildInputs = [ ModuleUtil TestMockTimeHiRes ]; + propagatedBuildInputs = [ Clone DateTime DateTimeHiRes DateTimeTimeZone ListMoreUtils ParamsValidate boolean ]; meta = { description = "Parse informal natural language date/time strings"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -6574,10 +6652,10 @@ with self; { DateTimeFormatMySQL = buildPerlModule { pname = "DateTime-Format-MySQL"; - version = "0.06"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz"; - hash = "sha256-mBjUFi7JzsYTm6l7OeBInSF1gaHUP7txPzvv/oD5jx0="; + url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.08.tar.gz"; + hash = "sha256-Gctw6YWEZV41TS1qjnHMXKkC3dw6xEQWcS+RY9Eiueg="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { @@ -6588,10 +6666,10 @@ with self; { DateTimeFormatPg = buildPerlModule { pname = "DateTime-Format-Pg"; - version = "0.16013"; + version = "0.16014"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz"; - hash = "sha256-f4YupeUb1Fvrxsb5cISXuYlkky5aOevK/jQCNRzgUZs="; + url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16014.tar.gz"; + hash = "sha256-OLuWZlJNw4TDNm9jQsuWVsULrA+XFqPUTxz1Usy+Drk="; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; buildInputs = [ ModuleBuildTiny ]; @@ -6604,10 +6682,10 @@ with self; { DateTimeFormatStrptime = buildPerlPackage { pname = "DateTime-Format-Strptime"; - version = "1.77"; + version = "1.79"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.77.tar.gz"; - hash = "sha256-L6Q8g47PU1byIakaQcgduiLnhgxUdLSmFyMlmJgXPko="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.79.tar.gz"; + hash = "sha256-cB5GgCyG7U2IaVwabay76QszkL7reU84fnx5IwADdXk="; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTime ]; @@ -6634,10 +6712,10 @@ with self; { DateTimeFormatW3CDTF = buildPerlPackage { pname = "DateTime-Format-W3CDTF"; - version = "0.07"; + version = "0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz"; - hash = "sha256-aaArZhu/HaoUpIE8tnhuqmbb3ydD8LP0WOMCNMOiYmg="; + url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.08.tar.gz"; + hash = "sha256-3MIAoHOiHLpIEipdrgtqh135PT+MiunURtzdm++qQTo="; }; propagatedBuildInputs = [ DateTime ]; meta = { @@ -6647,12 +6725,27 @@ with self; { }; }; + DateTimeHiRes = buildPerlPackage { + pname = "DateTime-HiRes"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-HiRes-0.04.tar.gz"; + hash = "sha256-HCMVkzLDD566VLdeZpK+TeqAUiQ+r/MCbJyQuLZLw5U="; + }; + propagatedBuildInputs = [ DateTime ]; + meta = { + homepage = "https://metacpan.org/release/DateTime-HiRes"; + description = "Create DateTime objects with sub-second current time resolution"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DateTimeLocale = buildPerlPackage { pname = "DateTime-Locale"; - version = "1.28"; + version = "1.39"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.28.tar.gz"; - hash = "sha256-bGBNjFycJzm3jgU4pAIoO4Kx30GeYL7yCwSEPkWEut4="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.39.tar.gz"; + hash = "sha256-EMFFpsfa9xGIZOl0grSun5T5O5QUIS7uiqMLFqgTUQA="; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple PathTiny Test2PluginNoWarnings Test2Suite TestFileShareDir ]; propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; @@ -6694,10 +6787,10 @@ with self; { DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.44"; + version = "2.60"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.44.tar.gz"; - hash = "sha256-Vz3UBZot/Tgz1qfSvwhHeKxllaAJsR3qY2DX0CLORSY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.60.tar.gz"; + hash = "sha256-8EYNN5MjkFtXm+1E4UEjejN9wl3Sa2qwxgrCuAYpMj0="; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -6710,10 +6803,10 @@ with self; { DateTimeXEasy = buildPerlPackage { pname = "DateTimeX-Easy"; - version = "0.089"; + version = "0.091"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz"; - hash = "sha256-F+bSAuesYElSMEjpe7jxlePHkghXDaFQT0MTWE5Ienk="; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/DateTimeX-Easy-0.091.tar.gz"; + hash = "sha256-pfjbvntpZdUD4VJYIBXaKk+B46WGA9/t1Oc9H92s/II="; }; buildInputs = [ TestMost ]; propagatedBuildInputs = [ DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; @@ -6797,10 +6890,10 @@ with self; { DevelChecklib = buildPerlPackage { pname = "Devel-CheckLib"; - version = "1.14"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz"; - hash = "sha256-8hxeKZrTzg/cDLD0E3jcqFpw6NbJp1mfDlapVyAOwpQ="; + url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.16.tar.gz"; + hash = "sha256-hp04wljmRtzvZ2YJ8N18qQ8IX1bPb9cAGwGaXVuDH8o="; }; buildInputs = [ CaptureTiny MockConfig ]; meta = { @@ -6811,11 +6904,12 @@ with self; { DevelCheckOS = buildPerlPackage { pname = "Devel-CheckOS"; - version = "1.85"; + version = "1.96"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.85.tar.gz"; - hash = "sha256-b0Op2h3G+v2qybYbg80C2IO/Yq7xUck5hr75inrmWMo="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.96.tar.gz"; + hash = "sha256-+GB5BfT1reSI9+9Et8HnyFI/ure5HS3IMLMa6cqBPfU="; }; + buildInputs = [ TestWarnings ]; propagatedBuildInputs = [ FileFindRule ]; meta = { description = "Check what OS we're running on"; @@ -6823,6 +6917,21 @@ with self; { }; }; + DevelDeprecationsEnvironmental = buildPerlPackage { + pname = "Devel-Deprecations-Environmental"; + version = "1.101"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Deprecations-Environmental-1.101.tar.gz"; + hash = "sha256-S+SC08PcOtHvR0P6s4DOuQG3QVZQeVOoNITfadolpqY="; + }; + propagatedBuildInputs = [ DevelCheckOS DevelHide TestException TestTime ]; + meta = { + description = "A framework for managing deprecations"; + homepage = "https://github.com/DrHyde/perl-modules-Devel-Deprecations-Environmental"; + license = with lib.licenses; [ gpl2Only artistic1 ]; + }; + }; + DevelLeak = buildPerlPackage rec { pname = "Devel-Leak"; version = "0.03"; @@ -6869,10 +6978,10 @@ with self; { DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.62"; + version = "3.68"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.62.tar.gz"; - hash = "sha256-8Z0ExG8uWQpBHCMAeew2KEsucaDAv3oExXARMHqtgZs="; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.68.tar.gz"; + hash = "sha256-UpDVu4TN6enmEROiDGe11HJn645loRmookjMlqrAuts="; }; meta = { description = "Perl/Pollution/Portability"; @@ -6928,10 +7037,10 @@ with self; { DBDCSV = buildPerlPackage { pname = "DBD-CSV"; - version = "0.56"; + version = "0.60"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.56.tgz"; - hash = "sha256-WmLB0Jvmu+IDmZTxCNhPQtJKh9KkAcXolNtayiF7MJs="; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.60.tgz"; + hash = "sha256-AYuDow95mXm8jDwwRMixyAAc32C9w+dGhIgYGVJUtOc="; }; propagatedBuildInputs = [ DBI SQLStatement TextCSV_XS ]; meta = { @@ -6942,10 +7051,10 @@ with self; { DBDMock = buildPerlModule { pname = "DBD-Mock"; - version = "1.58"; + version = "1.59"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.58.tar.gz"; - hash = "sha256-ux6/ASQQE5blu4PerQ8U8S3V8XXLE3ilnaUpXGLJxzw="; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.59.tar.gz"; + hash = "sha256-ClqllTq2XPeQaB5sBFLjGK1X2ArCf1dfhJGMYDqkdAY="; }; propagatedBuildInputs = [ DBI ]; buildInputs = [ ModuleBuildTiny TestException ]; @@ -6957,11 +7066,11 @@ with self; { DBDSQLite = buildPerlPackage { pname = "DBD-SQLite"; - version = "1.70"; + version = "1.74"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.70.tar.gz"; - hash = "sha256-QP2N31OeDnc6ek5tN2eUwzAUWfmrAFCXi9z5cRPa/j4="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.74.tar.gz"; + hash = "sha256-iZSZfYS5/rRUd5X3h0bGYfty48tqJdvdeJtzH1aIpN0="; }; propagatedBuildInputs = [ DBI ]; @@ -6997,10 +7106,10 @@ with self; { DBDMariaDB = buildPerlPackage { pname = "DBD-MariaDB"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.22.tar.gz"; - hash = "sha256-C2j9VCuWU/FbIFhXgZhjSNcehafjhD8JGZdwR6F5scY="; + url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.23.tar.gz"; + hash = "sha256-DQx2xmDd1VVw5I8+L96o9iGmmsDtSBkOjPyvy16bhZ0="; }; buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; @@ -7035,11 +7144,11 @@ with self; { DBDOracle = buildPerlPackage { pname = "DBD-Oracle"; - version = "1.80"; + version = "1.83"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz"; - hash = "sha256-8F4lKCNuPRNWXAuRI54HdZTb8GV6xZSY9Uov7psZ6uc="; + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.83.tar.gz"; + hash = "sha256-Uf6cFYlV/aDKkXqAaGPwvFEGi1M/u8dCOzzErVle0VM="; }; ORACLE_HOME = "${pkgs.oracle-instantclient.lib}/lib"; @@ -7058,11 +7167,11 @@ with self; { DBDPg = buildPerlPackage { pname = "DBD-Pg"; - version = "3.14.2"; + version = "3.17.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.14.2.tar.gz"; - hash = "sha256-yXPphFiWCnjsVAMqcbOEDxeEGN1+adBj5GKg8Q7Gjk0="; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.17.0.tar.gz"; + hash = "sha256-jZANTA50nzchh1KmZh+w01V6sfzMjeo4TLWHw4LeIZs="; }; buildInputs = [ pkgs.postgresql ]; @@ -7083,11 +7192,11 @@ with self; { DBDsybase = buildPerlPackage { pname = "DBD-Sybase"; - version = "1.16"; + version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz"; - hash = "sha256-Z/Qn6Lf/rirMPMiYRGPYeKu7Iom8F9t5opTlbIMR1sw="; + url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.23.tar.gz"; + hash = "sha256-B1e6aqyaKaLcOFmV1myPQSqIlo/SNsDYu0ZZAo5OmWU="; }; SYBASE = pkgs.freetds; @@ -7106,11 +7215,11 @@ with self; { DBFile = buildPerlPackage { pname = "DB_File"; - version = "1.855"; + version = "1.859"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.855.tar.gz"; - hash = "sha256-2f/iolvmzf7no01kI1zciZ6Zuos/uN6Knn9K8g5MqWA="; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.859.tar.gz"; + hash = "sha256-VnTg0s0LBgxNElNnDqAixk2EKlUlf5647bGcD1PiVlw="; }; preConfigure = '' @@ -7324,13 +7433,13 @@ with self; { DBIxClassSchemaLoader = buildPerlPackage { pname = "DBIx-Class-Schema-Loader"; - version = "0.07049"; + version = "0.07051"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz"; - hash = "sha256-6GnN3hN4z+vM8imwzeWNJ0bcYIC3X1bQcqpfH852p2Q="; + url = "mirror://cpan/authors/id/V/VE/VEESH/DBIx-Class-Schema-Loader-0.07051.tar.gz"; + hash = "sha256-GgieUISlJ2j0J0vCGB3LrhTcxXnk2YD89WnGeBsGCSw="; }; buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; - propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringToIdentifierEN curry ]; + propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringCamelCase StringToIdentifierEN curry ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -7338,12 +7447,12 @@ with self; { }; }; - DBIxConnector = buildPerlModule { + DBIxConnector = buildPerlPackage { pname = "DBIx-Connector"; - version = "0.56"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz"; - hash = "sha256-V8CNLBlRSGy5XPuD9Rj0YqPb8g01Pz7uT0avRPoZw1k="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/DBIx-Connector-0.59.tar.gz"; + hash = "sha256-eCmU8T9JVVhAU4SU+EBrC/JVj1M8zahsjSuV4jAQh/Q="; }; buildInputs = [ TestMockModule ]; propagatedBuildInputs = [ DBI ]; @@ -7355,10 +7464,10 @@ with self; { DBIxDBSchema = buildPerlPackage { pname = "DBIx-DBSchema"; - version = "0.45"; + version = "0.47"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz"; - hash = "sha256-eiqXj7bZ/qo+SxCcccljsmoAii0TDFh27PJMWnIzih0="; + url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.47.tar.gz"; + hash = "sha256-7u4hDcFKjWPrAawtZsZ6HcJ5+Sib6WphckyJUXkcUhI="; }; propagatedBuildInputs = [ DBI ]; meta = { @@ -7398,10 +7507,10 @@ with self; { DBMDeep = buildPerlPackage { pname = "DBM-Deep"; - version = "2.0016"; + version = "2.0017"; src = fetchurl { - url = "https://cpan.metacpan.org/authors/id/S/SP/SPROUT/DBM-Deep-2.0016.tar.gz"; - hash = "sha256-kCp8eqBIjY0KDops89oOlrQJOuRx5rdy8MbViY5HDk0="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/DBM-Deep-2.0017.tar.gz"; + hash = "sha256-1yNFIFdVO72UXWMhXr/gqnepLsbg+jOw2spXrhuKTSQ="; }; buildInputs = [ TestDeep TestException TestPod TestPodCoverage TestWarn ]; meta = { @@ -7456,10 +7565,10 @@ with self; { DevelCamelcadedb = buildPerlPackage { pname = "Devel-Camelcadedb"; - version = "2021.2"; + version = "2023.1"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2021.2.tar.gz"; - hash = "sha256-iKHZ6V05j/5NQRSGHiHDb3wiMVs9A+f3ZMy84BirPkc="; + url = "mirror://cpan/authors/id/H/HU/HURRICUP/Devel-Camelcadedb-v2023.1.tar.gz"; + hash = "sha256-z/jSTllF45RN6/ITmVprFVuR5YE0aRVrE9Ws819qXZ8="; }; propagatedBuildInputs = [ HashStoredIterator JSONXS PadWalker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -7540,10 +7649,10 @@ with self; { DevelHide = buildPerlPackage { pname = "Devel-Hide"; - version = "0.0013"; + version = "0.0015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0013.tar.gz"; - hash = "sha256-b8O7z08CU6blFoKWyQmTjBPIhpI6eZWslp5Hrfzwfss="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-Hide-0.0015.tar.gz"; + hash = "sha256-/I2+t/fXWnjtSWseDgXPyZxorKs6LpLP8VXKXw+l31g="; }; meta = { description = "Forces the unavailability of specified Perl modules (for testing)"; @@ -7573,10 +7682,10 @@ with self; { DevelOverloadInfo = buildPerlPackage { pname = "Devel-OverloadInfo"; - version = "0.005"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; - hash = "sha256-i/3i/6R8mUb4rcjPxEXC+XuNHN1ngRG+6fRE6C96puc="; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.007.tar.gz"; + hash = "sha256-IaGEFjuQ+R8G/8f13guWg1ZUaum0AKnXXFc8lYwkYiI="; }; propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; buildInputs = [ TestFatal ]; @@ -7672,10 +7781,10 @@ with self; { DigestCRC = buildPerlPackage { pname = "Digest-CRC"; - version = "0.22.2"; + version = "0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz"; - hash = "sha256-EStQ9/vG9rr11FhO6X9ULO1snsA6MUf3kCyEuLJneMs="; + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.24.tar.gz"; + hash = "sha256-ugIqBbGtvsc3EsRvIz2Eif4Tobn8QKH8zu2bUvkN78E="; }; meta = { description = "Module that calculates CRC sums of all sorts"; @@ -7685,10 +7794,10 @@ with self; { DigestHMAC = buildPerlPackage { pname = "Digest-HMAC"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz"; - hash = "sha256-O8csbT/xRNc677kOmnjTNhLVjPHNFjHs+4mFupbaSlk="; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Digest-HMAC-1.04.tar.gz"; + hash = "sha256-1ryBVqonXETXlLfBj0TNrEpYFAJFyVnmsZssODiwjtQ="; }; meta = { description = "Keyed-Hashing for Message Authentication"; @@ -7779,10 +7888,10 @@ with self; { DigestSHA3 = buildPerlPackage { pname = "Digest-SHA3"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.04.tar.gz"; - hash = "sha256-Smi2fFA09A+7E0SzBM1myqpeMg61IwBSAcwk921HDBQ="; + url = "mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA3-1.05.tar.gz"; + hash = "sha256-rfG5B5sreBdV5XBId6FDCl8SmX6oIgX9KWbJzEZahSI="; }; meta = { description = "Perl extension for SHA-3"; @@ -7868,10 +7977,10 @@ with self; { DistZilla = buildPerlPackage { pname = "Dist-Zilla"; - version = "6.017"; + version = "6.030"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.017.tar.gz"; - hash = "sha256-XI0wzjOsi16Tfm+D/Pp3nnIlyhSZUe5cm8LDrzwrb+4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.030.tar.gz"; + hash = "sha256-xAa75oCelO23DKlDJMMBQz1sij375wsC3xLh3/LzsTA="; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner SoftwareLicense TermEncoding TermUI YAMLTiny ]; @@ -7938,10 +8047,10 @@ with self; { DistZillaPluginPodWeaver = buildPerlPackage { pname = "Dist-Zilla-Plugin-PodWeaver"; - version = "4.008"; + version = "4.010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz"; - hash = "sha256-H9njgz8qEsTQSQ9FXgb2gZ87+Bt1I46kSOKToo2IwTk="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.010.tar.gz"; + hash = "sha256-Zm1S1UXUjSpn8VN63HTPOMdkofmVHQtiNiP2IGDLYj4="; }; propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { @@ -8033,12 +8142,12 @@ with self; { DistZillaPluginTestDistManifest = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-DistManifest"; - version = "2.000005"; + version = "2.000006"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz"; - hash = "sha256-Twrye7OHRdLex9lBvPdJ5tf76vjnvPinmhMQqWObD2U="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-DistManifest-2.000006.tar.gz"; + hash = "sha256-Wj2kW/yYzjhf7X3BZTp4kGEfC57xVsABOueFdPiWYH0="; }; - buildInputs = [ TestDeep TestDistManifest TestOutput ]; + buildInputs = [ ModuleBuildTiny TestDeep TestDistManifest TestOutput ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Author test that validates a package MANIFEST"; @@ -8143,10 +8252,10 @@ with self; { DistZillaPluginTestPortability = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-Portability"; - version = "2.001000"; + version = "2.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz"; - hash = "sha256-4I/1vZ4kz5UDBVMwFIkTgI2Ro9/jIKK9+LD8Y4cZsXk="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001001.tar.gz"; + hash = "sha256-07kxVx4VoidI6BJwmq/aclEKdMAA/AaiyrWHVYEACyA="; }; buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; propagatedBuildInputs = [ DistZilla ]; @@ -8174,12 +8283,12 @@ with self; { DistZillaPluginTestUnusedVars = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-UnusedVars"; - version = "2.000007"; + version = "2.001001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz"; - hash = "sha256-6gGZo6AEMhPdwTJQi57ZsTHvcXc1uPk9eCkRkdBLQ8I="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-UnusedVars-2.001001.tar.gz"; + hash = "sha256-df7W0NzCv0B/8nrJ4W7yFTRnFEuYbPovmPhpuqWNdkc="; }; - buildInputs = [ TestDeep TestOutput TestVars ]; + buildInputs = [ ModuleBuildTiny TestDeep TestOutput TestVars ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for unused variables"; @@ -8236,10 +8345,10 @@ with self; { Dumbbench = buildPerlPackage { pname = "Dumbbench"; - version = "0.111"; + version = "0.503"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz"; - hash = "sha256-0x08p9ZyvZKBg8y/KdMnXqWU99Mkrl9J22GClnxassc="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.503.tar.gz"; + hash = "sha256-0BYBmoGDE+cERk8oDPZB72Dodx0HeRtZuZ4XoeyAH6k="; }; propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; meta = { @@ -8252,10 +8361,10 @@ with self; { EmailAbstract = buildPerlPackage { pname = "Email-Abstract"; - version = "3.008"; + version = "3.010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz"; - hash = "sha256-/HFprLbEPffwBefvatCO6MputnlrXRYEWTyZczfMgkA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.010.tar.gz"; + hash = "sha256-jBL2i1l0yvyZ10lCq+/IWXGTA1qv0nYxKOaqr8pLftY="; }; propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; meta = { @@ -8267,10 +8376,10 @@ with self; { EmailAddress = buildPerlPackage { pname = "Email-Address"; - version = "1.912"; + version = "1.913"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz"; - hash = "sha256-D6N4UpjML2eA5j46X7HKgU3Lw2DOtZ7Y+oTrT/oG+e8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.913.tar.gz"; + hash = "sha256-avtUH232tTXM92QtNhrhjXqVo/k6zhvFNz9kwkEMpa8="; }; meta = { description = "RFC 2822 Address Parsing and Creation"; @@ -8296,10 +8405,10 @@ with self; { EmailAddressXS = buildPerlPackage { pname = "Email-Address-XS"; - version = "1.04"; + version = "1.05"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; - hash = "sha256-mV9tBKe0h91eG1XjtSythMh3UJN8lv624k6PHxDNWT4="; + url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.05.tar.gz"; + hash = "sha256-FRC38Q1nIBA3zVDSLJ1rJu7KVe3tpM20a7yiflmk6hY="; }; meta = { description = "Parse and format RFC 5322 email addresses and groups"; @@ -8309,10 +8418,10 @@ with self; { EmailDateFormat = buildPerlPackage { pname = "Email-Date-Format"; - version = "1.005"; + version = "1.008"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz"; - hash = "sha256-V5xhfjA7nYdEEce2G0a1nTb4FXGGJQdK5oMue7nbUQQ="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.008.tar.gz"; + hash = "sha256-Qyt8g/+IdJrxKAA/UlfFc67BpGNBjbkO0ihDy7wli08="; }; meta = { description = "Produce RFC 2822 date strings"; @@ -8338,10 +8447,10 @@ with self; { EmailMessageID = buildPerlPackage { pname = "Email-MessageID"; - version = "1.406"; + version = "1.408"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz"; - hash = "sha256-7EJd2/OV4OGsfG+VtJM8VcV6yfHnUUADx8kE7GzTQrg="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.408.tar.gz"; + hash = "sha256-Hz1bT/Cxx7OemsfDGPs3rc0LrJVWA2VGSU0U8G3FZDw="; }; meta = { description = "Generate world unique message-ids"; @@ -8352,10 +8461,10 @@ with self; { EmailMIME = buildPerlPackage { pname = "Email-MIME"; - version = "1.949"; + version = "1.953"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.949.tar.gz"; - hash = "sha256-Owrfa7QTz+Uddfi6eayoDer8mNwReap7LXp5r/Wmq5w="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.953.tar.gz"; + hash = "sha256-mPsGeFBpmiJLq8NI8c7+MNdExg2okC56XOnYt+c99zU="; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { @@ -8384,10 +8493,10 @@ with self; { EmailMIMEContentType = buildPerlPackage { pname = "Email-MIME-ContentType"; - version = "1.024"; + version = "1.028"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.024.tar.gz"; - hash = "sha256-QtFkrH/03C6oSOcQ/iH6hVCaO8u5HtLTVuSrqVHtiDU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.028.tar.gz"; + hash = "sha256-55UCRkM/ftbD5P1N8iJ+DyNBE3w8qxmJAY/DcPWBRcQ="; }; propagatedBuildInputs = [ TextUnidecode ]; meta = { @@ -8399,10 +8508,10 @@ with self; { EmailMIMEEncodings = buildPerlPackage { pname = "Email-MIME-Encodings"; - version = "1.315"; + version = "1.317"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz"; - hash = "sha256-THEEVQezHshT3WAVK0DjO6N0F3nA9JuxQ7UM+NJDq1w="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.317.tar.gz"; + hash = "sha256-SppBZxqdFQTE2iQb5BmpUD+jSGJiUm7bgeyp4uvqC68="; }; buildInputs = [ CaptureTiny ]; meta = { @@ -8430,10 +8539,10 @@ with self; { EmailOutlookMessage = buildPerlModule { pname = "Email-Outlook-Message"; - version = "0.920"; + version = "0.921"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.920.tar.gz"; - hash = "sha256-kiIClZ94m6tztu4mQAes+49UORNJb8y2cWGC5Nrlw4A="; + url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.921.tar.gz"; + hash = "sha256-+0q+6hTNpRweYLwhHPlSG7uq50uEEYym1Y8KciNoA4g="; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) @@ -8448,13 +8557,13 @@ with self; { EmailSender = buildPerlPackage { pname = "Email-Sender"; - version = "1.300035"; + version = "2.600"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300035.tar.gz"; - hash = "sha256-FEvYbPdo6nkQfKDpkpGoGM4738/qebtfbaE3nMfV2nk="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.600.tar.gz"; + hash = "sha256-7MZ10DDXnZpPsGRWfqiFxmsXw4Yjea0w+CBaKBzY7ik="; }; buildInputs = [ CaptureTiny ]; - propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddressXS EmailSimple ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util @@ -8471,10 +8580,10 @@ with self; { EmailSimple = buildPerlPackage { pname = "Email-Simple"; - version = "2.216"; + version = "2.218"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz"; - hash = "sha256-2F9jzRCI0RMREDZ2qM9Jj/9WSiAbU43lLNdTteXKi9Q="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.218.tar.gz"; + hash = "sha256-Lc4daP3pnVPbnKQ+IRtpsWm6Lvrs+HpVyzOpM2BHyW0="; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -8486,10 +8595,10 @@ with self; { EmailStuffer = buildPerlPackage { pname = "Email-Stuffer"; - version = "0.018"; + version = "0.020"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.018.tar.gz"; - hash = "sha256-0ACijvCWNpmx6ytORptYq3w6DPpKdDGeDnRhVuG9igs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Stuffer-0.020.tar.gz"; + hash = "sha256-Ch77fy3t05BSsSb3GMotO1hFpBI6OTkv2d+gx25gV8c="; }; buildInputs = [ Moo TestFatal ]; propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; @@ -8503,10 +8612,10 @@ with self; { EmailValid = buildPerlPackage { pname = "Email-Valid"; - version = "1.202"; + version = "1.203"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz"; - hash = "sha256-0CEIm2YqYOagyKvbcr2cXkaEjSSNmKmMHqKt3xqsE6I="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.203.tar.gz"; + hash = "sha256-ICG/ux4sJ55evYRoDllvlzRNQphQsjIme3b0kDdSK5M="; }; propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; doCheck = false; @@ -8681,10 +8790,10 @@ with self; { enum = buildPerlPackage { pname = "enum"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz"; - hash = "sha256-0vNrUBXx419kAVmGe2C/XVzWa1bNXkLTP1Mb5o5e7jU="; + url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.12.tar.gz"; + hash = "sha256-aaeokc04iO2LAsXpmh9In5KmLsNRwLx4lP1719FEfqk="; }; meta = { description = "C style enumerated types and bitmask flags in Perl"; @@ -8735,6 +8844,19 @@ with self; { }; }; + ENVUtil = buildPerlPackage { + pname = "ENV-Util"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARU/ENV-Util-0.03.tar.gz"; + hash = "sha256-B1574ehSxD6wiGYvr978FS9O9WyEPB4F2QDaGQb3P60="; + }; + meta = { + description = "Parse prefixed environment variables and dotnev (.env) files into Perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Error = buildPerlModule { pname = "Error"; version = "0.17029"; @@ -8750,10 +8872,10 @@ with self; { EV = buildPerlPackage { pname = "EV"; - version = "4.33"; + version = "4.34"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.33.tar.gz"; - hash = "sha256-Su6DkbiBE7Qhh/kf1JJF/cjpsZOhWsIC9RnKriqo6jU="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.34.tar.gz"; + hash = "sha256-EhFoPc57Z3H0q3EMwVNxK913umFXoTKU0LtzSR/QZWA="; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -8796,10 +8918,10 @@ with self; { ExcelWriterXLSX = buildPerlPackage { pname = "Excel-Writer-XLSX"; - version = "1.09"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; - hash = "sha256-1nnGrBnpPDKrd1lMeT5BuUjHuzhztgDnCtY30JPcoYc="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.11.tar.gz"; + hash = "sha256-yzMA0jEZxpiGTvC3PBmnLLpxi/wG7QBzWaUxP5YcwqA="; }; propagatedBuildInputs = [ ArchiveZip ]; meta = { @@ -8829,10 +8951,10 @@ with self; { ExceptionClass = buildPerlPackage { pname = "Exception-Class"; - version = "1.44"; + version = "1.45"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz"; - hash = "sha256-M/P7+LE407BOpOwLqD+w32uomIBrz07zk9TK/Boj7g0="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.45.tar.gz"; + hash = "sha256-VIKnfvAnyh+fOeH0jFWDVulUk2/I+73ubIEcUScBskk="; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; meta = { @@ -8889,10 +9011,10 @@ with self; { ExporterLite = buildPerlPackage { pname = "Exporter-Lite"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz"; - hash = "sha256-wFs5Ca9MuG82SV6UpZnSPrq0K+ehjv0NFB/BWGMJ2sI="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.09.tar.gz"; + hash = "sha256-edixT9UBOSLGPoUPFb9RBZ8lAkBFNetmkO8jYSwqGY0="; }; meta = { description = "Lightweight exporting of functions and variables"; @@ -8902,10 +9024,10 @@ with self; { ExporterTiny = buildPerlPackage { pname = "Exporter-Tiny"; - version = "1.002002"; + version = "1.006002"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002002.tar.gz"; - hash = "sha256-APC5VxaxgVcTLGwRje2LoxOSVj0Z5JBDPpplOC5wcQE="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.006002.tar.gz"; + hash = "sha256-byleLL/7HbwVvbna3DQWccHgzSvfLTErF1Jic8MiY40="; }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; @@ -8987,10 +9109,10 @@ with self; { ExtUtilsCppGuess = buildPerlPackage { pname = "ExtUtils-CppGuess"; - version = "0.21"; + version = "0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz"; - hash = "sha256-/2KReDIaHlkbg/gJcSWT6uRAikE6pEhlS85ZsVbyQVM="; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.26.tar.gz"; + hash = "sha256-yLNiuGAXKkB2rO4AQ49SuGRk8sUAcCz891J4Ef+aaD4="; }; doCheck = !stdenv.isDarwin; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -9004,10 +9126,10 @@ with self; { ExtUtilsDepends = buildPerlPackage { pname = "ExtUtils-Depends"; - version = "0.8000"; + version = "0.8001"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz"; - hash = "sha256-eA/3ISjATCoi5oARh6qcWMqymEB/bp0GJwavHCULvpg="; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8001.tar.gz"; + hash = "sha256-ZzxDh+eJbBohYJnB+7P6qndj1/X5WhpWpgoqKQbBMcU="; }; meta = { description = "Easily build XS extensions that depend on XS extensions"; @@ -9017,10 +9139,10 @@ with self; { ExtUtilsF77 = buildPerlPackage rec { pname = "ExtUtils-F77"; - version = "1.24"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KG/KGB/ExtUtils-F77-1.24.tar.gz"; - hash = "sha256-NVh4pKf5AesY0h+eIb6Mi/xqr5Zl00skG8HUPjLFtzA="; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-F77-1.26.tar.gz"; + hash = "sha256-q90dPuxMpPyuXxUrQLyqhi48gG4H5KqRI3V/aqSLndY="; }; buildInputs = [ pkgs.gfortran ]; propagatedBuildInputs = [ FileWhich ]; @@ -9045,10 +9167,10 @@ with self; { ExtUtilsInstall = buildPerlPackage { pname = "ExtUtils-Install"; - version = "2.18"; + version = "2.22"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.18.tar.gz"; - hash = "sha256-5d2He6I7Z7uybHhMR8/aHUEasaiZbu5ehNozPuZ+MMU="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.22.tar.gz"; + hash = "sha256-M3Jbr77Tgp1hPkxlHC4a0SBnDH0qxc8F+DdX/Jddb/I="; }; meta = { description = "Install files from here to there"; @@ -9087,10 +9209,10 @@ with self; { ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.62"; + version = "7.70"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.62.tar.gz"; - hash = "sha256-UCKthX/Xa9P2sWrwmf4jJGOdmTLgjyHokfsxPZyuFwU="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.70.tar.gz"; + hash = "sha256-8Qi9RkINLwDSQoJfhlsPaIUQhJJJJPkiYdaExJ4+enQ="; }; meta = { description = "Create a module Makefile"; @@ -9218,11 +9340,12 @@ with self; { FCGI = buildPerlPackage { pname = "FCGI"; - version = "0.79"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz"; - hash = "sha256-jPpOGxT7jVrKoiztZyxq9owKjiXcKpaXoO1/Sk77NOQ="; + url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.82.tar.gz"; + hash = "sha256-TH1g4m2iwH8Fik40UCHpJQUnOzPJVCIVl34IRhHwns8="; }; + buildInputs = [ FCGIClient ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i '/use IO::File/d' Makefile.PL ''; @@ -9280,12 +9403,13 @@ with self; { FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.27"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.27.tar.gz"; - hash = "sha256-jUQnR8JPzYVgEH7Z3rmCZYOPF7yFDLcjf4ttSCGZLXQ="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.31.tar.gz"; + hash = "sha256-BNiF/Dd9RIluXqHE7DEPl5uwTy8YZYp+ek1Qn36Au4A="; }; buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ FileWhich ]; meta = { description = "Check that a library is available for FFI"; homepage = "https://metacpan.org/pod/FFI::CheckLib"; @@ -9293,6 +9417,21 @@ with self; { }; }; + FeatureCompatTry = buildPerlModule { + pname = "Feature-Compat-Try"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Feature-Compat-Try-0.05.tar.gz"; + hash = "sha256-WaHHFzysMNsTHF8T+jhA9xhYju+bV5NS/+FWtVBxbXw="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ SyntaxKeywordTry ]; + meta = { + description = "Make C<try/catch> syntax available"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FFICStat = buildPerlPackage { pname = "FFI-C-Stat"; version = "0.02"; @@ -9392,10 +9531,10 @@ with self; { Filechdir = buildPerlPackage { pname = "File-chdir"; - version = "0.1010"; + version = "0.1011"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz"; - hash = "sha256-78Eh9AvXoPYvjsm4vHD39UCdgc1wXjcAhZbI78RFKwE="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz"; + hash = "sha256-Mev5Et9I1daB3vdLmIDXix86ykNRoO0f41cLjgOvbHk="; }; meta = { description = "A more sensible way to change directories"; @@ -9492,10 +9631,10 @@ with self; { FileCopyRecursiveReduced = buildPerlPackage { pname = "File-Copy-Recursive-Reduced"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; - hash = "sha256-5hj5k6afQ1UgXFj///aYJgnyi0f2RuxuJE5BtcZwfiw="; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.007.tar.gz"; + hash = "sha256-07WFIuaYA6kUN+KcCZ63Bug3Px7vBRik3DZp3T383Cc="; }; buildInputs = [ CaptureTiny PathTiny ]; meta = { @@ -9564,11 +9703,12 @@ with self; { FileFindObject = buildPerlModule { pname = "File-Find-Object"; - version = "0.3.5"; + version = "0.3.8"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz"; - hash = "sha256-3EEkq+ZNwSdOjopeW/nheiqSad66zkWBFbV0afHhapE="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.8.tar.gz"; + hash = "sha256-TlJRRt6GTt+8kJsIRGKe7O0AY7YdQYuXLu8D+ES7NRQ="; }; + buildInputs = [ FileTreeCreate TestFile ]; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { description = "An object oriented File::Find replacement"; @@ -9579,12 +9719,13 @@ with self; { FileFindObjectRule = buildPerlModule { pname = "File-Find-Object-Rule"; - version = "0.0312"; + version = "0.0313"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz"; - hash = "sha256-Pgtsja32Ni5l8jEFMLG+Y37WqsETOZ0QxvkSnnNK//k="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0313.tar.gz"; + hash = "sha256-gZQPKZ1khySPvzDY8ft99sajSz35RApWIbE1yONPz/I="; }; - propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; + buildInputs = [ FileTreeCreate ]; + propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ]; # restore t/sample-data which is corrupted by patching shebangs preCheck = '' tar xf $src */t/sample-data --strip-components=1 @@ -9614,10 +9755,10 @@ with self; { FileFindRulePerl = buildPerlPackage { pname = "File-Find-Rule-Perl"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz"; - hash = "sha256-mkhDP4bgjOGOA1JuKYLeUhYuuQnRlzVGDwfu/K9GPqY="; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.16.tar.gz"; + hash = "sha256-rhiGBQ2cohIjwHPihwq9yA3DDj9VKJoRw32jggqDIf8="; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { @@ -9754,10 +9895,10 @@ with self; { FileListing = buildPerlPackage { pname = "File-Listing"; - version = "6.14"; + version = "6.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.14.tar.gz"; - hash = "sha256-FbOkhx4jFko28iY4G3TUUK9B8SzJSYX1kqZp/Kx7SP8="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Listing-6.16.tar.gz"; + hash = "sha256-GJs6E/wKG6QSudnsWQHp5eREzHRrnwFW1DmTcNM2VcY="; }; propagatedBuildInputs = [ HTTPDate ]; meta = { @@ -9782,10 +9923,10 @@ with self; { FileMimeInfo = buildPerlPackage { pname = "File-MimeInfo"; - version = "0.30"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.30.tar.gz"; - hash = "sha256-4sbkv5C+O4Y7+07628sbSwKfx09OeUvYaWWsp+47qHI="; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.33.tar.gz"; + hash = "sha256-9r6ms4kGITJeycJ5KvruiOlIoK4dEIcvpyxxELPhscQ="; }; doCheck = false; # Failed test 'desktop file is the right one' buildInputs = [ FileBaseDir FileDesktopEntry EncodeLocale ]; @@ -9810,10 +9951,10 @@ with self; { FileMap = buildPerlModule { pname = "File-Map"; - version = "0.67"; + version = "0.71"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.67.tar.gz"; - hash = "sha256-Enhdvt/CzN+jjbTZenhGSSWRjbNy/Rm67PL6l68i+8I="; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Map-0.71.tar.gz"; + hash = "sha256-yOJpM4BOhw1KupJiO3iGrIs8dgyY+/zTvcSyMFxGR1k="; }; perlPreHook = "export LD=$CC"; propagatedBuildInputs = [ PerlIOLayers SubExporterProgressive ]; @@ -9927,10 +10068,10 @@ with self; { FileRemove = buildPerlModule { pname = "File-Remove"; - version = "1.60"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.60.tar.gz"; - hash = "sha256-6G4qQP/txtVpfQcVA/1roUpfm4IgrzrwIhENjnJPjKY="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.61.tar.gz"; + hash = "sha256-/YV/WFkI/FA0YbnkizyFlOZTV2a8FL6xfJC6WNXcSXU="; }; meta = { description = "Remove files and directories"; @@ -9940,12 +10081,12 @@ with self; { FileShare = buildPerlPackage { pname = "File-Share"; - version = "0.25"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz"; - hash = "sha256-jp0lbgrEOEIoOEtK0qV4GaFj7bOfIJiO1cExjAFAcHA="; + url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.27.tar.gz"; + hash = "sha256-1uj0tV69OOC7ReRDkuP6J9wf3harxdH/U+FX4ZpXVb4="; }; - propagatedBuildInputs = [ FileShareDir ]; + propagatedBuildInputs = [ FileShareDir Readonly ]; meta = { description = "Extend File::ShareDir to Local Libraries"; homepage = "https://github.com/ingydotnet/file-share-pm"; @@ -9986,10 +10127,10 @@ with self; { FileShareDirInstall = buildPerlPackage { pname = "File-ShareDir-Install"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz"; - hash = "sha256-Rb798Nlcvv58JaHa8pPYX3gNbSV2FGVG5oKKrSblgPk="; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.14.tar.gz"; + hash = "sha256-j5UzsZjy1KmlKIy8fSJPdnmtBaeoVzdFWZeJQovFrqA="; }; meta = { description = "Install shared files"; @@ -10056,10 +10197,10 @@ with self; { FileSlurper = buildPerlPackage { pname = "File-Slurper"; - version = "0.012"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz"; - hash = "sha256-TvsupBaxEKG9pvgTNUnMbqNnZALjyvdSn84DEyUKpXg="; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.014.tar.gz"; + hash = "sha256-1aNkhzOYiMPNdY5kgWDuHXDrQVPKy6/1eEbbzvs0Sww="; }; buildInputs = [ TestWarnings ]; meta = { @@ -10097,10 +10238,10 @@ with self; { FileTouch = buildPerlPackage { pname = "File-Touch"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz"; - hash = "sha256-43ml/4lCDPOZBuXO/zCbjOlY+Z+cPletUrUAKjmC2Tw="; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.12.tar.gz"; + hash = "sha256-KgTcQk30jpjFRVbGBFyrAmpJ43N6qUohz0l3YbDy5Zw="; }; meta = { description = "Update file access and modification times, optionally creating files if needed"; @@ -10110,6 +10251,20 @@ with self; { }; }; + FileTreeCreate = buildPerlModule { + pname = "File-TreeCreate"; + version = "0.0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-TreeCreate-0.0.1.tar.gz"; + hash = "sha256-V2hvEIQ76Br/rRha5BMXkLoMSvNtIQTW+2kSZSgFUmc="; + }; + meta = { + homepage = "http://metacpan.org/release/File-TreeCreate"; + description = "Recursively create a directory tree"; + license = lib.licenses.mit; + }; + }; + FileType = buildPerlModule { pname = "File-Type"; version = "0.22"; @@ -10156,10 +10311,10 @@ with self; { FileWhich = buildPerlPackage { pname = "File-Which"; - version = "1.23"; + version = "1.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz"; - hash = "sha256-t53CJEstl7bycWf8O3eZ72GheQQPOr12zh4KOwvE4Hg="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.27.tar.gz"; + hash = "sha256-MgHxpg4/FkhAguYEXIloQiYfw0Xen7LmIP0qLHrzqTo="; }; meta = { description = "Perl implementation of the which utility as an API"; @@ -10183,10 +10338,10 @@ with self; { Filter = buildPerlPackage { pname = "Filter"; - version = "1.60"; + version = "1.64"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.60.tar.gz"; - hash = "sha256-4R7y8u6HJ7f2Zv0kmjIm92jm6t/VHZzbSbPD8aNUZPk="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.64.tar.gz"; + hash = "sha256-E+f7fh0yZZjjZgEDzxl0vun2kKxbQ7M58sAi8rX87yw="; }; meta = { description = "Source Filters"; @@ -10298,10 +10453,10 @@ with self; { FunctionParameters = buildPerlPackage { pname = "Function-Parameters"; - version = "2.001003"; + version = "2.002004"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.001003.tar.gz"; - hash = "sha256-6qIsa0PAJJnsfbB1jC3SGKOyq0enFLK9+AELXuETwkI="; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Function-Parameters-2.002004.tar.gz"; + hash = "sha256-KKvqWODAnOMnmaCMvXr3DaHimXd8KZEZQpygaacYg+g="; }; buildInputs = [ DirSelf TestFatal ]; meta = { @@ -10312,10 +10467,10 @@ with self; { Furl = buildPerlModule { pname = "Furl"; - version = "3.13"; + version = "3.14"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Furl-3.13.tar.gz"; - hash = "sha256-iHrPu7zcq71HQVD5v+nG5QfTUWdbhivM/XZ/6dMWqvM="; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Furl-3.14.tar.gz"; + hash = "sha256-Nd29iIDXHxniAkM+F2H9EXc4XmML9QaFvEi2t6y4V7k="; }; propagatedBuildInputs = [ ClassAccessorLite HTTPParserXS MozillaCA ]; buildInputs = [ HTTPCookieJar HTTPProxy ModuleBuildTiny Plack Starlet TestFakeHTTPD TestRequires TestSharedFork TestTCP TestValgrind URI ]; @@ -10359,12 +10514,12 @@ with self; { FutureIO = buildPerlModule { pname = "Future-IO"; - version = "0.11"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.11.tar.gz"; - hash = "sha256-dVM2JvgfdoxfIxyXAhBsJbV3KotplcqixYvMSsyRB8k="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.14.tar.gz"; + hash = "sha256-a1j++vwwlMJwHwp7mMsUCwmItRaKfV3069Hu6OhyBgo="; }; - buildInputs = [ TestIdentity ]; + buildInputs = [ TestFutureIOImpl ]; propagatedBuildInputs = [ Future StructDumb ]; preCheck = "rm t/06connect.t"; # this test fails in sandbox meta = { @@ -10408,13 +10563,13 @@ with self; { GD = buildPerlPackage { pname = "GD"; - version = "2.73"; + version = "2.78"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.73.tar.gz"; - hash = "sha256-SRyecyOFIuKYfmZyWiCTX0Joo4ZCAuy69GWaFpG6Mis="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.78.tar.gz"; + hash = "sha256-aDEFS/VCS09cI9NifT0UhEgPb5wsZmMiIpFfKFG+buQ="; }; - buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ]; + buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork TestNoWarnings ]; # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = [ "format" ]; @@ -10519,10 +10674,10 @@ with self; { GetoptLong = buildPerlPackage { pname = "Getopt-Long"; - version = "2.52"; + version = "2.54"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.52.tar.gz"; - hash = "sha256-ncenw3M1PVwF765UjnsSOqijHR9Qbrjbvsjw3Kd3Bfo="; + url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.54.tar.gz"; + hash = "sha256-WEujyZuy1rNBN1IS+bh0YT9wbPsBzuIbiiZ2qYq5hf4="; }; meta = { description = "Extended processing of command line options"; @@ -10532,10 +10687,10 @@ with self; { GetoptLongDescriptive = buildPerlPackage { pname = "Getopt-Long-Descriptive"; - version = "0.105"; + version = "0.111"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.105.tar.gz"; - hash = "sha256-pxzbz0BDWIsmpCoT0VHCQ/bszzjo/AsY/7W1NlGrjBU="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.111.tar.gz"; + hash = "sha256-m40V/K8Y/ddAJGtDjw5+uRS4McUdnXCMCZ7Kd2YiB20="; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -10576,10 +10731,10 @@ with self; { GitAutofixup = buildPerlPackage rec { pname = "App-Git-Autofixup"; - version = "0.003001"; + version = "0.004001"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz"; - hash = "sha256-F/ayRn/nnFksouFyx3vmICNlxK+hncifKhMNIT+o8eA="; + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.004001.tar.gz"; + hash = "sha256-WroBPI3hOZD1iRoOKjnJcHTQcnvjZTIMLGrxnTbF3aw="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' @@ -10611,10 +10766,10 @@ with self; { GitRepository = buildPerlPackage { pname = "Git-Repository"; - version = "1.324"; + version = "1.325"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz"; - hash = "sha256-gU360QSpVGNJ+eD9SSyGE33oJ+vChAF6kaUmfBIK1PY="; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.325.tar.gz"; + hash = "sha256-mypPoZT0oOtFI1XQyAhyfl6cFsFFrH0kw+qW0Kvv7UM="; }; buildInputs = [ TestRequiresGit ]; propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ]; @@ -10626,10 +10781,10 @@ with self; { GitVersionCompare = buildPerlPackage { pname = "Git-Version-Compare"; - version = "1.004"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz"; - hash = "sha256-Y+gmTtNRyyNxtHhSpyNmIUFktfP62dvWgwnH/GPQZJE="; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.005.tar.gz"; + hash = "sha256-NX/e2eVflesvUWoY9dwbRyCp3u+eLA52vNX+SuubPLs="; }; buildInputs = [ TestNoWarnings ]; meta = { @@ -10640,10 +10795,10 @@ with self; { Glib = buildPerlPackage { pname = "Glib"; - version = "1.3293"; + version = "1.3294"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz"; - hash = "sha256-cxagwefMXLPbchEhT0XXvcI1Q2WmgKxL06yL8G0ctQA="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3294.tar.gz"; + hash = "sha256-1xX1qGvMGHB13oXnrlvAewcU1u3BlqktpDmG76ROXLs="; }; buildInputs = [ pkgs.glib ]; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; @@ -10656,10 +10811,10 @@ with self; { GlibObjectIntrospection = buildPerlPackage { pname = "Glib-Object-Introspection"; - version = "0.049"; + version = "0.051"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; - hash = "sha256-RkYoy53QKLEEOMI4kt5vijAgI1Wk5OsBv9E7jP41r1c="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.051.tar.gz"; + hash = "sha256-ZWlhHcyArBSCx8IiZLGujJw1HUmDUR65psX0ehAVAIk="; }; nativeCheckInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; @@ -10684,10 +10839,10 @@ with self; { Gnome2 = buildPerlPackage { pname = "Gnome2"; - version = "1.047"; + version = "1.048"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz"; - hash = "sha256-zMhcXcPBT5Fe0aGG0jhoHYP+89F+7RwgABSZ/1a2OQw="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.048.tar.gz"; + hash = "sha256-ZPzDgnFKvY1XaSrDdjKMOiDGy8i81zKwB9FMv5ooLd0="; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; @@ -10701,10 +10856,10 @@ with self; { Gnome2Canvas = buildPerlPackage { pname = "Gnome2-Canvas"; - version = "1.004"; + version = "1.006"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.004.tar.gz"; - hash = "sha256-ObezmyNdE85IhJ/QKnrNC4dIpLslXVtKLWkUjKtbgjw="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz"; + hash = "sha256-aQZnxziSHeLWUWtOtjlVOlceSoMQ2AMfFYZYU23lq0I="; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; propagatedBuildInputs = [ Gtk2 ]; @@ -10717,10 +10872,10 @@ with self; { Gnome2VFS = buildPerlPackage { pname = "Gnome2-VFS"; - version = "1.083"; + version = "1.084"; src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz"; - hash = "sha256-7Kl0Zp305/IbT87blsijKEIjacaLjCzZm5zpzF16eXk="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.084.tar.gz"; + hash = "sha256-PI2Mlca2XCN9ueiJx57bK7gIvzfAhKvfu9mFn+93h8w="; }; propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; meta = { @@ -10731,10 +10886,10 @@ with self; { Gnome2Wnck = buildPerlPackage { pname = "Gnome2-Wnck"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; - hash = "sha256-YEqOzoisKfEy1ZsMqsJ2V+wxNxwWBqRpiiFg6IrFhuU="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz"; + hash = "sha256-RL7OyLLX9B8ngKc7CSJp/bec1JJluuDI/zkQN8RWSjU="; }; buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; propagatedBuildInputs = [ Gtk2 ]; @@ -10762,10 +10917,10 @@ with self; { GnuPGInterface = buildPerlPackage { pname = "GnuPG-Interface"; - version = "1.02"; + version = "1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.02.tar.gz"; - hash = "sha256-wnpIw9SOGpIF42Lu6mbUawMr2EY3mR/fCxOCi8r90+Y="; + url = "mirror://cpan/authors/id/B/BP/BPS/GnuPG-Interface-1.03.tar.gz"; + hash = "sha256-WvVmMPD6wpDXJCGD9kSaoOAoKfRhHcYrxunps4CPGHo="; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; propagatedBuildInputs = [ MooXHandlesVia MooXlate ]; @@ -10868,10 +11023,10 @@ with self; { Graph = buildPerlPackage { pname = "Graph"; - version = "0.9722"; + version = "0.9727"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9722.tar.gz"; - hash = "sha256-wRNjODPzob74+o65ZoC+NtAOQe9AS93X/Au5hwPijU0="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9727.tar.gz"; + hash = "sha256-OSqJFtyVExq+jJE9/Kx2mEhL9IZrQq9fcEPABi50Iik="; }; propagatedBuildInputs = [ HeapFibonacci SetObject ]; meta = { @@ -10898,10 +11053,10 @@ with self; { GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; - version = "16"; + version = "20"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; - hash = "sha256-Kv0JTCBGnvp8+cMmDjzuqd4Qw9r+BjOo0eJC405OOdg="; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-20.tar.gz"; + hash = "sha256-PlXMIJRl4GQBmiFaUvBf9RBAKX0CA5P+n7PeJ60CDjU="; }; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; @@ -10912,12 +11067,26 @@ with self; { }; }; + GraphicsToolkitColor = buildPerlPackage { + pname = "Graphics-Toolkit-Color"; + version = "1.71"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LI/LICHTKIND/Graphics-Toolkit-Color-1.71.tar.gz"; + hash = "sha256-NOiLb2hY9H2ZYQHxWC8esA23+G4Snl8dYb9/m922LvI="; + }; + buildInputs = [ TestWarn ]; + meta = { + description = "Color palette constructor"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphViz = buildPerlPackage { pname = "GraphViz"; - version = "2.24"; + version = "2.26"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz"; - hash = "sha256-2V76xM3u2xgoMQDv4+AMWcGt1STZzojByKNYNZEi9a0="; + url = "mirror://cpan/authors/id/E/ET/ETJ/GraphViz-2.26.tar.gz"; + hash = "sha256-ml0lILMmK/MEdSct12SkRfjn+TG++Ivg49O/9EXacyg="; }; # XXX: It'd be nicer it `GraphViz.pm' could record the path to graphviz. @@ -11008,6 +11177,10 @@ with self; { url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz"; hash = "sha256-ScRDdDsu7+EadoACck9/akxI78lP8806VZ+357aTyWc="; }; + patches = [ + # Fix incompatible function pointer conversion (assigning `GdkNativeWindow` to `guint32`). + ../development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch + ]; buildInputs = [ pkgs.gtk2 ]; # https://rt.cpan.org/Public/Bug/Display.html?id=130742 # doCheck = !stdenv.isDarwin; @@ -11022,10 +11195,10 @@ with self; { Gtk2TrayIcon = buildPerlPackage { pname = "Gtk2-TrayIcon"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz"; - hash = "sha256-y7djK3XX9BVU3+jukGPb/R2FIikQd8ZdDYLpzrXpSuI="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-TrayIcon-0.07.tar.gz"; + hash = "sha256-OfwrmabmE9qeqXfYy1MD+l4H5poVJIk03hIXqXuWRVQ="; }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; meta = { @@ -11073,10 +11246,10 @@ with self; { Gtk2Unique = buildPerlPackage { pname = "Gtk2-Unique"; - version = "0.05"; + version = "0.07"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz"; - hash = "sha256-ro37D2hE3aos57W0RVNBlJDI6Dwk/TXEMUBqWPa+D08="; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-Unique-0.07.tar.gz"; + hash = "sha256-nOX2ikFgC8z31u/eMMBwqxFOk57XqKx8O3rZE5mJGGc="; }; propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; meta = { @@ -11175,6 +11348,9 @@ with self; { buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + patches = [ + ../development/perl-modules/Hailo-fix-test-gld.patch + ]; postPatch = '' patchShebangs bin ''; @@ -11282,6 +11458,21 @@ with self; { }; }; + HashOrdered = buildPerlPackage { + pname = "Hash-Ordered"; + version = "0.014"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Hash-Ordered-0.014.tar.gz"; + hash = "sha256-jcNs15FVrjerij3l/ZEg/7qaMeQJJYwoUp7FJRxZdHs="; + }; + buildInputs = [ TestDeep TestFailWarnings TestFatal ]; + meta = { + homepage = "https://github.com/dagolden/Hash-Ordered"; + description = "A fast, pure-Perl ordered hash class"; + license = lib.licenses.asl20; + }; + }; + HashSafeKeys = buildPerlPackage { pname = "Hash-SafeKeys"; version = "0.04"; @@ -11397,10 +11588,10 @@ with self; { HTMLEscape = buildPerlModule { pname = "HTML-Escape"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz"; - hash = "sha256-scusQVetje2saRThYohV4FuNyIWkAH0uTfgXfGqbcPs="; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.11.tar.gz"; + hash = "sha256-Wl7viWUA0epsJKkIXs++mkOr7mjPxmwD+InSostoml0="; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -11429,12 +11620,13 @@ with self; { HTMLForm = buildPerlPackage { pname = "HTML-Form"; - version = "6.07"; + version = "6.11"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.07.tar.gz"; - hash = "sha256-faqMfq/0AFUBw0Mci/R41Yu+57g2+GNYGqFK/htLYic="; + url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/HTML-Form-6.11.tar.gz"; + hash = "sha256-Q7+qcIc5NIfS1RJhoap/b4Gpex2P73pI/PbvMrFtZFQ="; }; - propagatedBuildInputs = [ HTMLParser ]; + buildInputs = [ TestWarnings ]; + propagatedBuildInputs = [ HTMLParser URI ]; meta = { description = "Class that represents an HTML form element"; homepage = "https://github.com/libwww-perl/HTML-Form"; @@ -11597,10 +11789,10 @@ with self; { HTMLParser = buildPerlPackage { pname = "HTML-Parser"; - version = "3.75"; + version = "3.81"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/HTML-Parser-3.75.tar.gz"; - hash = "sha256-rGteJajfevVIhSAekcRfuatnRMCM7cGjj8x9ldIRk6k="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Parser-3.81.tar.gz"; + hash = "sha256-wJEKXI+S+IF+3QbM/SJLocLr6MEPVR8DJYeh/IPWL/I="; }; propagatedBuildInputs = [ HTMLTagset HTTPMessage ]; meta = { @@ -11653,10 +11845,10 @@ with self; { HTMLSelectorXPath = buildPerlPackage { pname = "HTML-Selector-XPath"; - version = "0.25"; + version = "0.28"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz"; - hash = "sha256-Gl1N4UvH+G8OvXZik+Ok4SaYzS3gRnMkP/065xVqauE="; + url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.28.tar.gz"; + hash = "sha256-QycX8D7Szz1kETDP09ShU/Ca1PhW2gB4E3kv4LLljQ8="; }; buildInputs = [ TestBase ]; meta = { @@ -11776,10 +11968,10 @@ with self; { HTMLTiny = buildPerlPackage { pname = "HTML-Tiny"; - version = "1.05"; + version = "1.08"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz"; - hash = "sha256-183J1ZheLkTOuhC3Vqzx4NOhs+47UW5bVK24UP55/aM="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/HTML-Tiny-1.08.tar.gz"; + hash = "sha256-DwHfDJ/ICz2dooi6q/jApTdHRE964euWAOevxKPc/rU="; }; meta = { description = "Lightweight, dependency free HTML/XML generation"; @@ -11879,10 +12071,10 @@ with self; { HTTPCookieJar = buildPerlPackage { pname = "HTTP-CookieJar"; - version = "0.010"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.010.tar.gz"; - hash = "sha256-VuMz6CPF2HKiiSQEgrlM3oQesDe38v/U0bQ6opjG9dA="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.014.tar.gz"; + hash = "sha256-cJTqXJH1NtJjuF6Dq06alj4RxECM4I7K5VP6nAzEfnM="; }; propagatedBuildInputs = [ HTTPDate ]; buildInputs = [ TestDeep TestRequires URI ]; @@ -11897,10 +12089,10 @@ with self; { HTTPCookies = buildPerlPackage { pname = "HTTP-Cookies"; - version = "6.09"; + version = "6.10"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.09.tar.gz"; - hash = "sha256-kD8Bevqlt4WZzJDvwU7MzIzC6/tjbrjAL48WuoYdH+A="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.10.tar.gz"; + hash = "sha256-4282Yzxc5rXkuHb/z3R4fMXv4HNt1/SHvdc8FPC9cAc="; }; propagatedBuildInputs = [ HTTPMessage ]; meta = { @@ -11912,29 +12104,11 @@ with self; { HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.14"; + version = "6.16"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.14.tar.gz"; - hash = "sha256-8HZ+fzy7gLITE8dh8HrY7SU7zp+i0LqAaz+3LTCbLh0="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.16.tar.gz"; + hash = "sha256-s40JJyXm+k4MTcKkfhVwcEkbr6Db4Wx4o1joBqp+Fz0="; }; - patches = [ - # Patches for CVE-2022-3108, from upstream pre 6.15 - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/331d5c1d1f0e48e6b57ef738c2a8509b1eb53376.patch"; - hash = "sha256-vRSyiO38jnsSeKeGbCnKi+VLaTqQSB349eybl1Wa8SQ="; - name = "HTTP-Daemon-CVE-2022-3108-pre.patch"; - }) - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/e84475de51d6fd7b29354a997413472a99db70b2.patch"; - hash = "sha256-z8RXcbVEpjSZcm8dUZcDWYeQHtVZODOGCdcDTfXQpfA="; - name = "HTTP-Daemon-CVE-2022-3108-1.patch"; - }) - (fetchpatch { - url = "https://github.com/libwww-perl/HTTP-Daemon/commit/8dc5269d59e2d5d9eb1647d82c449ccd880f7fd0.patch"; - hash = "sha256-e1lxt+AJGfbjNOZoKj696H2Ftkx9wlTF557WkZCLE5Q="; - name = "HTTP-Daemon-CVE-2022-3108-2.patch"; - }) - ]; buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { @@ -11946,10 +12120,10 @@ with self; { HTTPDate = buildPerlPackage { pname = "HTTP-Date"; - version = "6.05"; + version = "6.06"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz"; - hash = "sha256-Nl1ilN+9N+vFHe+LZbget5s5NOy8laLsLU2Cfv5qkis="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.06.tar.gz"; + hash = "sha256-e2hRkcasw+dz0fwCyV7h+frpT3d4MXX154wYHMktK1I="; }; propagatedBuildInputs = [ TimeDate ]; meta = { @@ -12053,13 +12227,13 @@ with self; { HTTPMessage = buildPerlPackage { pname = "HTTP-Message"; - version = "6.26"; + version = "6.45"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.26.tar.gz"; - hash = "sha256-bObDWd51w7uGaWo5AYm0heyT4//FUya20ET6kA8XJeE="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.45.tar.gz"; + hash = "sha256-AcuEBmEqP3OIQtHpcxOuTYdIcNG41tZjMfFgAJQ9TL4="; }; - buildInputs = [ TryTiny ]; - propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + buildInputs = [ TestNeeds TryTiny ]; + propagatedBuildInputs = [ Clone EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { description = "HTTP style message (base class)"; homepage = "https://github.com/libwww-perl/HTTP-Message"; @@ -12229,10 +12403,10 @@ with self; { HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.17.tar.gz"; - hash = "sha256-R70RHkdFZtczxBhw4jdMgWidteC1pDrcSK22ZdifsGc="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.18.tar.gz"; + hash = "sha256-gDgLjTPGv6lrsBBPpqQcJ9zE6cg6SN8frTkJf1/c/eU="; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { @@ -12305,10 +12479,10 @@ with self; { ImageInfo = buildPerlPackage { pname = "Image-Info"; - version = "1.42"; + version = "1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz"; - hash = "sha256-K8pWDD9xs8HNY6w6l05i87rrmGt/+qAmuSkIG5FKj08="; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.44.tar.gz"; + hash = "sha256-y3/GXdHv/gHrR8HHmlLdFlT0KOOpfbHvI7EmzgFjbw0="; }; propagatedBuildInputs = [ IOStringy ]; meta = { @@ -12431,10 +12605,10 @@ with self; { IO = buildPerlPackage { pname = "IO"; - version = "1.42"; + version = "1.51"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz"; - hash = "sha256-7sXMM6bN26i10kJbYHUogq3X5NQbdDGg6k3Nc8wfjMo="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.51.tar.gz"; + hash = "sha256-VJPqVZmHKM0rfsuCNMWPtdXfJwmNDwet3KIkRNdhbOA="; }; doCheck = false; meta = { @@ -12486,7 +12660,7 @@ with self; { }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ FutureIO TestFatal TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ TestFatal TestFutureIOImpl TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -12495,19 +12669,11 @@ with self; { IOAsyncSSL = buildPerlModule { pname = "IO-Async-SSL"; - version = "0.23"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz"; - hash = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.25.tar.gz"; + hash = "sha256-Te9IXbHv9OE5tLWRIgLA/WHDrtLOw1vVq4v3u9g/WnU="; }; - patches = [ - (fetchpatch { - # Fixes test compatibility with OpenSSL 3 - url = "https://sources.debian.org/data/main/libi/libio-async-ssl-perl/0.23-1/debian/patches/upgrade-error-match.patch"; - hash = "sha256-RK36nVba203I9awZtHiU7jwhCV7U8Gw6wnbs3e9Hbjk="; - name = "IO-Async-SSL-upgrade-error-match.patch"; - }) - ]; buildInputs = [ TestIdentity ]; propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; meta = { @@ -12546,10 +12712,10 @@ with self; { IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.102"; + version = "2.206"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.102.tar.gz"; - hash = "sha256-1vp/mlvu5EZFKg+8Q1iaDHP+fpJcB1uYYosBgEjccqQ="; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.206.tar.gz"; + hash = "sha256-fTBiuaSU91fo0GFPIg2D8icxu9oa6198/w5yqD9DPTU="; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Same as CompressRawZlib @@ -12605,12 +12771,25 @@ with self; { }; }; + IOInterface = buildPerlModule { + pname = "IO-Interface"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.09.tar.gz"; + hash = "sha256-5j6BxS6x4OYOwtmD9VUtJJPhFxeZJclnV/I8S9n6cTo="; + }; + meta = { + description = "Access and modify network interface card configuration"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOInteractive = buildPerlPackage { pname = "IO-Interactive"; - version = "1.022"; + version = "1.025"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz"; - hash = "sha256-DtU7iuk66Hfpjg2Jt7Qp4pzNHuTCjpUsTqmqc9Af69w="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.025.tar.gz"; + hash = "sha256-yh7G+6t6AnXdLpz2e3yw4ARYY/MVMyEMfcVEYxtqqqc="; }; meta = { description = "Utilities for interactive I/O"; @@ -12721,10 +12900,10 @@ with self; { IOSocketINET6 = buildPerlModule { pname = "IO-Socket-INET6"; - version = "2.72"; + version = "2.73"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz"; - hash = "sha256-heAg+heShBJfwdCOYKkCKvPsEnEHf+FLEzwXhc2/Hrs="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.73.tar.gz"; + hash = "sha256-ttp0aFMlPVtKxDGRtPaaRxlZXuE6fKZ2qAVM825tFrs="; }; propagatedBuildInputs = [ Socket6 ]; doCheck = false; @@ -12736,10 +12915,10 @@ with self; { IOSocketSSL = buildPerlPackage { pname = "IO-Socket-SSL"; - version = "2.068"; + version = "2.083"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.068.tar.gz"; - hash = "sha256-RCD8AFbxgntN0SRerMoNpW4hgrTvb8B48QfcQ8P7j/k="; + url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.083.tar.gz"; + hash = "sha256-kE7yh2VECpfYqaDfWX+MPX88sKBT0bCCwQvtA7yAIGk="; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; # Fix path to default certificate store. @@ -12842,11 +13021,12 @@ with self; { IOTty = buildPerlPackage { pname = "IO-Tty"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.15.tar.gz"; - hash = "sha256-Q/nMD4diC7sVngiQ4ZayOo5kGcvQQiTBDz3O6Uj2tRo="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.17.tar.gz"; + hash = "sha256-pfGoMCC8W13WwbVw9Ix1RuCo9/rBCgaHQLA5Ja2eFOg="; }; + patches = [ ../development/perl-modules/IO-Tty-fix-makefile.patch ]; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox meta = { description = "Low-level allocate a pseudo-Tty, import constants"; @@ -12900,10 +13080,10 @@ with self; { IPCRun = buildPerlPackage { pname = "IPC-Run"; - version = "20200505.0"; + version = "20231003.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20200505.0.tar.gz"; - hash = "sha256-gW6/IX+g35nFg9c8Csxs7XisdzeHxmTHXL8UC7fkyQE="; + url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20231003.0.tar.gz"; + hash = "sha256-6yW731kT0pF5fvG/6ZjxUTC0VdPtAqrN5oVvCyXk/lc="; }; doCheck = false; /* attempts a network connection to localhost */ propagatedBuildInputs = [ IOTty ]; @@ -13040,10 +13220,10 @@ with self; { InlineC = buildPerlPackage { pname = "Inline-C"; - version = "0.81"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz"; - hash = "sha256-8YUljZBQ1/ebTwDxJiXMRpwvcA/2LT6DHLGNgNLIeqw="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-C-0.82.tar.gz"; + hash = "sha256-EPvPHhWNHI134d2TTjeRZbEmpFwTZFrQvp3AfRUd0Mw="; }; buildInputs = [ FileCopyRecursive TestWarn YAMLLibYAML ]; propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; @@ -13061,13 +13241,14 @@ with self; { InlineJava = buildPerlPackage { pname = "Inline-Java"; - version = "0.66"; + version = "0.67"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz"; - hash = "sha256-x0PgaOb28b2HMGH+R6h05cJIpP2ks8fM6J8P2/oz2Ug="; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.67.tar.gz"; + hash = "sha256-9YVLMcvOFjwz4mJN0jFODA2X4JRDcbcYjlkBuj9vpMk="; }; + buildInputs = [ FileWhich ]; propagatedBuildInputs = [ Inline ]; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 @@ -13103,13 +13284,14 @@ with self; { }; }; - JavaScriptMinifierXS = buildPerlModule { + JavaScriptMinifierXS = buildPerlPackage { pname = "JavaScript-Minifier-XS"; - version = "0.11"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; - hash = "sha256-FRISykvVCy9eHebQHjywhGBAe9dfJ9/IFi8veSeDnu4="; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.15.tar.gz"; + hash = "sha256-XZsDT1jwtv9bZGR708WpzgWypw7e4zn7wxc67nR8wFA="; }; + buildInputs = [ TestDiagINC ]; perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; @@ -13134,10 +13316,10 @@ with self; { JSON = buildPerlPackage { pname = "JSON"; - version = "4.02"; + version = "4.10"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz"; - hash = "sha256-REqIdVqJ/6KlQkq07R0R3KYYCOvvV+gSQ0JGGanoYnw="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.10.tar.gz"; + hash = "sha256-34tRQ9mn3pnEe1XxoXC9H2n3EZNcGGptwKtW3QV1jjU="; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -13152,12 +13334,12 @@ with self; { JSONAny = buildPerlPackage { pname = "JSON-Any"; - version = "1.39"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz"; - hash = "sha256-rkl1XPNxCmoydqN6t9XD5+DArrLas1Ss12gsCad5V8M="; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.40.tar.gz"; + hash = "sha256-CDJWJVpICU/ZrBI54P6ooQojg6nNHvSxxyZO3htEAKs="; }; - buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; + buildInputs = [ TestFatal TestNeeds TestWarnings TestWithoutModule ]; meta = { description = "(DEPRECATED) Wrapper Class for the various JSON classes"; homepage = "https://github.com/karenetheridge/JSON-Any"; @@ -13181,10 +13363,10 @@ with self; { JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; - version = "1.004003"; + version = "1.004005"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004003.tar.gz"; - hash = "sha256-W+47F/+dz/1umauM9/NXR2UL/OHcYi460QuFoZRGL78="; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.004005.tar.gz"; + hash = "sha256-9ba8GfV55mtymfh0i4rD4XGTbcTn/LcqiiV6m9SCozE="; }; buildInputs = [ TestNeeds ]; meta = { @@ -13195,10 +13377,10 @@ with self; { JSONPP = buildPerlPackage { pname = "JSON-PP"; - version = "4.05"; + version = "4.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.05.tar.gz"; - hash = "sha256-1aK8przPTUT0Ouqs4PRa5lQbt/UNtaSJtdL/X76L8M4="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.16.tar.gz"; + hash = "sha256-i8LxYrr8QmRcSJkFrXJUDw08KEs2DJYpkJUYPDDMl4k="; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -13222,10 +13404,10 @@ with self; { JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; - hash = "sha256-zo5V5wvvm8u6LpavYx0QpgWQCWGiLK2XfnGqtWw/KAY="; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.62.tar.gz"; + hash = "sha256-YnMYD5OSSXQB3dbYIHBvWqhsG+iIkd1qq02Qa1z/Ztk="; }; meta = { description = "Parse JSON"; @@ -13403,10 +13585,10 @@ with self; { LexicalSealRequireHints = buildPerlModule { pname = "Lexical-SealRequireHints"; - version = "0.0011"; + version = "0.012"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz"; - hash = "sha256-npGO0RjvaF1uCdqxzW5m7gox13b+JLumPlJDkG9WATo="; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.012.tar.gz"; + hash = "sha256-wyvcOOBvjWyQdlu74xaMNYJH2n2uhbgLqEotoXY3V90="; }; meta = { description = "Prevent leakage of lexical hints"; @@ -13473,10 +13655,10 @@ with self; { libintl-perl = buildPerlPackage { pname = "libintl-perl"; - version = "1.32"; + version = "1.33"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.32.tar.gz"; - hash = "sha256-gBCCmPJWTsv8cRCjBCAI5mXtAMLhVbNrAYjmwRNc66U="; + url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.33.tar.gz"; + hash = "sha256-USbtqczQ7rENuC3e9jy8r329dx54zA+xEMw7WmuGeec="; }; meta = { description = "Portable l10n and i10n functions"; @@ -13486,18 +13668,11 @@ with self; { libnet = buildPerlPackage { pname = "libnet"; - version = "3.12"; + version = "3.15"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.13.tar.gz"; - hash = "sha256-WjX7Hy1KopFoDrGvOImfq0U8IsKOcffHvTdHtaPbNIw="; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.15.tar.gz"; + hash = "sha256-px9NtYDhp2fWk2+qW6848fpheCQ0LaB4tWEoPob49KI="; }; - patches = [ - (fetchpatch { - name = "deterministic-libnet.cfg"; - url = "https://github.com/steve-m-hay/perl-libnet/commit/7d076c4352f67ee4ed64092cfad3963a2321bd53.patch"; - hash = "sha256-GyPx0ZQ/u/+DaFM7eNDvXrMFC0+d3GyLxVZJBKrg6V0="; - }) - ]; meta = { description = "Collection of network protocol modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13506,10 +13681,10 @@ with self; { librelative = buildPerlPackage { pname = "lib-relative"; - version = "1.000"; + version = "1.002"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; - hash = "sha256-3+DHAF/Yvd0lp+jCUEsPreFix0ynG096y36OdhBtbNc="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.002.tar.gz"; + hash = "sha256-5EcCFRZ8QGkXYD54vk2TESz2kTzTQq64ALQS4BHIp4s="; }; meta = { description = "Add paths relative to the current file to @INC"; @@ -13520,10 +13695,10 @@ with self; { libwwwperl = buildPerlPackage { pname = "libwww-perl"; - version = "6.70"; + version = "6.72"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/libwww-perl-6.70.tar.gz"; - hash = "sha256-NPANI0R1e5wLVa01gI1T6T19kvekZOyDf+anPFH7WWk="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.72.tar.gz"; + hash = "sha256-6bg1T9XiC+IHr+I93VhPzVm/gpmNwHfez2hLodrloF0="; }; buildInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookieJar HTTPCookies HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP TryTiny URI WWWRobotRules ]; @@ -13734,10 +13909,10 @@ with self; { LinguaTranslit = buildPerlPackage { pname = "Lingua-Translit"; - version = "0.28"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz"; - hash = "sha256-ET+R2PwsYwQ3FTpJ+3pSsCOvj2J47ZbAcLH2CCS46uE="; + url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.29.tar.gz"; + hash = "sha256-GtL6vAB52tcIt9nVVDfJ67GS5hC/lgryWUWFi5JZd1I="; }; doCheck = false; meta = { @@ -13813,10 +13988,10 @@ with self; { LinuxFD = buildPerlModule { pname = "Linux-FD"; - version = "0.011"; + version = "0.014"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz"; - hash = "sha256-a7V51HZEyw7TVib/d+kJrmkGMHPGrAmqBhT+8A+jc1Y="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.014.tar.gz"; + hash = "sha256-eDHcJkxG2bh/dkNhdNdmFBRSQ2Mwg+CQqrTZo1LwQ60="; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; @@ -13830,10 +14005,10 @@ with self; { LinuxInotify2 = buildPerlPackage { pname = "Linux-Inotify2"; - version = "2.2"; + version = "2.3"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz"; - hash = "sha256-3UGiDaVon7IHHuojo4PE4PjYW0YrpluqbE9TolTtNDM="; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.3.tar.gz"; + hash = "sha256-y5kVD5/6UdvDvl7pjY6RyYzf6uIuuI5xjyzzZ78nDRc="; }; propagatedBuildInputs = [ commonsense ]; @@ -13860,10 +14035,10 @@ with self; { ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.18.tar.gz"; - hash = "sha256-t8S/gAkLKBxKFWDHahqBkJTDoSlDAvd6+4xgykhi7Pk="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.19.tar.gz"; + hash = "sha256-MKgUarIad4e4xW1YKc+afysVJ207P8oHM2rDjTAC/7w="; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { @@ -13935,10 +14110,10 @@ with self; { ListSomeUtils = buildPerlPackage { pname = "List-SomeUtils"; - version = "0.58"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz"; - hash = "sha256-lur7NZM50ivyot5CEpiEejxA9qKLbUQAXQll2oalRp0="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.59.tar.gz"; + hash = "sha256-+rMDcuTGe/WkYGLaONHQyHVief6tqGbrQ5+ilXGi3Hs="; }; buildInputs = [ TestLeakTrace ]; propagatedBuildInputs = [ ModuleImplementation ]; @@ -13951,10 +14126,10 @@ with self; { ListUtilsBy = buildPerlModule { pname = "List-UtilsBy"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz"; - hash = "sha256-+t30O0vCHbjkwOiaJuXyP+YmzeNJHsZRtqozhif1d1o="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.12.tar.gz"; + hash = "sha256-//EoH9Rp/pgrGlgES+z9lw8xO/86JuHHsrP0wKXtceA="; }; meta = { description = "Higher-order list utility functions"; @@ -13964,10 +14139,10 @@ with self; { LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.66"; + version = "3.76"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.66.tar.gz"; - hash = "sha256-mfrNbVbijKaPMj0Cy3/GyOuYM7BpalqDPvSsP15cV+c="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.76.tar.gz"; + hash = "sha256-Qo00GFUJ7fbaYoYoAJcohrsCwySTRU/L4Y+Zmk9DXzk="; }; buildInputs = [ TestInter ]; meta = { @@ -14181,10 +14356,10 @@ with self; { LogAny = buildPerlPackage { pname = "Log-Any"; - version = "1.708"; + version = "1.717"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz"; - hash = "sha256-4UB3WdyUYqsJbU3cif6qyKuzQcVCnjjPb3uKmWo17Nk="; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.717.tar.gz"; + hash = "sha256-VmSdoPOQAjDJ49KSUssKdIBvst3r0igFrNc2iVmmW8o="; }; # Syslog test fails. preCheck = "rm t/syslog.t"; @@ -14243,10 +14418,10 @@ with self; { LogDispatch = buildPerlPackage { pname = "Log-Dispatch"; - version = "2.70"; + version = "2.71"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.70.tar.gz"; - hash = "sha256-o9kcxSRn06PGaDED899EctceQFpF9VMolEhxOsQpPyE="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.71.tar.gz"; + hash = "sha256-nWDZZIw1zidUcx603rfwWAns4b1jO3TXR5Wu2exzJXA="; }; propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; buildInputs = [ IPCRun3 TestFatal TestNeeds ]; @@ -14259,10 +14434,10 @@ with self; { LogDispatchFileRotate = buildPerlPackage { pname = "Log-Dispatch-FileRotate"; - version = "1.36"; + version = "1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Log-Dispatch-FileRotate-1.36.tar.gz"; - hash = "sha256-RyyxCw+sa71nKYvCjxSVhZrYWy356IxKH366c0+IlW4="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Log-Dispatch-FileRotate-1.38.tar.gz"; + hash = "sha256-tV1s7ePwoGQmSI+/pVT0VhMgsBTBAjiTztKVCOW85Ow="; }; propagatedBuildInputs = [ DateManip LogDispatch ]; buildInputs = [ PathTiny TestWarn ]; @@ -14290,10 +14465,10 @@ with self; { Logger = buildPerlPackage { pname = "Log-ger"; - version = "0.037"; + version = "0.040"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.037.tar.gz"; - hash = "sha256-wuJBcu2iBD14bm4gUUG72xvei7Lt/CtjAtxPih46oDg="; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.040.tar.gz"; + hash = "sha256-6JEdM4ePoWmeQ+jQpU7V1WEEA4Z/9cM5+TQQPRfsZLA="; }; meta = { description = "A lightweight, flexible logging framework"; @@ -14359,10 +14534,10 @@ with self; { MCE = buildPerlPackage { pname = "MCE"; - version = "1.874"; + version = "1.889"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz"; - hash = "sha256-2AnjAYR1EVrX7MuL70m9478+dau7zYBWRyi7z6uG09A="; + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.889.tar.gz"; + hash = "sha256-22FT5HTQRvwlMFC/U8VAAthM1Mp30hwrnfVv7rgJu+0="; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -14388,10 +14563,10 @@ with self; { LogDispatchArray = buildPerlPackage { pname = "Log-Dispatch-Array"; - version = "1.003"; + version = "1.005"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz"; - hash = "sha256-DCCTHC978mp2ugE3C5WCIV/lIWsWGCLAw/IEqB+4fzc="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.005.tar.gz"; + hash = "sha256-MRZAt6ln+N18m7QaInBzVlY21w30/MHUT+2KgiOzR8o="; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ LogDispatch ]; @@ -14404,10 +14579,10 @@ with self; { LogDispatchouli = buildPerlPackage { pname = "Log-Dispatchouli"; - version = "2.022"; + version = "3.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.022.tar.gz"; - hash = "sha256-KipBdq2vuFoeucncOJBSkZ6MLJ35mqulOMBrjalkpd8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-3.007.tar.gz"; + hash = "sha256-mIEYlllSukmo+nkaZTaIDIkBf0651ywXRe1n0VwNJyw="; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; @@ -14467,12 +14642,15 @@ with self; { LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.67"; + version = "6.72"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.67.tar.gz"; - hash = "sha256-lu7ECj/QqhvYNBF75eshxDj3MJTYYaGn5XdPCxImtyM="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.72.tar.gz"; + hash = "sha256-6bg1T9XiC+IHr+I93VhPzVm/gpmNwHfez2hLodrloF0="; }; - propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; + propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPCookieJar HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; + preCheck = '' + export NO_NETWORK_TESTING=1 + ''; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' @@ -14531,15 +14709,17 @@ with self; { LWPProtocolHttps = buildPerlPackage { pname = "LWP-Protocol-https"; - version = "6.09"; + version = "6.11"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.09.tar.gz"; - hash = "sha256-Fs/hpRFpCwZttWZ8hxSALuK5xdKKMaPnvTb7xwo69ZI="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.11.tar.gz"; + hash = "sha256-ATLdvwNmFWXKhQUPKlCU+5Jjy7w8yxpNnEGsm7CDuRc="; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ IOSocketSSL LWP ]; - doCheck = false; # tries to connect to https://www.apache.org/. - buildInputs = [ TestRequiresInternet ]; + preCheck = '' + export NO_NETWORK_TESTING=1 + ''; + buildInputs = [ TestRequiresInternet TestNeeds ]; meta = { description = "Provide https support for LWP::UserAgent"; homepage = "https://github.com/libwww-perl/LWP-Protocol-https"; @@ -14643,10 +14823,10 @@ with self; { MacPasteboard = buildPerlPackage { pname = "Mac-Pasteboard"; - version = "0.011"; + version = "0.103"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.011.tar.gz"; - hash = "sha256-vYxFELHoBcQ+S1UVXAvq8AK2Sf4wtqeEH/Bec5m6Aqk="; + url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.103.tar.gz"; + hash = "sha256-L16N0tsNZEVVhITKbULYOcWpfuiqGyUOaU1n1bf2Y0w="; }; buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; meta = { @@ -14689,13 +14869,13 @@ with self; { MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; - version = "1.20200824.1"; + version = "2.20230112"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200824.1.tar.gz"; - hash = "sha256-M7qo4p+rDobNtHkNAJzFn3IlZyUWaCvHKy1MH4ahHpo="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-2.20230112.tar.gz"; + hash = "sha256-wtFEyuAiX4vJ0PX60cPxOdJ89TT85+rHB2T79m/SI0E="; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ JSON ]; + propagatedBuildInputs = [ Clone JSON ]; meta = { description = "Object Oriented Authentication-Results Headers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -14738,11 +14918,11 @@ with self; { }; MailBox = buildPerlPackage { - version = "3.009"; + version = "3.010"; pname = "Mail-Box"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.009.tar.gz"; - hash = "sha256-kYUhaw4UyRnsI4R2lSVVlJHtfVbSetsbyYWh++t5kWU="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.010.tar.gz"; + hash = "sha256-rhlPolDFRcm5FT4/tRA8qyn3nPKs1On9dc7FMiAalWQ="; }; doCheck = false; @@ -14773,10 +14953,10 @@ with self; { MailMessage = buildPerlPackage { pname = "Mail-Message"; - version = "3.010"; + version = "3.013"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz"; - hash = "sha256-WEFLGuOCmIFTqRXTFyRdid1FDxhuz204PJZLNnOnixM="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.013.tar.gz"; + hash = "sha256-yK1YiNsBWkUOti7Cqj6mbcLdwRtwpdtsjKGn+fgg6B8="; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { @@ -14788,10 +14968,10 @@ with self; { MailDKIM = buildPerlPackage { pname = "Mail-DKIM"; - version = "1.20200907"; + version = "1.20230911"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20200907.tar.gz"; - hash = "sha256-q/8RvQl3ubjDssP8Kg290tONoklWhphxD+wQAtQlG/U="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20230911.tar.gz"; + hash = "sha256-kecxcoK3JM+9LJtuZjDvFDKISLb8UgPv1w3sL7hyaMo="; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system @@ -14804,10 +14984,10 @@ with self; { MailIMAPClient = buildPerlPackage { pname = "Mail-IMAPClient"; - version = "3.42"; + version = "3.43"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz"; - hash = "sha256-HCJk1QxUyDmj44zi+O3aPSTzDMYHlA11dL6rGcsAzn4="; + url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.43.tar.gz"; + hash = "sha256-CTyX+sFbR6j+TSk27y3zd6v3fMirdAktISi7lF0ftG8="; }; propagatedBuildInputs = [ ParseRecDescent ]; meta = { @@ -14818,10 +14998,10 @@ with self; { MailPOP3Client = buildPerlPackage { pname = "Mail-POP3Client"; - version = "2.19"; + version = "2.21"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz"; - hash = "sha256-EULWJHqTy4ayPtiDVVO7LSJ/+CE+4nQ+QVW7k/R6y1k="; + url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.21.tar.gz"; + hash = "sha256-sW7yFJtuNXOHPx5ZDk1RNmxZlLi1MV3xaSXRe4niSQE="; }; meta = { description = "Perl 5 module to talk to a POP3 (RFC1939) server"; @@ -14933,10 +15113,10 @@ with self; { MathBase85 = buildPerlPackage { pname = "Math-Base85"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz"; - hash = "sha256-nqhYYA+SXh/8fwqGO3g1iS2Ymfz0Sz5QkOyjpGm5iw0="; + url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.5.tar.gz"; + hash = "sha256-CwX3+2UKh5ezktjqkPLnK/uNCFBcmi4LlV39RacqNOU="; }; meta = { description = "Perl extension for base 85 numbers, as referenced by RFC 1924"; @@ -15003,10 +15183,10 @@ with self; { MathBigInt = buildPerlPackage { pname = "Math-BigInt"; - version = "1.999818"; + version = "1.999842"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999818.tar.gz"; - hash = "sha256-snY0NWzir5t8ASOsg5WomjL7Fa6ugvzTnegVbK0njBU="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999842.tar.gz"; + hash = "sha256-VGAcUMaZPn7hPYw6wzRs8VpNgGMUnNu+husB5WEORnU="; }; meta = { description = "Arbitrary size integer/float math package"; @@ -15016,10 +15196,10 @@ with self; { MathBigIntGMP = buildPerlPackage { pname = "Math-BigInt-GMP"; - version = "1.6007"; + version = "1.6013"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz"; - hash = "sha256-XXJebSDMs34HJnNijwsN0Q5d0BFhn3D1CtWK3tRUwB8="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6013.tar.gz"; + hash = "sha256-yxqS4CJn1AUV+OA6TiEvZv0wfJdMu9MT4j3jL98Q9rU="; }; buildInputs = [ pkgs.gmp ]; doCheck = false; @@ -15034,10 +15214,10 @@ with self; { MathBigIntLite = buildPerlPackage { pname = "Math-BigInt-Lite"; - version = "0.19"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; - hash = "sha256-MPYDS/XSXAKBPISo5aKpivhuLbyoFJwlqSd3GN8mFRo="; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.29.tar.gz"; + hash = "sha256-R4YN/KYxl4txxKqZkaGynk7LrzYbW7nrOVl1t//Nd/U="; }; propagatedBuildInputs = [ MathBigInt ]; meta = { @@ -15089,10 +15269,10 @@ with self; { MathGMP = buildPerlPackage { pname = "Math-GMP"; - version = "2.20"; + version = "2.25"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz"; - hash = "sha256-Ftpfge9SdChiuzyHhASq/bJM2rT4rL/KEoAzJIe8VV8="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.25.tar.gz"; + hash = "sha256-OCtx5Udi9jnppCqbBpNBUZh7pX0Ru3DTXjvsiNUEUM4="; }; buildInputs = [ pkgs.gmp AlienGMP ]; env.NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include"; @@ -15105,12 +15285,12 @@ with self; { MathGMPz = buildPerlPackage { pname = "Math-GMPz"; - version = "0.48"; + version = "0.59"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SISYPHUS/Math-GMPz-0.48.tar.gz"; - hash = "sha256-9EWe0y+5u3k+JQT9RCxRX9RopKNNKh+Y5GykHidcc8s="; + url = "mirror://cpan/authors/id/S/SI/SISYPHUS/Math-GMPz-0.59.tar.gz"; + hash = "sha256-mmrN45G0Ff5f7HwUyCTVUf/j+W81rycYRWuJ3jpkEaQ="; }; - buildInputs = [ pkgs.gmp ]; + buildInputs = [ TestWarn pkgs.gmp ]; NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "Perl interface to the GMP integer functions"; @@ -15166,7 +15346,7 @@ with self; { MathPari = buildPerlPackage rec { pname = "Math-Pari"; - version = "2.030518"; + version = "2.030523"; nativeBuildInputs = [ pkgs.unzip ]; pariversion = "2.1.7"; pari_tgz = fetchurl { @@ -15241,12 +15421,12 @@ with self; { MathProvablePrime = buildPerlPackage { pname = "Math-ProvablePrime"; - version = "0.045"; + version = "0.51"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz"; - hash = "sha256-MtzkKGHOBlqHWpHsFMZVfomvB98QzEUNHE3tE9y+PdU="; + url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.51.tar.gz"; + hash = "sha256-D7YWRJ+weorR6KgJxwghthjlPcD/3ayWVnYY3jPEbBE="; }; - buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ]; + buildInputs = [ FileWhich TestClass TestDeep TestException TestFailWarnings ]; propagatedBuildInputs = [ BytesRandomSecureTiny ]; meta = { description = "Generate a provable prime number, in pure Perl"; @@ -15372,10 +15552,10 @@ with self; { MaxMindDBReaderXS = buildPerlModule { pname = "MaxMind-DB-Reader-XS"; - version = "1.000008"; + version = "1.000009"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz"; - hash = "sha256-hKr7yC+sjP7q2amOLkhX2+v0Sem4Ff6QiRUNf04Nx4c="; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000009.tar.gz"; + hash = "sha256-qm+4f+0Z1UnymxNd55l+6SsSJ9Ymyw6JBgCpHK3DBTo="; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; @@ -15407,10 +15587,10 @@ with self; { Memoize = buildPerlPackage { pname = "Memoize"; - version = "1.03"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz"; - hash = "sha256-UjnMX2RKULDen/6qUfqZkesG7LG/RniHPjq4mvnA2vM="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Memoize-1.16.tar.gz"; + hash = "sha256-CRlSvPSS7O41ueW41ykgxYAjRB15IIwduHg3xcV4B74="; }; meta = { description = "Make functions faster by trading space for time"; @@ -15478,10 +15658,10 @@ with self; { MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.029000"; + version = "2.030000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz"; - hash = "sha256-xdiDkDs3mlpq2wLgFuxbUiiK8FZS1WTIlTFlk/PH5Xw="; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.030000.tar.gz"; + hash = "sha256-2bdlxSN3VPFyYmljgqc4XZCy0BmGl5gXhisWZLBt068="; }; # Most tests are online, so we only include offline tests @@ -15517,12 +15697,12 @@ with self; { MetricsAny = buildPerlModule { pname = "Metrics-Any"; - version = "0.06"; + version = "0.10"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.06.tar.gz"; - hash = "sha256-nFKd+Oiid7sVjWJBxzvRp+oIrq6eHtu1WDoaB0j7mDc="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Metrics-Any-0.10.tar.gz"; + hash = "sha256-qQ6t+civJKUWu5obZwYfZBhT+QuP7p/8JNK7lyDouZs="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; meta = { description = "Abstract collection of monitoring metrics"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -15532,15 +15712,13 @@ with self; { # TODO: use CPAN version MHonArc = buildPerlPackage rec { pname = "MHonArc"; - version = "2.6.19"; + version = "2.6.24"; src = fetchurl { - url = "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-${version}.tar.gz"; - hash = "sha256-+L8odObqN4MLDVFV+5ms94gAWHffdXPxJ2NE6Ufag1I="; + url = "mirror://cpan/authors/id/L/LD/LDIDRY/MHonArc-2.6.24.tar.gz"; + hash = "sha256-RX3HN07lnLdaBynlHO8vLFK0gYD3Odj9lW6hmIKBXzM="; }; - patches = [ ../development/perl-modules/mhonarc.patch ]; - outputs = [ "out" "dev" ]; # no "devdoc" installTargets = [ "install" ]; @@ -15599,10 +15777,10 @@ with self; { MIMELite = buildPerlPackage { pname = "MIME-Lite"; - version = "3.031"; + version = "3.033"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz"; - hash = "sha256-8SNYZkgrZ/AIWLPtqk/0z5Ce+QDx0V2ImUi/nAOlkeA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.033.tar.gz"; + hash = "sha256-eKJ58dLiQlUcNH75ehP8Z1dmYCy4TCqAxWlAD082i6s="; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { @@ -15643,10 +15821,10 @@ with self; { MIMETypes = buildPerlPackage { pname = "MIME-Types"; - version = "2.18"; + version = "2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.18.tar.gz"; - hash = "sha256-Mco1pB8q6ZjM19M8GeQgI+5lQP2d7WGbmr1I/waglb4="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.24.tar.gz"; + hash = "sha256-Yp42HyKyIL5QwtpzVOI8BFF1dwmgPCWiLzFg7blMtl8="; }; meta = { description = "Definition of MIME types"; @@ -15690,10 +15868,10 @@ with self; { MinionBackendSQLite = buildPerlModule { pname = "Minion-Backend-SQLite"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.6.tar.gz"; - hash = "sha256-/uDUEe9WsAkru8BTN5InaH3hQZUoy2t0T3U9vcH7FNk="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.7.tar.gz"; + hash = "sha256-zd49IrGv+n32seErKlLp88G2gci1k6G+TeO+aOTaXHI="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ Minion MojoSQLite ]; @@ -15707,10 +15885,10 @@ with self; { MinionBackendmysql = buildPerlPackage { pname = "Minion-Backend-mysql"; - version = "1.000"; + version = "1.003"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.000.tar.gz"; - hash = "sha256-cGS+CHHxmbSwTl1yQprfNbLkr2qHGorM0Mm1wqP9E00="; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.003.tar.gz"; + hash = "sha256-aaJcJAyw5NTvTxqjKgTt+Nolt+jTqCDP1kVhWZ7aRUI="; }; buildInputs = [ Testmysqld ]; propagatedBuildInputs = [ Minion Mojomysql ]; @@ -15724,10 +15902,10 @@ with self; { MixinLinewise = buildPerlPackage { pname = "Mixin-Linewise"; - version = "0.108"; + version = "0.111"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz"; - hash = "sha256-ffIGeEdMCXOTCkcrDFXj+Ohbd5C2irGO9hj5xFPIrvI="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.111.tar.gz"; + hash = "sha256-0o6IUWzptSlcMWMdzM3A/I8qt9ilzIdrsbIBMQh7Ads="; }; propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { @@ -15782,11 +15960,11 @@ with self; { ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20200211"; + version = "1.20230106"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20200211.tar.gz"; - hash = "sha256-2hyDzuhPq57bnjHX96usQ+Ezey5mAVGR7EttpZKYxIA="; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20230106.tar.gz"; + hash = "sha256-BFncq4DOgrY0Yf2B7pTgbpplFdmPP7wxmDjdHmAoUfc="; }; meta = { description = "Enable all of the features of Modern Perl with one import"; @@ -15797,10 +15975,10 @@ with self; { Modulecpmfile = buildPerlModule { pname = "Module-cpmfile"; - version = "0.002"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Module-cpmfile-0.002.tar.gz"; - hash = "sha256-iEk/pG307LIe8RdaNJTyUQsGc+nNtN2AVzzo9nhhvaE="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Module-cpmfile-0.006.tar.gz"; + hash = "sha256-G8l24pN3JIlsn26unl3KmB4n+YQwuS3icO41FP0ArA8="; }; buildInputs = [ ModuleBuildTiny ModuleCPANfile Test2Suite ]; propagatedBuildInputs = [ YAMLPP ]; @@ -15814,10 +15992,10 @@ with self; { ModuleBuild = buildPerlPackage { pname = "Module-Build"; - version = "0.4231"; + version = "0.4234"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; - hash = "sha256-fg9MaSwXQMGshOoU1+o9i8eYsvsmwJh3Ip4E9DCytxc="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4234.tar.gz"; + hash = "sha256-Zq6sYSdBi+XkcerTdEZIx2a9AUgoJcW2ZlJnXyvIao8="; }; postConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' # for unknown reason, the first run of Build fails @@ -15903,10 +16081,10 @@ with self; { ModuleBuildTiny = buildPerlModule { pname = "Module-Build-Tiny"; - version = "0.039"; + version = "0.047"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz"; - hash = "sha256-fVgP9qzgy+VVvza4bcjqIyWBUwy+quoJvMtXtVeX8Rw="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.047.tar.gz"; + hash = "sha256-cSYOlCG5PDPdGz59DPFfdZwMp8dT+oQCeew75w+PjJ0="; }; buildInputs = [ FileShareDir ]; propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; @@ -15964,12 +16142,12 @@ with self; { ModuleCPANTSAnalyse = buildPerlPackage { pname = "Module-CPANTS-Analyse"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; - hash = "sha256-vZkLpNAFG22yKEyrhAaZ4zr1QtiBgv1FTPpw6tMeyEk="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.02.tar.gz"; + hash = "sha256-nhFzm5zQi6LXWllzfx+yl/RYA/KJBjxcdZv8eP1Rbns="; }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff ClassAccessor DataBinary FileFindObject ModuleFind ParseDistname PerlPrereqScannerNotQuiteLite SoftwareLicense ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; @@ -15995,10 +16173,10 @@ with self; { ModuleExtractUse = buildPerlModule { pname = "Module-ExtractUse"; - version = "0.343"; + version = "0.345"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; - hash = "sha256-SFJGW0g2GhIM15hyBYF5Lbpa2lJs7vWJHiVNbPl7DAI="; + url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.345.tar.gz"; + hash = "sha256-juJOh0KrnaeSKL4Yfdoxm01fUKkaHs+H1JQhO1uzDdE="; }; propagatedBuildInputs = [ ParseRecDescent PodStrip ]; buildInputs = [ TestDeep TestNoWarnings ]; @@ -16024,10 +16202,10 @@ with self; { ModuleFind = buildPerlPackage { pname = "Module-Find"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz"; - hash = "sha256-XFSCp/4+nhA1s2qYRHC4hvevCV7u/2P18ZrsjNLYqF4="; + url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.16.tar.gz"; + hash = "sha256-S8qqN2kVAUco1PUzqYxbWdZlBRzTzbr8lg5aZv0TEJI="; }; meta = { description = "Find and use installed modules in a (sub)category"; @@ -16069,10 +16247,10 @@ with self; { ModuleInstall = buildPerlPackage { pname = "Module-Install"; - version = "1.19"; + version = "1.21"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz"; - hash = "sha256-GlOnjd86uePAP8XjVLQ2MZqUTLpCgbrwuQT6kyoTARs="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.21.tar.gz"; + hash = "sha256-+/kQB/MFZfOSDhBgVf0NQoeYHV59rYs1MjzktzPxWns="; }; propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; meta = { @@ -16256,10 +16434,10 @@ with self; { ModuleRefresh = buildPerlPackage { pname = "Module-Refresh"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz"; - hash = "sha256-azCmzt3GUSq0SQwWNy7PMJolnyyhR9Yi5HisVOCFEcM="; + url = "mirror://cpan/authors/id/B/BP/BPS/Module-Refresh-0.18.tar.gz"; + hash = "sha256-4JTaqQmv32SJqeKzJzP2haLBy1zIh2BhB1SGEJsN71k="; }; buildInputs = [ PathClass ]; meta = { @@ -16298,12 +16476,13 @@ with self; { ModuleScanDeps = buildPerlPackage { pname = "Module-ScanDeps"; - version = "1.29"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.29.tar.gz"; - hash = "sha256-7rDOkTU6L2JnpkrxeyDY3o96z/YulbYI3qJIAwC4iE4="; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.34.tar.gz"; + hash = "sha256-ysUw5c/EE+BneXx9I3xsXNMpFcPZ+u5dlANcjzqFUOs="; }; - buildInputs = [ TestRequires ]; + buildInputs = [ TestRequires IPCRun3 ]; + propagatedBuildInputs = [ TextParsewords ]; meta = { description = "Recursively scan Perl code for dependencies"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -16369,10 +16548,10 @@ with self; { MojoDOM58 = buildPerlPackage { pname = "Mojo-DOM58"; - version = "2.000"; + version = "3.001"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz"; - hash = "sha256-hkxqNXH7SYaprgrw8shArLEC8fc6Gq8Cewa0K40EXvM="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-3.001.tar.gz"; + hash = "sha256-GLJtVB5TFEFa3d8xQ2nZQMi6BrESNMpQb9vmzyJPV5Y="; }; meta = { description = "Minimalistic HTML/XML DOM parser with CSS selectors"; @@ -16418,10 +16597,10 @@ with self; { MojoliciousPluginAssetPack = buildPerlPackage { pname = "Mojolicious-Plugin-AssetPack"; - version = "2.13"; + version = "2.14"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.13.tar.gz"; - hash = "sha256-8j2HYgo92IoFoZ+aKovRn6UboGDdy0vMHZsfBo73pIg="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-AssetPack-2.14.tar.gz"; + hash = "sha256-jwWMyIw1mb6/ZjeK7GS91uvNkMljGL3m1ov6551j6qM="; }; propagatedBuildInputs = [ FileWhich IPCRun3 Mojolicious ]; meta = { @@ -16577,10 +16756,10 @@ with self; { MojoliciousPluginWebpack = buildPerlPackage { pname = "Mojolicious-Plugin-Webpack"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-1.01.tar.gz"; - hash = "sha256-detndnGR/zMzwNAXsK1vZxHHxIW66i5+6XtTtPzJzfA="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-1.02.tar.gz"; + hash = "sha256-REzqioOZquelrWt8iQ/yFgk8WM6uaxyKBl77cBC3zn0="; }; propagatedBuildInputs = [ Mojolicious Filechdir ]; meta = { @@ -16625,13 +16804,13 @@ with self; { MojoSQLite = buildPerlModule { pname = "Mojo-SQLite"; - version = "3.005"; + version = "3.009"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.005.tar.gz"; - hash = "sha256-Qf3LUFrH9OzUdWez2utcKHyITJE0DG27a7+pkqH/9yo="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.009.tar.gz"; + hash = "sha256-Vzmprz/A/BYrOAMt9hCgcANSY7++C+wWrsUvDd3Xtkc="; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstract URIdb ]; + propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstractPg URIdb URI ]; meta = { description = "A tiny Mojolicious wrapper for SQLite"; homepage = "https://github.com/Grinnz/Mojo-SQLite"; @@ -16642,10 +16821,10 @@ with self; { Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.25"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.25.tar.gz"; - hash = "sha256-YC14GXw0HdCPLLH1XZg31P3gFHQz1k2+vxloaAtVzMs="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.26.tar.gz"; + hash = "sha256-H9LjBlr4Je9N2x2W9g9MVc9NCCD77L0wrHGdTeJx5rw="; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; buildInputs = [ TestDeep ]; @@ -16731,10 +16910,10 @@ with self; { MojoUserAgentCached = buildPerlPackage { pname = "Mojo-UserAgent-Cached"; - version = "1.19"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.19.tar.gz"; - hash = "sha256-wlmZ2qqCHkZUhLWjINFVqlJZAMh4Ml2aiSAfSnWBxd8="; + url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.25.tar.gz"; + hash = "sha256-lZmikTjq/ZKPWF7jDvFm0j/x3FKkBn50hyxR4W3shko="; }; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; @@ -16782,10 +16961,10 @@ with self; { IOPipely = buildPerlPackage { pname = "IO-Pipely"; - version = "0.005"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz"; - hash = "sha256-4zts9csrRu4whRP1HmI5h6UKiZAegb8ZcB3ONRefLnQ="; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.006.tar.gz"; + hash = "sha256-Dj/NhBoyfvtUn6AbIIPcNpXnLqDGMwPlbtUWG/gQQTs="; }; meta = { description = "Portably create pipe() or pipe-like handles, one way or another"; @@ -16796,10 +16975,10 @@ with self; { Moo = buildPerlPackage { pname = "Moo"; - version = "2.004004"; + version = "2.005005"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.004004.tar.gz"; - hash = "sha256-cUt3sRV4hwjG2KtvGO6hc/gQnTl67NNOMsxxoP/PIkY="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.005005.tar.gz"; + hash = "sha256-+1opUmSfrtBzc/Igt4AEqcaro4dzkTN0DBdw6bH0sQg="; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; @@ -16811,13 +16990,13 @@ with self; { Moose = buildPerlPackage { pname = "Moose"; - version = "2.2013"; + version = "2.2206"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2013.tar.gz"; - hash = "sha256-33TceAiJIReO33LYJwF9bJJzfJhmWfLa3FM64kZ153w="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2206.tar.gz"; + hash = "sha256-Z5csTivDn72jhRgXevDme7vrVIVi5OxLdZoaelg+UFs="; }; - buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ]; + buildInputs = [ DistCheckConflicts CPANMetaCheck TestCleanNamespaces TestFatal TestNeeds TestRequires ]; + propagatedBuildInputs = [ ClassLoadXS DataOptList DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure MROCompat ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ParamsUtil SubExporter TryTiny ]; preConfigure = '' export LD=$CC ''; @@ -17019,10 +17198,10 @@ with self; { MooseXAppCmd = buildPerlModule { pname = "MooseX-App-Cmd"; - version = "0.32"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz"; - hash = "sha256-Lju/coOkvuctkdJusgRDYDCZK75Vy9NewzpUbxb5c/8="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.34.tar.gz"; + hash = "sha256-9eLy7xKcOI8qPjb1PeWYBErxtyLofXEFKdBcwl0jesI="; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; @@ -17035,10 +17214,10 @@ with self; { MooseXStorageFormatJSONpm = buildPerlPackage { pname = "MooseX-Storage-Format-JSONpm"; - version = "0.093093"; + version = "0.093094"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; - hash = "sha256-6+BAen6xhwJw4OJXnwl9/X3yrqMwf7cfMk+2niQsxY8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093094.tar.gz"; + hash = "sha256-9sgItyC99HI4VaZ4sblQLHSSABXFq8YL2uasYNFGxYQ="; }; buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; @@ -17240,6 +17419,9 @@ with self; { url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz"; hash = "sha256-3j6o70Ut2VAeqMTtqHRLciRgJgKwRpJgft19YrefA48="; }; + patches = [ + ../development/perl-modules/MouseX-Getopt-gld-tests.patch + ]; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { @@ -17343,10 +17525,10 @@ with self; { MooseXGetopt = buildPerlModule { pname = "MooseX-Getopt"; - version = "0.74"; + version = "0.75"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz"; - hash = "sha256-HeDfO0Mevp81Y730Vp6s1+B+hlqDl/KpkNDLV9TLLCQ="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.75.tar.gz"; + hash = "sha256-Y/O+W7K8OB6eSLW5XAMw8hcYtmVuj/sZyZ0u4KwU68g="; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; @@ -17454,10 +17636,10 @@ with self; { MooseXOneArgNew = buildPerlPackage { pname = "MooseX-OneArgNew"; - version = "0.005"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz"; - hash = "sha256-fk/PR06mxCRPCIXxBmcpz9xHL71xkN1BtLVbzWfDED8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.007.tar.gz"; + hash = "sha256-hCgkNfEWnPCddRP6k4fiCReRY1zzWgeLUAuCmu6gYTg="; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { @@ -17763,10 +17945,10 @@ with self; { MooseXTypesPerl = buildPerlPackage { pname = "MooseX-Types-Perl"; - version = "0.101343"; + version = "0.101344"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz"; - hash = "sha256-8IS+rzwzIJxo0F1NvCTCXWBKZFi5c42W3OsIbI7xMlo="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101344.tar.gz"; + hash = "sha256-h2RDVPdPplI1yyv8pEJ3kwp+q+UazF+B+2MVMKg1XiQ="; }; propagatedBuildInputs = [ MooseXTypes ]; meta = { @@ -17809,13 +17991,13 @@ with self; { MooseXTypesURI = buildPerlModule { pname = "MooseX-Types-URI"; - version = "0.08"; + version = "0.09"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz"; - hash = "sha256-0xDSD6Nh/i3/dYI234eUnMe/mOXPOnx5EVNl7M3mzME="; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.09.tar.gz"; + hash = "sha256-Jxd1Ta25EIbhHSH+oGy6qaEuYBtB0VRDFQ7dfZUI7+g="; }; - buildInputs = [ ModuleBuildTiny TestSimple13 ]; - propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; + buildInputs = [ ModuleBuildTiny TestNeeds TestWithoutModule ]; + propagatedBuildInputs = [ MooseXTypes URI URIFromHash namespaceautoclean ]; meta = { description = "URI related types and coercions for Moose"; homepage = "https://github.com/moose/MooseX-Types-URI"; @@ -17823,6 +18005,20 @@ with self; { }; }; + MP3CutGapless = buildPerlPackage { + pname = "MP3-Cut-Gapless"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/MP3-Cut-Gapless-0.03.tar.gz"; + hash = "sha256-PoS3OdHx4902FvhR3GV14WXTKEZ/AySGB5UOWVH+pPM="; + }; + propagatedBuildInputs = [ AudioCuefileParser ]; + meta = { + description = "Split an MP3 file without gaps (based on pcutmp3)"; + license = with lib.licenses; [ artistic1 ]; + }; + }; + MP3Info = buildPerlPackage { pname = "MP3-Info"; version = "1.26"; @@ -17838,10 +18034,10 @@ with self; { MP3Tag = buildPerlPackage { pname = "MP3-Tag"; - version = "1.15"; + version = "1.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.15.zip"; - hash = "sha256-qqxI9GN+3KQI/Xk4G8C/8PmxG9jh6U3gWdrpkzZfVtE="; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/MP3-Tag-1.16.zip"; + hash = "sha256-UDhQk6owAFa8Jiu2pACpbiGVl3wcXh6/FaXgdak3e4Y="; }; buildInputs = [ pkgs.unzip ]; @@ -17858,6 +18054,20 @@ with self; { }; }; + MockMonkeyPatch = buildPerlModule { + pname = "Mock-MonkeyPatch"; + version = "1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mock-MonkeyPatch-1.02.tar.gz"; + hash = "sha256-xbaUTKVP6DVXN2cwYO1OnvhyNyZXfXluHK5eVr8bAYE="; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + description = "Monkey patching with test mocking in mind"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Mouse = buildPerlModule { pname = "Mouse"; version = "2.5.10"; @@ -17892,10 +18102,10 @@ with self; { MozillaCA = buildPerlPackage { pname = "Mozilla-CA"; - version = "20200520"; + version = "20230821"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20200520.tar.gz"; - hash = "sha256-s8oAAjEL8koWwNWSC96pei9G53574+c3foUNAzOHxyY="; + url = "mirror://cpan/authors/id/L/LW/LWP/Mozilla-CA-20230821.tar.gz"; + hash = "sha256-MuHQBFKZAEBFucTRbC2q5FOiFiCIc97qJED3EmCnzaE="; }; postPatch = '' @@ -17913,10 +18123,10 @@ with self; { MROCompat = buildPerlPackage { pname = "MRO-Compat"; - version = "0.13"; + version = "0.15"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz"; - hash = "sha256-iiw7bMwZMo1VedAqfZEoXir9hdgB9J1COo6xbzI9pPg="; + url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.15.tar.gz"; + hash = "sha256-DUU1+I5Dur2Eq2BIZiFfxNBDmL1Nt7IYUtSjGxwV72E="; }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; @@ -17962,10 +18172,10 @@ with self; { MusicBrainz = buildPerlModule { pname = "WebService-MusicBrainz"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz"; - hash = "sha256-UjuDmWggbFdR6p7mcMeJLIw74PWTqlkaAMAxVGjQkJk="; + url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.6.tar.gz"; + hash = "sha256-XpH1ZZZ3w5CJv28lO0Eoe7zTVh9qJaB5Zc6DsmKIUuE="; }; propagatedBuildInputs = [ Mojolicious ]; doCheck = false; # Test performs network access. @@ -18172,10 +18382,10 @@ with self; { NetAmazonS3 = buildPerlPackage { pname = "Net-Amazon-S3"; - version = "0.97"; + version = "0.991"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.97.tar.gz"; - hash = "sha256-A9hWd9BIPq+tJD2nBWS13xpDCSKZa/22xPGbbCh43jQ="; + url = "mirror://cpan/authors/id/B/BA/BARNEY/Net-Amazon-S3-0.991.tar.gz"; + hash = "sha256-+3r4umSUjRo/MdgJ13EFImiA8GmYrH8Rn4JITmijI9M="; }; buildInputs = [ TestDeep TestException TestLWPUserAgent TestMockTime TestWarnings ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SafeIsa SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; @@ -18202,12 +18412,12 @@ with self; { NetAsyncHTTP = buildPerlModule { pname = "Net-Async-HTTP"; - version = "0.48"; + version = "0.49"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.48.tar.gz"; - hash = "sha256-nUvW+ZW8rn2LzTorNo7nCO3khABrYij17SXr86gh9z4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.49.tar.gz"; + hash = "sha256-OSBtBpSV0bhq7jeqitPJM0025ZzObPec04asDPN5jNs="; }; - buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ HTTPCookies Test2Suite TestMetricsAny ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; preCheck = lib.optionalString stdenv.isDarwin '' # network tests fail on Darwin/sandbox, so disable these @@ -18223,12 +18433,12 @@ with self; { NetAsyncHTTPServer = buildPerlModule { pname = "Net-Async-HTTP-Server"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-Server-0.13.tar.gz"; - hash = "sha256-yk3kcfIieNI5PIqy7G56xO8hfbRjXS3Mi6KoynIhFO4="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-Server-0.14.tar.gz"; + hash = "sha256-6nG3kcEtD6X3JubMA/Zuo20bRhNxj2xb84EzvRinsrY="; }; - buildInputs = [ TestIdentity TestMetricsAny TestRefcount TestSimple13 ]; + buildInputs = [ Test2Suite TestMetricsAny TestRefcount ]; propagatedBuildInputs = [ HTTPMessage IOAsync MetricsAny ]; meta = { description = "Serve HTTP with IO::Async"; @@ -18291,10 +18501,10 @@ with self; { NetCIDR = buildPerlPackage { pname = "Net-CIDR"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz"; - hash = "sha256-x17caBi7Ng1xwTkWn9ZK1lw1//bSufrHufnmxGfxh7U="; + url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.21.tar.gz"; + hash = "sha256-MPMDwHNZSNozNw3sx+h8+mi8QwqkS4HRj42CO20av78="; }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; @@ -18379,10 +18589,10 @@ with self; { NetDNS = buildPerlPackage { pname = "Net-DNS"; - version = "1.29"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.29.tar.gz"; - hash = "sha256-hS1u6H6PDQFCIwJlgcu1aSS6jN3TzrKcYZHbthItQ8U="; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.40.tar.gz"; + hash = "sha256-IJu9QN6NSMG9eq3kjaI3/gpJn4nSebqi4amb1eySLdw="; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = [ "--noonline-tests" ]; @@ -18394,10 +18604,10 @@ with self; { NetDNSResolverMock = buildPerlPackage { pname = "Net-DNS-Resolver-Mock"; - version = "1.20200215"; + version = "1.20230216"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz"; - hash = "sha256-vvfxUOUw5VZbi67VmOqvdLb5X60Sit4NH3VQE1ghZ+c="; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20230216.tar.gz"; + hash = "sha256-7UkwV3/Rop1kNbWHVTPTso9cElijWDP+bKLLaiaFpJs="; }; propagatedBuildInputs = [ NetDNS ]; buildInputs = [ TestException ]; @@ -18481,10 +18691,10 @@ with self; { NetHTTP = buildPerlPackage { pname = "Net-HTTP"; - version = "6.19"; + version = "6.23"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz"; - hash = "sha256-UrduwTlZUiyuZNll8V2j2Z3LRF7d2F0s5OT03zhbL8Q="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.23.tar.gz"; + hash = "sha256-DWXAndbIWJsq4RGBdNPBphcDtuz8FKNEKox0r2XgyU4="; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -18529,10 +18739,10 @@ with self; { NetIMAPClient = buildPerlPackage { pname = "Net-IMAP-Client"; - version = "0.9505"; + version = "0.9507"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz"; - hash = "sha256-0/amCLheCagICmepkzg3qubyzQ6O453zOAEj3F496RI="; + url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9507.tar.gz"; + hash = "sha256-QE5vW7xQjPFnxAUqXhRwXv7sb7eTvPm1xCniX0cYNUk="; }; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; meta = { @@ -18586,10 +18796,10 @@ with self; { NetIPv6Addr = buildPerlPackage { pname = "Net-IPv6Addr"; - version = "1.01"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-1.01.tar.gz"; - hash = "sha256-J+J/A/61X9kVFnOXNbGetUHK+HmVNjKd1+OhKQqkCwE="; + url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-1.02.tar.gz"; + hash = "sha256-sjQBwSJv7o3+Yn9a4OkMVaxUcBDso5gRDcFjH0HJ7H0="; }; propagatedBuildInputs = [ MathBase85 NetIPv4Addr ]; meta = { @@ -18673,10 +18883,10 @@ with self; { NetNetmask = buildPerlPackage { pname = "Net-Netmask"; - version = "2.0001"; + version = "2.0002"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0001.tar.gz"; - hash = "sha256-FzVu+GZ/s4xEEKHDzH+kxzVn2/VnS/l/USNtbkiPUXE="; + url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-2.0002.tar.gz"; + hash = "sha256-JKmy58a8wTAteXROukwCG/PeR/FJqvrM2U+bBC/dv5Q="; }; buildInputs = [ Test2Suite TestUseAllModules ]; meta = { @@ -18703,10 +18913,10 @@ with self; { NetMQTTSimple = buildPerlPackage { pname = "Net-MQTT-Simple"; - version = "1.26"; + version = "1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.26.tar.gz"; - hash = "sha256-ERxNNnu1AgXci8AjFfDGuw3mDRwwfQLnUuQuwRtPiLQ="; + url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.28.tar.gz"; + hash = "sha256-Sp6hB+a8IuJrUzZ4oKPMbEI7N4TsP8ROjjM5t8Vr7gM="; }; meta = { description = "Minimal MQTT version 3 interface"; @@ -18714,6 +18924,20 @@ with self; { }; }; + NetNVD = buildPerlPackage { + pname = "Net-NVD"; + version = "0.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARU/Net-NVD-0.0.3.tar.gz"; + hash = "sha256-uKZXEg+UsO7R2OvbA4i8M2DSj6Xw+CNrnNjNrovv5Bg="; + }; + propagatedBuildInputs = [ IOSocketSSL JSON ]; + meta = { + description = "Query CVE data from NIST's NVD (National Vulnerability Database)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetOAuth = buildPerlModule { pname = "Net-OAuth"; version = "0.28"; @@ -18745,10 +18969,10 @@ with self; { NetPing = buildPerlPackage { pname = "Net-Ping"; - version = "2.74"; + version = "2.75"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.74.tar.gz"; - hash = "sha256-sSqJWbvtXnxVgRF+5eVAAZKy/wo1i/EYX87tDulzfRE="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.75.tar.gz"; + hash = "sha256-tH3zz9lpLM0Aca05/nRxjrwy9ZcBVWpgT9FaCfCeDXQ="; }; meta = { description = "Check a remote host for reachability"; @@ -18773,10 +18997,10 @@ with self; { NetPrometheus = buildPerlModule { pname = "Net-Prometheus"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.11.tar.gz"; - hash = "sha256-IvgJ4njq1Rk2rVOVgGUbTOXLyRwgnkpXesgjg82fcmo="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.12.tar.gz"; + hash = "sha256-rs73NJygSW/yNahKkQ+KBDZtB/WqQfrieixKxbip6SM="; }; propagatedBuildInputs = [ RefUtil StructDumb URI ]; buildInputs = [ HTTPMessage TestFatal ]; @@ -18806,10 +19030,10 @@ with self; { NetServer = buildPerlPackage { pname = "Net-Server"; - version = "2.009"; + version = "2.014"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz"; - hash = "sha256-gmfGVgNV4uD0g9PMFhlfNC8y/hPK6d3nWgoezl6agT8="; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.014.tar.gz"; + hash = "sha256-NAa5ylpmKgB17tR/t43hMWtgHJT2Kg7jSlVE25uqNyA="; }; doCheck = false; # seems to hang waiting for connections meta = { @@ -18821,10 +19045,10 @@ with self; { NetSFTPForeign = buildPerlPackage { pname = "Net-SFTP-Foreign"; - version = "1.91"; + version = "1.93"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.91.tar.gz"; - hash = "sha256-tzlQgTFPJvO5PIV9ZenICgSmNwnfaYWD8io2D/zn4Xg="; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.93.tar.gz"; + hash = "sha256-bH1kJQh2hz2kNIAOUGCovvekZFHYH4F+N+Q8/aUaD3o="; }; propagatedBuildInputs = [ pkgs.openssl ]; patchPhase = '' @@ -18959,10 +19183,10 @@ with self; { NetSSHPerl = buildPerlPackage { pname = "Net-SSH-Perl"; - version = "2.14"; + version = "2.142"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz"; - hash = "sha256-K10bsTWQtYcBFnBOfx3OmpgjxPgP9UYbl7smoxc5MBc="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Net-SSH-Perl-2.142.tar.gz"; + hash = "sha256-UAHbPllS/BjYXDF5Uhr2kT0VQ+tP30/ZfcYDpHSMLJY="; }; propagatedBuildInputs = [ CryptCurve25519 CryptIDEA CryptX FileHomeDir MathGMP StringCRC32 ]; preCheck = "export HOME=$TMPDIR"; @@ -19011,10 +19235,10 @@ with self; { NetTelnet = buildPerlPackage { pname = "Net-Telnet"; - version = "3.04"; + version = "3.05"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz"; - hash = "sha256-5k1Wek4WKV7LqUk2jnpri1rioWs61oISHZsAfcXSo3o="; + url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.05.tar.gz"; + hash = "sha256-Z39ouizSqCT64yP6guGDv349A8PEmckdkjvWKDeWp0M="; }; meta = { description = "Interact with TELNET port or other TCP ports"; @@ -19115,10 +19339,10 @@ with self; { NumberFraction = buildPerlModule { pname = "Number-Fraction"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.3.tar.gz"; - hash = "sha256-OwCqQz/lFGviH9chZHa6lkG5Y0NlfEzc9A72/KxpEO8="; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-v3.0.4.tar.gz"; + hash = "sha256-xkGcird4/XKbENfmp487ewf8CJV8H3nlZm3Ny01iwIU="; }; propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; meta = { @@ -19142,13 +19366,18 @@ with self; { NumberPhone = buildPerlPackage { pname = "Number-Phone"; - version = "3.8004"; + version = "4.0000"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Number-Phone-3.8004.tar.gz"; - hash = "sha256-ZY7hyNGXTvSwV+B4L0mTi/PelA6QY/2bYecY6siwO+8="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Number-Phone-4.0000.tar.gz"; + hash = "sha256-H0mX/oMJSrDNgUDwvn/cHz+JGQKareajOYH4fLBIZjQ="; }; - buildInputs = [ DevelHide FileShareDirInstall ParallelForkManager TestDifferences TestPod TestPodCoverage TestWarnings ]; - propagatedBuildInputs = [ DataDumperConcise DBMDeep DevelCheckOS FileFindRule FileShareDir ]; + buildInputs = [ DevelHide FileShareDirInstall ParallelForkManager TestDifferences TestWarnings ]; + propagatedBuildInputs = [ DataDumperConcise DataCompactReadonly DevelCheckOS DevelDeprecationsEnvironmental FileFindRule FileShareDir ]; + preCheck = '' + # Remove slow memory hungry tests + rm t/fork.t + rm t/uk_slurp.t + ''; meta = { description = "Large suite of perl modules for parsing and dealing with phone numbers"; homepage = "https://github.com/DrHyde/perl-modules-Number-Phone"; @@ -19229,10 +19458,10 @@ with self; { ObjectPad = buildPerlModule { pname = "Object-Pad"; - version = "0.79"; + version = "0.804"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.79.tar.gz"; - hash = "sha256-+wsQ+J5i1UFlvWqyHbVfYLVT+gCPyOddNJhwwafiKtY="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Object-Pad-0.804.tar.gz"; + hash = "sha256-z4jSquGKKHHX1/MPi6bU7lv5U+IP3KileME8dB0W0a0="; }; buildInputs = [ Test2Suite TestFatal TestRefcount ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -19276,10 +19505,10 @@ with self; { OLEStorage_Lite = buildPerlPackage { pname = "OLE-Storage_Lite"; - version = "0.20"; + version = "0.22"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz"; - hash = "sha256-qximFxwOCOqTTuoUoKtPOokJl13anaQhJJIutB6E+Lo="; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.22.tar.gz"; + hash = "sha256-0FZtbCnTl+pzY3ncUVw2hJ9rlxB89wC6glBQXJhM+WU="; }; meta = { description = "Read and write OLE storage files"; @@ -19302,10 +19531,10 @@ with self; { OpenAPIClient = buildPerlPackage rec { pname = "OpenAPI-Client"; - version = "1.04"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.04.tar.gz"; - hash = "sha256-szo5AKzdLO5hAHu5MigNjDzslJkpnUNyud+Yd0vXTAo="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.07.tar.gz"; + hash = "sha256-Ue1kHSg7j0u7wG0BwVZzm9K5qItO+Et7hPlQ+g7hTbM="; }; propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { @@ -19391,10 +19620,10 @@ with self; { NetOpenSSH = buildPerlPackage { pname = "Net-OpenSSH"; - version = "0.80"; + version = "0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.80.tar.gz"; - hash = "sha256-/uCTZX3ys2FHKimChZWIpuS8XhrugRjs5e6/6vqNrrM="; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.84.tar.gz"; + hash = "sha256-h4DmLwGxzw20PJy3BclP9JSbAyIzvkvpH8kavHkVOfg="; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; @@ -19449,10 +19678,10 @@ with self; { PackageDeprecationManager = buildPerlPackage { pname = "Package-DeprecationManager"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz"; - hash = "sha256-HXQ62kgrXJhx2JSWbofUwg7clpMbuUn7JjiwAN3WaEs="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.18.tar.gz"; + hash = "sha256-to0/DO1Vt2Ff3btgKbifkqNP4N2Mb9a87/wVfVaDT+g="; }; buildInputs = [ TestFatal TestWarnings ]; propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ]; @@ -19478,10 +19707,10 @@ with self; { PackageStash = buildPerlPackage { pname = "Package-Stash"; - version = "0.39"; + version = "0.40"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.39.tar.gz"; - hash = "sha256-kWX1VREuCASTzg6RKd4Ihtowslk/s1Oiq9HHay0mIbU="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.40.tar.gz"; + hash = "sha256-WpcixtnLKe4TPl97CKU2J2KgtWM/9RcGQqWwaG6V4GY="; }; buildInputs = [ CPANMetaCheck TestFatal TestNeeds TestRequires ]; propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; @@ -19495,12 +19724,12 @@ with self; { PackageStashXS = buildPerlPackage { pname = "Package-Stash-XS"; - version = "0.29"; + version = "0.30"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz"; - hash = "sha256-02drqUZB4D1qMOlR8JJmxMPKP1tYqnsxSmfyjkGYeKo="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.30.tar.gz"; + hash = "sha256-JrrWXBlZxXN5s+E53HdvvsX3ApBmF+8nzcKT3fEjkjE="; }; - buildInputs = [ TestFatal TestRequires ]; + buildInputs = [ TestFatal TestNeeds ]; meta = { description = "Faster and more correct implementation of the Package::Stash API"; homepage = "https://github.com/moose/Package-Stash-XS"; @@ -19558,10 +19787,10 @@ with self; { ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; - version = "0.102"; + version = "0.200"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.102.tar.gz"; - hash = "sha256-JjZfgQXcYGsUC9HUX41w1cMFQ5D3Xk/bdISj5ZHL+pc="; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.200.tar.gz"; + hash = "sha256-iLmFDqzJ1hjz6RpRyqOGxKZOgswYc1AzUkTjSbgREQY="; }; buildInputs = [ ModuleBuildTiny ]; meta = { @@ -19617,10 +19846,10 @@ with self; { ParamsValidate = buildPerlModule { pname = "Params-Validate"; - version = "1.30"; + version = "1.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.30.tar.gz"; - hash = "sha256-mjo1WD0xJdB+jIAsH5L1vn1SbnbdSW6UTaJwseJz2BI="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.31.tar.gz"; + hash = "sha256-G/JRjvLEhp+RWQ4hn1RcjvEu1TzzE+DrVwSt9/Gylh4="; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; @@ -19634,10 +19863,10 @@ with self; { ParamsValidationCompiler = buildPerlPackage { pname = "Params-ValidationCompiler"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; - hash = "sha256-3FvuIzg75CdlBz2yhL7Z+9gZ1HBa1knCC2REUgkNFss="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.31.tar.gz"; + hash = "sha256-e2SXFz8batsp9dUdjPnsNtLxIZQStLJBDp13qQHoSm0="; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; @@ -19650,10 +19879,10 @@ with self; { Paranoid = buildPerlPackage { pname = "Paranoid"; - version = "2.07"; + version = "2.10"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz"; - hash = "sha256-tVz9jG1fGB4hjv0BL3EaUM0U5NvIgEZQuVR3F49Dt/w="; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.10.tar.gz"; + hash = "sha256-vvS25l1cmk72C8qjF0hvOg0jm/2rRQqnEgLCl5i4dSk="; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; preConfigure = '' @@ -19670,10 +19899,10 @@ with self; { PARDist = buildPerlPackage { pname = "PAR-Dist"; - version = "0.51"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.51.tar.gz"; - hash = "sha256-0kIGLfm2ifOQQOTE4JExpsRk0O7629HJrJRxc68z3/g="; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.52.tar.gz"; + hash = "sha256-y+ljAJ6nnSRUqF/heU9CW33cHoa3F0nIhNsp1gHqj4g="; }; meta = { description = "Create and manipulate PAR distributions"; @@ -19739,6 +19968,20 @@ with self; { }; }; + ParseDistname = buildPerlPackage { + pname = "Parse-Distname"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-Distname-0.05.tar.gz"; + hash = "sha256-pfqTvsLat22IPaEtTzRLc7+L6wzEtmwkN28+Dzh67wc="; + }; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestDifferences TestUseAllModules ]; + meta = { + description = "Parse a distribution name"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ParseIRC = buildPerlPackage { pname = "Parse-IRC"; version = "1.22"; @@ -19771,10 +20014,10 @@ with self; { ParsePlainConfig = buildPerlPackage { pname = "Parse-PlainConfig"; - version = "3.05"; + version = "3.06"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz"; - hash = "sha256-a3ioVSOYsNLXBjUFyTs8/tBDLFss9uALjlH+v0EcHvo="; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.06.tar.gz"; + hash = "sha256-8ffT5OWawrbPbJjaDKpBxdTl2GVcIQdRSBlplS/+G4c="; }; propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; meta = { @@ -19786,10 +20029,10 @@ with self; { ParsePMFile = buildPerlPackage { pname = "Parse-PMFile"; - version = "0.43"; + version = "0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.43.tar.gz"; - hash = "sha256-vmHoByBHOM8MUu0yFVGZL9x/qPqkPtQ/9InQwmmQBiM="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.44.tar.gz"; + hash = "sha256-4I8PVkVbOsEtzNjHEWUGErfTzRUPim+K5rQ7LaR9+ZQ="; }; buildInputs = [ ExtUtilsMakeMakerCPANfile ]; meta = { @@ -19826,12 +20069,13 @@ with self; { ParserMGC = buildPerlModule { pname = "Parser-MGC"; - version = "0.16"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz"; - hash = "sha256-dERhxfDIOAEvO+jFgEKlVgkhIAzBbbDn0ASn8rgTe5E="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.21.tar.gz"; + hash = "sha256-DmGIpydqn5B1fGIEc98W08mGGRO6viWvIJz0RhWgKk8="; }; - propagatedBuildInputs = [ FileSlurpTiny ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ FeatureCompatTry ]; meta = { description = "Build simple recursive-descent parsers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -19883,10 +20127,10 @@ with self; { PathIteratorRule = buildPerlPackage { pname = "Path-Iterator-Rule"; - version = "1.014"; + version = "1.015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz"; - hash = "sha256-P3QB2L7UP8kwNAnvbZ80uFogPeaUQFC765WFXTKYsaY="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.015.tar.gz"; + hash = "sha256-87Bixo4Hx29o3lvDOHfP6eB4tjUaYboWUOM+CfUeyyk="; }; propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; buildInputs = [ Filepushd PathTiny TestDeep TestFilename ]; @@ -19899,10 +20143,10 @@ with self; { PathTiny = buildPerlPackage { pname = "Path-Tiny"; - version = "0.114"; + version = "0.144"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.114.tar.gz"; - hash = "sha256-zQ+I83pY/DZn7AZXZ/4B5z7m76GKESv9NQjPZXnKAOE="; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.144.tar.gz"; + hash = "sha256-9uoJTs6EXJUqAsJ4kzJXk1TejUEKcH+bcEW9JBIGSH0="; }; preConfigure = '' @@ -19929,6 +20173,8 @@ with self; { url = "mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz"; hash = "sha256-pVhQOqax+McnwAczOQgad4iGBqpwGtoa1i3Z2MP5RaI="; }; + # cwd() and fastgetcwd() does not work with taint due to PATH in nixpkgs + preCheck = "rm t/taint.t"; meta = { description = "Get pathname of current working directory"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -19973,10 +20219,10 @@ with self; { PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.044"; + version = "2.045"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.044.tar.gz"; - hash = "sha256-stFVeeQnI9jX+bct6G0NNc3jTx63cTRWuirTX7PL6n4="; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.045.tar.gz"; + hash = "sha256-tr204NDNZSYQP91YwXHgVgw2uEO3/jyk3cm7HkyDJAY="; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -19988,10 +20234,10 @@ with self; { PDFBuilder = buildPerlPackage { pname = "PDF-Builder"; - version = "3.023"; + version = "3.025"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; - hash = "sha256-SCskaQxxhfLn+7r5pIKz0SieJduAC/SPKVn1Epl3yjE="; + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.025.tar.gz"; + hash = "sha256-qb6076DsKXWpFFzvBSEYsgmPRtnBUQ3WV4agPQ2j49U="; }; nativeCheckInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -20095,14 +20341,14 @@ with self; { PerlCritic = buildPerlModule { pname = "Perl-Critic"; - version = "1.140"; + version = "1.150"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.140.tar.gz"; - hash = "sha256-v+7wqjbwlBaCpgchJZPbUwssilSZ9tx9QffmGo69/ds="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.150.tar.gz"; + hash = "sha256-5c2V3j5DvOcHdRdidLqkBfMm/IdA3wBUu4FpdcyNNJs="; }; buildInputs = [ TestDeep ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny ExceptionClass FileWhich ListSomeUtils ModulePluggable PPI PPIxQuoteLike PPIxRegexp PPIxUtilities PPIxUtils PerlTidy PodSpell Readonly StringFormat ]; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/perlcritic ''; @@ -20116,10 +20362,10 @@ with self; { PerlCriticCommunity = buildPerlModule { pname = "Perl-Critic-Community"; - version = "1.0.0"; + version = "1.0.3"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.0.tar.gz"; - hash = "sha256-MRt3XaQZPp3pTPUiXpk8xU3Qlq4efvYHOM2uHZuIVOc="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-Critic-Community-v1.0.3.tar.gz"; + hash = "sha256-Ed3bt5F5/mIp8zPKOS+U/firXNmJzJfZk1IaidXEetU="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ PPI PathTiny PerlCritic PerlCriticPolicyVariablesProhibitLoopOnHash PerlCriticPulp ]; @@ -20203,10 +20449,10 @@ with self; { PerlIOeol = buildPerlPackage { pname = "PerlIO-eol"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz"; - hash = "sha256-zszL/kVFsZZdESqGKY3/5Q1oBhgAkMa+x9dXto+4Xrk="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.19.tar.gz"; + hash = "sha256-/3O+xgRP2EepbEGZZPNw5Qn9Nv1XH3o7fDUXX1iviFk="; }; meta = { description = "PerlIO layer for normalizing line endings"; @@ -20231,10 +20477,10 @@ with self; { PerlIOutf8_strict = buildPerlPackage { pname = "PerlIO-utf8_strict"; - version = "0.008"; + version = "0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.008.tar.gz"; - hash = "sha256-X3mN7VDcx9QhtXhQ+DcxBmbYF/TGfBW6D1odOMdN9Fk="; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.010.tar.gz"; + hash = "sha256-vNKEi3LfKQtemE+uixpsqW9tByADzyIjiajJ6OHFcM0="; }; buildInputs = [ TestException ]; meta = { @@ -20349,10 +20595,10 @@ with self; { PerlTidy = buildPerlPackage rec { pname = "Perl-Tidy"; - version = "20211029"; + version = "20230912"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20211029.tar.gz"; - hash = "sha256-7AOx42pX0JRWmjAIJoj3IiU0AcfMk0rGTS4+tN6IDto="; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20230912.tar.gz"; + hash = "sha256-DFeIjyBvmHd34WZA5yV0qgp3eEZxn44+0EE8NTJfVUA="; }; meta = { description = "Indent and reformat perl scripts"; @@ -20398,10 +20644,10 @@ with self; { Plack = buildPerlPackage { pname = "Plack"; - version = "1.0048"; + version = "1.0050"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0048.tar.gz"; - hash = "sha256-MPXyXhm0N4WRVqJSb2HKmrcI1Q1XMMJ5GJQDqr/lQqY="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0050.tar.gz"; + hash = "sha256-0mUa3oLrv/er4KOhifyTLa3Ed5GGzolGjlbQGJ6qbtQ="; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; @@ -20640,10 +20886,10 @@ with self; { POE = buildPerlPackage { pname = "POE"; - version = "1.368"; + version = "1.370"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/POE-1.368.tar.gz"; - hash = "sha256-t7Hcdh421Is5BoNJtXba/A7MvDudtRxnfeDhqvrf4SE="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/POE-1.370.tar.gz"; + hash = "sha256-V94rY1sV+joxqeVd1REiFJ5UFOEVjugiNQYmNO4YppM="; }; # N.B. removing TestPodLinkCheck from buildInputs because tests requiring # this module don't disable themselves when "run_network_tests" is @@ -20691,10 +20937,10 @@ with self; { PPI = buildPerlPackage { pname = "PPI"; - version = "1.270"; + version = "1.277"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz"; - hash = "sha256-YippjHgbuF0r33u/4ED+cNM7eXdMmuAfziN13HP69Fc="; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.277.tar.gz"; + hash = "sha256-h8efg7aHbiBgUZZdUBnSUHxVH4GahnUAgOx+xDsuCvg="; }; buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; propagatedBuildInputs = [ Clone IOString ParamsUtil TaskWeaken ]; @@ -20712,10 +20958,10 @@ with self; { PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.013"; + version = "0.023"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.013.tar.gz"; - hash = "sha256-jR4zg4J40lKrb1hoQPzucOGbtzUgNbqF/TIkdSYtGBc="; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.023.tar.gz"; + hash = "sha256-NXajFJ0sU+B+lze3iSvlz7hKSZpu8d8JC3E7BUQjTSE="; }; propagatedBuildInputs = [ PPI Readonly ]; meta = { @@ -20726,10 +20972,10 @@ with self; { PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.076"; + version = "0.088"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.076.tar.gz"; - hash = "sha256-EGB9kyJyjEs3ZMCf4dy0qTmv8Nq+psSMpPhUogd6AUo="; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.088.tar.gz"; + hash = "sha256-iFQz+bEC+tT9NrIccyC7A2A2ERyvmYExv0FvfNXul2Q="; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -20753,6 +20999,21 @@ with self; { }; }; + PPIxUtils = buildPerlPackage { + pname = "PPIx-Utils"; + version = "0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-0.003.tar.gz"; + hash = "sha256-KpvM/I6tA74BtnJI/o4VJSIED3mChvpO9EMrfy79uhE="; + }; + propagatedBuildInputs = [ BKeywords PPI ]; + meta = { + homepage = "https://github.com/Grinnz/PPIx-Utils"; + description = "Utility functions for PPI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PPR = buildPerlPackage { pname = "PPR"; version = "0.001008"; @@ -20769,10 +21030,10 @@ with self; { ProcBackground = buildPerlPackage { pname = "Proc-Background"; - version = "1.21"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz"; - hash = "sha256-kbalrrhBscMTSYx4+tCON9F1lXAtxiBbWtOO9plJt+4="; + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.32.tar.gz"; + hash = "sha256-Wxp4DduSnKQnJeuQtRgyFCX/d4tKE3+G+sldn7nNKWc="; }; meta = { description = "Run asynchronous child processes under Unix or Windows"; @@ -20783,10 +21044,10 @@ with self; { ProcProcessTable = buildPerlPackage { pname = "Proc-ProcessTable"; - version = "0.59"; + version = "0.636"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz"; - hash = "sha256-+MxQVNeMNaDOOft1QwtO9ALiqZAT0uw355l/MWWUYGw="; + url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.636.tar.gz"; + hash = "sha256-lEIk/7APwe81BpYzdwoK/ahiO1x1MtHkq0ip3zlIkP0="; }; meta = { description = "Perl extension to access the unix process table"; @@ -20893,12 +21154,12 @@ with self; { PrometheusTiny = buildPerlPackage { pname = "Prometheus-Tiny"; - version = "0.008"; + version = "0.011"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.008.tar.gz"; - hash = "sha256-c2pmkTuYAL7skh1QoSsFyzdLXwnVcJ6vQ5hNyJJZp50="; + url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-0.011.tar.gz"; + hash = "sha256-jbFIDzyJ64bUFM9fR/7tjfMRKzjEY8uPZbTAZOILHhM="; }; - buildInputs = [ HTTPMessage Plack TestException ]; + buildInputs = [ HTTPMessage Plack TestException TestWarn ]; meta = { description = "A tiny Prometheus client"; homepage = "https://github.com/robn/Prometheus-Tiny"; @@ -20908,12 +21169,12 @@ with self; { PrometheusTinyShared = buildPerlPackage { pname = "Prometheus-Tiny-Shared"; - version = "0.024"; + version = "0.027"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.024.tar.gz"; - hash = "sha256-j7xUPgv9XY9zvcEhotrK/UNErupLmbcVxQ3Nqkgmggs="; + url = "mirror://cpan/authors/id/R/RO/ROBN/Prometheus-Tiny-Shared-0.027.tar.gz"; + hash = "sha256-egULqhjKfA0gsoih1L0nJ3E6lFg/Qmskn5XcjUDty9E="; }; - buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException ]; + buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException TestWarn ]; propagatedBuildInputs = [ HashSharedMem JSONXS PrometheusTiny ]; meta = { description = "A tiny Prometheus client with a shared database behind it"; @@ -21023,10 +21284,10 @@ with self; { PerlMinimumVersion = buildPerlPackage { pname = "Perl-MinimumVersion"; - version = "1.38"; + version = "1.40"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz"; - hash = "sha256-R4tYJHkbh/x0yUqJIYBoK9Bq0s3zQDSxpLhZJzkngCo="; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-1.40.tar.gz"; + hash = "sha256-dYmleMtg1wykdVw5WzWStECgzWobB05OzqyTsDGhvpA="; }; buildInputs = [ TestScript ]; propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; @@ -21040,12 +21301,13 @@ with self; { PerlPrereqScanner = buildPerlPackage { pname = "Perl-PrereqScanner"; - version = "1.023"; + version = "1.100"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz"; - hash = "sha256-KAocRxA5CGX7nzEKhho0cgsotMvlBgnIQa9c8tOivO0="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.100.tar.gz"; + hash = "sha256-ARgdOKLnr/g40mISJWPFBja6SzZS7l0dT471uj9bGGs="; }; - propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; + buildInputs = [ TryTiny ]; + propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moo ParamsUtil PPI StringRewritePrefix TypeTiny namespaceautoclean ]; meta = { description = "A tool to scan your Perl code for its prerequisites"; homepage = "https://github.com/rjbs/Perl-PrereqScanner"; @@ -21056,13 +21318,13 @@ with self; { PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9913"; + version = "0.9917"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9913.tar.gz"; - hash = "sha256-lw2fxeFJOMDxdA+M/tCU1c+kxL2NR/qAxZqbATnPVI0="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9917.tar.gz"; + hash = "sha256-O6fuF9lfDJqNkqLkwYVLZKcH0cAihGIm3Q36Qvfeud0="; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie URIcpan ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile ParseDistname TestFailWarnings TestUseAllModules ]; meta = { description = "A tool to scan your Perl code for its prerequisites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -21102,10 +21364,10 @@ with self; { PodChecker = buildPerlPackage { pname = "Pod-Checker"; - version = "1.74"; + version = "1.75"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.74.tar.gz"; - hash = "sha256-LiFirwqIYORXAxiGbsGO++ezf+uNmQs0hIuffFJKpYg="; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.75.tar.gz"; + hash = "sha256-82O1dOxmCvbtvT5dTJ/8UVodRsvxx8ytmkbO0oh5wiE="; }; meta = { description = "Verifies POD documentation contents for compliance with the POD format specifications"; @@ -21131,10 +21393,10 @@ with self; { PodCoverageTrustPod = buildPerlPackage { pname = "Pod-Coverage-TrustPod"; - version = "0.100005"; + version = "0.100006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz"; - hash = "sha256-bGiDXCTNyvuxVn5oCrErsXYWOCuvi8RM5FfkGh01cyE="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100006.tar.gz"; + hash = "sha256-NYrcJQTwOetpCYqpm93mrp3JNTZKjhRPZAXoKTs6fKM="; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { @@ -21146,10 +21408,10 @@ with self; { PodElemental = buildPerlPackage { pname = "Pod-Elemental"; - version = "0.103005"; + version = "0.103006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz"; - hash = "sha256-gkM27BgybjuXDngVkis5IbCoIdLuDlCwxbK8Mn+ZYV4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103006.tar.gz"; + hash = "sha256-dQw6edjhgkdYpu99LdB33N3KUDVCuMNOzNWsu3edxCM="; }; buildInputs = [ TestDeep TestDifferences ]; propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; @@ -21162,10 +21424,10 @@ with self; { PodElementalPerlMunger = buildPerlPackage { pname = "Pod-Elemental-PerlMunger"; - version = "0.200006"; + version = "0.200007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz"; - hash = "sha256-Cf07XVMRlDegHc7Wa0Lq/c1TiVs8MqKw94Hzb9oPZls="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200007.tar.gz"; + hash = "sha256-UYleTEGgeere+fJPXcSOMkWlwG40BO15yF+lzv63lak="; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ PPI PodElemental ]; @@ -21178,10 +21440,10 @@ with self; { PodEventual = buildPerlPackage { pname = "Pod-Eventual"; - version = "0.094001"; + version = "0.094003"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz"; - hash = "sha256-vp+4kQsQjl0aZvACtlmtIlduiNd5twPf+dFRIsP4CDQ="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094003.tar.gz"; + hash = "sha256-fwYMw00RZWzgadsGHj1g7cDKvI+JpKLcfqrpXayFbS0="; }; propagatedBuildInputs = [ MixinLinewise ]; buildInputs = [ TestDeep ]; @@ -21194,10 +21456,10 @@ with self; { PodParser = buildPerlPackage { pname = "Pod-Parser"; - version = "1.63"; + version = "1.66"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz"; - hash = "sha256-2+C1YSmXWy+DoChB6ODtR76A8GBobGbqN+Up2XqnDM0="; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.66.tar.gz"; + hash = "sha256-IpKKe//mG0UsBbu7j1IW1LnPn+KoSbd2wlUA0k0g33w="; }; meta = { description = "Modules for parsing/translating POD format documents"; @@ -21270,10 +21532,10 @@ with self; { podlators = buildPerlPackage { pname = "podlators"; - version = "4.14"; + version = "5.01"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.14.tar.gz"; - hash = "sha256-evHEHeNLLk2/9wCinXOHVJwrbPFhQiFEUMkkcH3bD4I="; + url = "mirror://cpan/authors/id/R/RR/RRA/podlators-5.01.tar.gz"; + hash = "sha256-zP0d+fGkfwlbzm1xj61a9A94ziSR8scjlibhW3AgvHE="; }; preCheck = '' # remove failing spdx check @@ -21378,10 +21640,10 @@ with self; { PodSimple = buildPerlPackage { pname = "Pod-Simple"; - version = "3.42"; + version = "3.45"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.42.tar.gz"; - hash = "sha256-qfzrLgMY43hlJea/IF4+FD8M82InQIGcq18FjmV+isU="; + url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.45.tar.gz"; + hash = "sha256-hIO7lc0+QwfWbe8JKjd5+EOvdySCv9wCTj4A0MTbDPo="; }; meta = { description = "Framework for parsing Pod"; @@ -21391,10 +21653,10 @@ with self; { PodSpell = buildPerlPackage { pname = "Pod-Spell"; - version = "1.20"; + version = "1.26"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz"; - hash = "sha256-Y4P3v+IrwNg5oIBXoM54BpiwRhhK6pNb5IM9lJht0Dw="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Pod-Spell-1.26.tar.gz"; + hash = "sha256-LwW/yc+wS5b8v6LIVE0eaukIWW02lsRuDiZVa3UK+78="; }; propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny PodParser ]; buildInputs = [ FileShareDirInstall TestDeep ]; @@ -21408,10 +21670,10 @@ with self; { PodStrip = buildPerlModule { pname = "Pod-Strip"; - version = "1.02"; + version = "1.100"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; - hash = "sha256-2A2s9qeszIfTZoMBZSNNchvS827uGHrvaCtgyQR3Uv8="; + url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.100.tar.gz"; + hash = "sha256-Z1BqZh+pyuzv57pPQvC8FbCm8JZ8eWB3QPbLaXSu1M0="; }; meta = { description = "Remove POD from Perl code"; @@ -21438,10 +21700,10 @@ with self; { PodWeaver = buildPerlPackage { pname = "Pod-Weaver"; - version = "4.015"; + version = "4.019"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz"; - hash = "sha256-WvJbKaVXg+SVqd9e9ikyQOLJqwJ2RhPXnx7VCxLexa4="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.019.tar.gz"; + hash = "sha256-aUatHwTq+aoR8kzFRJTh1Xli9Y4FkS82S3T5WT595/c="; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; @@ -21592,10 +21854,10 @@ with self; { Redis = buildPerlModule { pname = "Redis"; - version = "1.998"; + version = "2.000"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.998.tar.gz"; - hash = "sha256-WfO7F2w6elTLN3lJe4mnuuH7IXVlxocR1YX8HwnXnIc="; + url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-2.000.tar.gz"; + hash = "sha256-FMuJl5chJhW06T+Rbcva+0jQHF6qsgOP5ssXm/lcb+s="; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; @@ -21677,10 +21939,10 @@ with self; { RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.057"; + version = "1.058"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.057.tar.gz"; - hash = "sha256-r1PBmBhGHNcBrrV8Sd/9tGPtxL+PZY2epObVNKwXcEE="; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.058.tar.gz"; + hash = "sha256-6ojVjiUWdPrjm0n007U0LqzLj8tVhWzTBKoaX/PUHJI="; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; @@ -21730,10 +21992,10 @@ with self; { RESTClient = buildPerlPackage { pname = "REST-Client"; - version = "273"; + version = "281"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz"; - hash = "sha256-qGUqIhQwj6/yxovlzmTJBNzMxehr5/MjdsFZCGnQGEQ="; + url = "mirror://cpan/authors/id/A/AK/AKHUETTEL/REST-Client-281.tar.gz"; + hash = "sha256-+hDSGgA35oJgHv5mc4p1j/dSEJSqASKek8iIpnmyyPY="; }; propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { @@ -21760,10 +22022,10 @@ with self; { RpcXML = buildPerlPackage { pname = "RPC-XML"; - version = "0.80"; + version = "0.82"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz"; - hash = "sha256-6g18qHqrcMEoF99Yk/a/4Eks5j9uDmPAtFLjdTRMfvc="; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.82.tar.gz"; + hash = "sha256-UnnrDRNsUz/4l/aTTDqtbyBQS5l/smBuUsXbvZJ1jnM="; }; propagatedBuildInputs = [ XMLParser ]; doCheck = false; @@ -21803,10 +22065,10 @@ with self; { RoleHasMessage = buildPerlPackage { pname = "Role-HasMessage"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz"; - hash = "sha256-9qbb4Edv+V7h/774JesY2bArBhjeukaG58Y7mdV21NM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.007.tar.gz"; + hash = "sha256-XiZ6TXYgs2hIEgTIjqIES4sqWP+LBVd/JxeydUwEFM4="; }; propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { @@ -21816,12 +22078,28 @@ with self; { }; }; + RoleHooks = buildPerlPackage { + pname = "Role-Hooks"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Role-Hooks-0.008.tar.gz"; + hash = "sha256-KNZuoKjcMGt22oP/CHlJPYCPcxhbz5xO03LzlG+1Q+w="; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ ClassMethodModifiers ]; + meta = { + homepage = "https://metacpan.org/release/Role-Hooks"; + description = "Role callbacks"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + RoleIdentifiable = buildPerlPackage { pname = "Role-Identifiable"; - version = "0.007"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz"; - hash = "sha256-VhNG0aGgekW9hR2FmoJaf2eSWno7pbpY4M2ti7mQc60="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.009.tar.gz"; + hash = "sha256-WnNen3F3+euuBH63uuKbfsKewCCuN2N66lNQ0wwIe3Y="; }; propagatedBuildInputs = [ Moose ]; meta = { @@ -21833,10 +22111,10 @@ with self; { RoleTiny = buildPerlPackage { pname = "Role-Tiny"; - version = "2.001004"; + version = "2.002004"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz"; - hash = "sha256-krpXEoUKdBAsk8lC625/Yvek+PSDc07SidCLMkwoFoc="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.002004.tar.gz"; + hash = "sha256-173unhOKT4OqUtCpgWJWRL2of/FmQt+oRdy0TZokK0U="; }; meta = { description = "Roles: a nouvelle cuisine portion size slice of Moose"; @@ -21892,10 +22170,10 @@ with self; { RTClientREST = buildPerlModule { pname = "RT-Client-REST"; - version = "0.60"; + version = "0.72"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.60.tar.gz"; - hash = "sha256-Dm8to9lpA0kbQ7GcYSIcvuqIQUJk+QcxLyd9qvFEJIs="; + url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.72.tar.gz"; + hash = "sha256-KPIBWKD3sfNLdM423lvdVimeuUAUBHLISXyVNYIm/bM="; }; buildInputs = [ CGI HTTPServerSimple TestException ]; propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ]; @@ -21921,10 +22199,10 @@ with self; { ScalarListUtils = buildPerlPackage { pname = "Scalar-List-Utils"; - version = "1.55"; + version = "1.63"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.55.tar.gz"; - hash = "sha256-TSvcHHKnvE1p1qXMhbx1Zkl8Oxg8YXW4MnhDKdWP60s="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.63.tar.gz"; + hash = "sha256-yvvfIS9oJ9yaDdO1e27lDoYFhtcZgiijMmLVXFWesqk="; }; meta = { description = "Common Scalar and List utility subroutines"; @@ -21945,6 +22223,20 @@ with self; { }; }; + ScalarType = buildPerlPackage { + pname = "Scalar-Type"; + version = "0.3.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Scalar-Type-0.3.2.tar.gz"; + hash = "sha256-WQyv6gz1RZmSoEiFYsDb1vnfdYtfAH8OQ6uhMLRe7oY="; + }; + propagatedBuildInputs = [ CaptureTiny TestException ]; + meta = { + description = "Figure out what type a scalar is"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + SCGI = buildPerlModule { pname = "SCGI"; version = "0.6"; @@ -22009,10 +22301,10 @@ with self; { SearchXapian = buildPerlPackage rec { pname = "Search-Xapian"; - version = "1.2.25.4"; + version = "1.2.25.5"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.4.tar.gz"; - hash = "sha256-hxlDGZuA79mOMfS0cRuwcKV2yRvmkhk9ikOv+tZFdN0="; + url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.5.tar.gz"; + hash = "sha256-IE+9xxLWcR/6tmjB9M/AB7Y5qftkrX4ZyyD8EKkQuos="; }; buildInputs = [ pkgs.xapian DevelLeak ]; meta = { @@ -22024,10 +22316,10 @@ with self; { SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.025.tar.gz"; - hash = "sha256-jg47mprxp3i33iFQb6MHl/sbUg3NAC8/KebctSRG3qU="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-5.004.tar.gz"; + hash = "sha256-aO8DFNh9Gm5guw9m/PQ+ssrN6xdUQy9eJeeE450+Z4Q="; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = "ls"; @@ -22041,10 +22333,10 @@ with self; { SerealEncoder = buildPerlPackage { pname = "Sereal-Encoder"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.025.tar.gz"; - hash = "sha256-D9UbpggwJmUNCFJnWCYRc8GKuCNMVSb6x+25GtnGAm4="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-5.004.tar.gz"; + hash = "sha256-XlqGzNMtrjTtgJMuy+XGjil1K13g6bCnk6t+sspVyxs="; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { @@ -22057,10 +22349,10 @@ with self; { Sereal = buildPerlPackage { pname = "Sereal"; - version = "4.025"; + version = "5.004"; src = fetchurl { - url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.025.tar.gz"; - hash = "sha256-C+X+VStQtnhjk+Q+qczldzpItf80o6zyopWqdgmgYrk="; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-5.004.tar.gz"; + hash = "sha256-nCW7euS9c20ksa0dk9dzlbDGXKh0HiZr/Ay+VCJh128="; }; buildInputs = [ TestDeep TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; @@ -22093,6 +22385,7 @@ with self; { hash = "sha256-Z23A1s/0ZIU4Myxjwy+4itCe2GghPqnmLj8Z+tQbnEA="; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; + doCheck = false; # Tests are slow and unstable meta = { description = "A superdaemon for hot-deploying server programs"; homepage = "https://github.com/kazuho/p5-Server-Starter"; @@ -22145,10 +22438,10 @@ with self; { SetObject = buildPerlPackage { pname = "Set-Object"; - version = "1.40"; + version = "1.42"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz"; - hash = "sha256-HE2EZME+bZSVfPAhzmA8lhsI9S22qer1pbDTeGjNN7c="; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.42.tar.gz"; + hash = "sha256-0YxaiiM+q70CBs89pbAPzdezf+vxKpPcw9HAJub97EU="; }; meta = { description = "Unordered collections (sets) of Perl Objects"; @@ -22274,10 +22567,10 @@ with self; { SoftwareLicense = buildPerlPackage { pname = "Software-License"; - version = "0.103014"; + version = "0.104004"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz"; - hash = "sha256-60XqYC11AGaDeJ+7pXoBwKH3A3Nx3pXqVLkVd1NdF4k="; + url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.104004.tar.gz"; + hash = "sha256-of2iTsh3UhmAlzgPuTAMFLV0gmJwzFgNr3UONYX8Jww="; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; @@ -22332,10 +22625,10 @@ with self; { Specio = buildPerlPackage { pname = "Specio"; - version = "0.46"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz"; - hash = "sha256-C/QqoRYHbW78GPcrcsestWOL1BwKoJrswS/Iv5zrlZY="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.48.tar.gz"; + hash = "sha256-DIV5NYDxJ07wgXMHkTHRAfd7IqzOp6+oJVIC8IEWgrI="; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; @@ -22348,10 +22641,10 @@ with self; { SpecioLibraryPathTiny = buildPerlPackage { pname = "Specio-Library-Path-Tiny"; - version = "0.04"; + version = "0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; - hash = "sha256-72gT6or1FyQwREmZjbIeoqk7JYJVSet50/HpFx/qzjM="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.05.tar.gz"; + hash = "sha256-YN8Lubza6yxmoHi/bfmVTqT5Qz1stoCImULlQsfCelE="; }; propagatedBuildInputs = [ PathTiny Specio ]; buildInputs = [ Filepushd TestFatal ]; @@ -22499,13 +22792,13 @@ with self; { SQLSplitStatement = buildPerlPackage { pname = "SQL-SplitStatement"; - version = "1.00020"; + version = "1.00023"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz"; - hash = "sha256-93ww9E2HFY2C9lTp+pTTmlD994WcWn+9WBMnRmYhDy8="; + url = "mirror://cpan/authors/id/V/VE/VEESH/SQL-SplitStatement-1.00023.tar.gz"; + hash = "sha256-GnSEIM0q00HCUk7xGFt273Fylp8XqeS6tvQ3bw3p814="; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + buildInputs = [ TestDifferences TestException ]; + propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon ]; meta = { description = "Split any SQL code into atomic statements"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22543,10 +22836,10 @@ with self; { SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "1.62"; + version = "1.63"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.62.tar.gz"; - hash = "sha256-Cs1P+aw6L41dZxmarALNwSfgOIjkecUce73CG4XBziQ="; + url = "mirror://cpan/authors/id/V/VE/VEESH/SQL-Translator-1.63.tar.gz"; + hash = "sha256-WIWwTJNJi+MqGX3JcjlHUdXeYJNBiTqWZW3oikJgMTM="; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny GraphViz GD ]; @@ -22615,10 +22908,10 @@ with self; { Starman = buildPerlModule { pname = "Starman"; - version = "0.4015"; + version = "0.4017"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz"; - hash = "sha256-EPUJe8o5pDJ/9uaec/B2CdOmWaeJa+OWS0nMJBKxM/g="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4017.tar.gz"; + hash = "sha256-b/q5FfMj9gCJ4+v4Urm5cH1pFyZt+K/XNw+sBL/f7k4="; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -22678,10 +22971,10 @@ with self; { StatisticsDescriptive = buildPerlModule { pname = "Statistics-Descriptive"; - version = "3.0800"; + version = "3.0801"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0800.tar.gz"; - hash = "sha256-sE7e6ia/7UNapgKZVnmMKB9/UtRUXz9Fsq1ElU6W+Tk="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0801.tar.gz"; + hash = "sha256-BHtwpj/cqpFhaOD/LVjhVeDrvGjtTMvXOnIT3KMCj2U="; }; propagatedBuildInputs = [ ListMoreUtils ]; meta = { @@ -22759,6 +23052,19 @@ with self; { }; }; + StringBinaryInterpolation = buildPerlPackage { + pname = "String-Binary-Interpolation"; + version = "1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/String-Binary-Interpolation-1.0.0.tar.gz"; + hash = "sha256-2lXYmCTBrdniqpWP8OpILyaCLkJI7TOo1rT7vXdYivE="; + }; + meta = { + description = "Make it easier to interpolate binary bytes into a string"; + license = with lib.licenses; [ artistic2 gpl2Only ]; + }; + }; + StringCamelCase = buildPerlPackage { pname = "String-CamelCase"; version = "0.04"; @@ -22787,10 +23093,10 @@ with self; { StringCRC32 = buildPerlPackage { pname = "String-CRC32"; - version = "2"; + version = "2.100"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.tar.gz"; - hash = "sha256-7bf+rlDsn9cSV9j7IeH+1/9N/jDXmLGvIm0q96a92S0="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-2.100.tar.gz"; + hash = "sha256-lwYJOy0Gi2cV01tMWPUVWON5YAgyAhKfuwClfhmnRxM="; }; meta = { description = "Perl interface for cyclic redundancy check generation"; @@ -22823,10 +23129,10 @@ with self; { StringErrf = buildPerlPackage { pname = "String-Errf"; - version = "0.008"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz"; - hash = "sha256-rhNveD2sZYeuotItZOwgUnIVOoP5VLB1dm49KYpO1ts="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.009.tar.gz"; + hash = "sha256-4f7b+bT9ZLZOqBA43bdqTGzYX12xW8IfEGVqKYNJ3B8="; }; buildInputs = [ JSONMaybeXS TimeDate ]; propagatedBuildInputs = [ StringFormatter ]; @@ -22852,10 +23158,10 @@ with self; { StringFlogger = buildPerlPackage { pname = "String-Flogger"; - version = "1.101245"; + version = "1.101246"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz"; - hash = "sha256-qgPAjgH4AqNYwXXGCTwCrflohlmgh6jd79w+nO9yZAs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101246.tar.gz"; + hash = "sha256-FfhJHgeBi7PPqfa9Oqv2QwuptOMJ8YEUNYvj2Bv/Og8="; }; propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { @@ -22880,10 +23186,10 @@ with self; { StringFormatter = buildPerlPackage { pname = "String-Formatter"; - version = "0.102084"; + version = "1.235"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz"; - hash = "sha256-gzVBEv0MZt8eEuAi33XvvzDr20NYHACJfIbsHDOonFY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-1.235.tar.gz"; + hash = "sha256-CCNqkTuRHOZSzwhZjnwH0t8/Np/Ee/QBpIWlBKFmB4M="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -22894,10 +23200,10 @@ with self; { StringInterpolate = buildPerlPackage { pname = "String-Interpolate"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz"; - hash = "sha256-xynYmEj1WjV7z5e3m3i2uSsmPkw8knR+fe02Of5d3JU="; + url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.33.tar.gz"; + hash = "sha256-qH7Qk4kH0xr32qltc6BjL1xko40d4N6HxLRCWDEpxBM="; }; meta = { # https://metacpan.org/pod/String::Interpolate @@ -22937,10 +23243,10 @@ with self; { StringRandom = buildPerlModule { pname = "String-Random"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.31.tar.gz"; - hash = "sha256-S0rR7mOix9xwkSrBuQRyNamdjwmkdEcZkgEwM4erl1w="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.32.tar.gz"; + hash = "sha256-nZPGeaNP+ibTtPoIN8rtHNLmfXZXKBi5HpfepzRwUkY="; }; meta = { description = "Perl module to generate random strings based on a pattern"; @@ -22950,10 +23256,10 @@ with self; { StringRewritePrefix = buildPerlPackage { pname = "String-RewritePrefix"; - version = "0.008"; + version = "0.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz"; - hash = "sha256-5Fox1pFOj1/HIu9I2IGUANr8AhBeDGFBSqu/AbziCOs="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.009.tar.gz"; + hash = "sha256-RJGL7JalSvjKN8qJfkNnCewoSgeyhRbvPM5GZoaWRtU="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23051,10 +23357,10 @@ with self; { StringTruncate = buildPerlPackage { pname = "String-Truncate"; - version = "1.100602"; + version = "1.100603"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz"; - hash = "sha256-qqPU7sARNpIUhBORM+t11cVx/lGwrTKfCJ5tRpojX24="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100603.tar.gz"; + hash = "sha256-q0VgLM4t2VFe37sublzeGc3VSY1hojr9jEbB8R+O7GI="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23081,10 +23387,10 @@ with self; { StringUtil = buildPerlModule { pname = "String-Util"; - version = "1.31"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.31.tar.gz"; - hash = "sha256-+7yafqQMgylOBCuzud6x71LMkaDUgye1RC4cT4Df0m0="; + url = "mirror://cpan/authors/id/B/BA/BAKERSCOT/String-Util-1.34.tar.gz"; + hash = "sha256-MZzozWZTQeVlIfoVXZYqGTKOkNn3A2dlklzN4mclxGk="; }; buildInputs = [ ModuleBuildTiny ]; meta = { @@ -23098,12 +23404,12 @@ with self; { StructDumb = buildPerlModule { pname = "Struct-Dumb"; - version = "0.12"; + version = "0.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.12.tar.gz"; - hash = "sha256-Us5wxDPmlirRwg6eKXpTkeC3SkRSD7zi5IL1RONlf3M="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.14.tar.gz"; + hash = "sha256-E8FIU2sQ4oxuC04TLynkym5ptXSQWcRBV6J+hKVFlDY="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; meta = { description = "Make simple lightweight record-like structures"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -23112,10 +23418,10 @@ with self; { SubExporter = buildPerlPackage { pname = "Sub-Exporter"; - version = "0.987"; + version = "0.990"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz"; - hash = "sha256-VDyy6AOrkT1EJyx9pqcLtiwZ5GfzsSqqxMlSMlmwg9Y="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.990.tar.gz"; + hash = "sha256-vGTsWgaGX5zGdiFcBqlEizoMizl0/7I6JPjirQkFRPw="; }; propagatedBuildInputs = [ DataOptList ]; meta = { @@ -23127,10 +23433,10 @@ with self; { SubExporterForMethods = buildPerlPackage { pname = "Sub-Exporter-ForMethods"; - version = "0.100052"; + version = "0.100055"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz"; - hash = "sha256-Qh+7pPb/zxPEM18sIGMNcJ5vplnAdUXQlNvFpVitMAY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100055.tar.gz"; + hash = "sha256-eR9CA7p8D32DgLwBvsICFffIvHDX7QPlUu7kRUGr6U4="; }; buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; @@ -23143,10 +23449,10 @@ with self; { SubExporterGlobExporter = buildPerlPackage { pname = "Sub-Exporter-GlobExporter"; - version = "0.005"; + version = "0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz"; - hash = "sha256-L8Re7+beB80/2K+eeZxpf701oC7NW/m82MlM77bbemM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.006.tar.gz"; + hash = "sha256-3nQ/CAJnAcKmoiKotBxM3CVLGkr+fvmJh806ukzlJpY="; }; propagatedBuildInputs = [ SubExporter ]; meta = { @@ -23172,13 +23478,13 @@ with self; { SubHandlesVia = buildPerlPackage { pname = "Sub-HandlesVia"; - version = "0.016"; + version = "0.050000"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.016.tar.gz"; - hash = "sha256-ad7USuVHJAJ0AWZ0dsivJoqQCvTqYEf/RPKDvF4s+dU="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Sub-HandlesVia-0.050000.tar.gz"; + hash = "sha256-Lfk0k+L56VvleblQtuGf9ST5TIBhOq3AOohhHf91eU8="; }; - propagatedBuildInputs = [ ClassMethodModifiers ClassTiny RoleTiny ScalarListUtils TypeTiny ]; - buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassMethodModifiers RoleHooks RoleTiny TypeTiny ]; + buildInputs = [ TestFatal TestRequires TryTiny ]; meta = { description = "Alternative handles_via implementation"; homepage = "https://metacpan.org/release/Sub-HandlesVia"; @@ -23215,10 +23521,10 @@ with self; { SubInstall = buildPerlPackage { pname = "Sub-Install"; - version = "0.928"; + version = "0.929"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz"; - hash = "sha256-YeVnp2eViIh7e4bUJ7xHbqbXf//n4NF9ZA+JAH2Y7w8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.929.tar.gz"; + hash = "sha256-gLHigdjNOysx2scR9cihZXqHzYC75przkkvL605dsHc="; }; meta = { description = "Install subroutines into packages easily"; @@ -23229,10 +23535,10 @@ with self; { SubName = buildPerlPackage { pname = "Sub-Name"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz"; - hash = "sha256-LS8taX1RbIlUfnxDB/HnlEFkHK4sc5XnMZswbTkN8QU="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.27.tar.gz"; + hash = "sha256-7PNvuhxHypPh2qOUlo7TnEGGhnRZ2c0XPEIeK5cgQ+g="; }; buildInputs = [ BC DevelCheckBin ]; meta = { @@ -23258,10 +23564,10 @@ with self; { SubQuote = buildPerlPackage { pname = "Sub-Quote"; - version = "2.006006"; + version = "2.006008"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz"; - hash = "sha256-bk4q9COI+m0mCeDoJBfefMa+RyI/V2WSxlbHPHUk2J0="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006008.tar.gz"; + hash = "sha256-lL69UAr1V2LoPqLyvFlNh6+CgHI3DHEQxgwjioANFbI="; }; buildInputs = [ TestFatal ]; meta = { @@ -23433,11 +23739,12 @@ with self; { SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.27"; + version = "0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.27.tar.gz"; - hash = "sha256-JG4bAz4/8i/VQgVQ1Lbg1WtDjNy7nTXL6LG1uhV03iM="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.29.tar.gz"; + hash = "sha256-zDIHGdNgjaqVFHQ6Q9rCvpnLjM2Ymx/vooUpDLHVnY8="; }; + buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { @@ -23560,10 +23867,10 @@ with self; { SystemCommand = buildPerlPackage { pname = "System-Command"; - version = "1.121"; + version = "1.122"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.121.tar.gz"; - hash = "sha256-Q95ezSDB2kbopvT86rKeBGl6KJCpm/apGzygBKRookE="; + url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.122.tar.gz"; + hash = "sha256-2bgjsmYZqmn3oGFmUKeBDolajfBi3p0iQNZdvlz+dHo="; }; propagatedBuildInputs = [ IPCRun ]; buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ]; @@ -23595,10 +23902,10 @@ with self; { TAPParserSourceHandlerpgTAP = buildPerlModule { pname = "TAP-Parser-SourceHandler-pgTAP"; - version = "3.35"; + version = "3.36"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz"; - hash = "sha256-hO45b6fOw9EfD172hB1f6wl80Mz8ACAMPs2zQM8YpZg="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.36.tar.gz"; + hash = "sha256-B75RUy4GPqxu2OWBUFRw7ryB1VBkQa8tzzK8Dr7pjGc="; }; doCheck = !stdenv.isDarwin; meta = { @@ -23707,10 +24014,10 @@ with self; { TclpTk = buildPerlPackage { pname = "Tcl-pTk"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.10.tar.gz"; - hash = "sha256-sMb4KXzTL7KhkF17OSbWMb8p+iM/jYTNHtb+2J85/QQ="; + url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.11.tar.gz"; + hash = "sha256-05PxKxzN7I8ZbN27WJHZSEx5qpQQWmN22f+cRg2CDN0="; }; propagatedBuildInputs = [ ClassISA @@ -23822,10 +24129,10 @@ with self; { TemplateTiny = buildPerlPackage { pname = "Template-Tiny"; - version = "1.12"; + version = "1.14"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz"; - hash = "sha256-Bz4GLGMLUd+3Jc1khaMpFVy3LVxZboy2mOtnxFZvCko="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Template-Tiny-1.14.tar.gz"; + hash = "sha256-gZz6tgREg8/ijOsof938MXaiAlsbbw6YCy3MJtImm0w="; }; meta = { description = "Template Toolkit reimplemented in as little code as possible"; @@ -23881,10 +24188,10 @@ with self; { TermProgressBar = buildPerlPackage { pname = "Term-ProgressBar"; - version = "2.22"; + version = "2.23"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz"; - hash = "sha256-JkLsylsLA4wUgSvK06lhH/eRHcWckQTSIHl/g3qIDEk="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.23.tar.gz"; + hash = "sha256-3vwD+59KwcnfE1nTEr/zwIZd3vvzq6ZM1CppqGIV1J0="; }; buildInputs = [ CaptureTiny TestException TestWarnings ]; propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; @@ -23956,10 +24263,10 @@ with self; { TermReadLineGnu = buildPerlPackage { pname = "Term-ReadLine-Gnu"; - version = "1.36"; + version = "1.46"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz"; - hash = "sha256-mgj3pAE8m4ZVQcENu6EhB3nrkSi5YSULdG0mcCuraSU="; + url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.46.tar.gz"; + hash = "sha256-sTgyEy5QNmw0/qwSzoKDfAqds0ylMK5dJ9uXz5yWTHs="; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; NIX_CFLAGS_LINK = "-lreadline -lncursesw"; @@ -24021,10 +24328,10 @@ with self; { TermShell = buildPerlModule { pname = "Term-Shell"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.12.tar.gz"; - hash = "sha256-fWz1ecALZUDC2x2Sl8rXTuCzgP4B/9OPjm1uTM47Pdc="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.13.tar.gz"; + hash = "sha256-U6C9smVokcUIpHDZPLfhz+qzjuqeWClWCn2LX2APa/I="; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = { @@ -24076,10 +24383,10 @@ with self; { TermTable = buildPerlPackage { pname = "Term-Table"; - version = "0.015"; + version = "0.017"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz"; - hash = "sha256-2KGLKAH5Hw5ddHFHznhpZKdvkdGFaGUpCKPcBqm5SNU="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.017.tar.gz"; + hash = "sha256-8R20JorYBE9uGhrJU0ygzTrXecQAb/83+uUA25j6yRo="; }; propagatedBuildInputs = [ Importer ]; meta = { @@ -24103,10 +24410,10 @@ with self; { TermUI = buildPerlPackage { pname = "Term-UI"; - version = "0.46"; + version = "0.50"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; - hash = "sha256-kZRsgNf0qrDKS/7cO74KdbN8qxopvXvKOzt0VtQX6aY="; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.50.tar.gz"; + hash = "sha256-YL/dbUwVi4jTcBM/xlsgSFo2pFsS2QYAC4HHjKUkFj0="; }; propagatedBuildInputs = [ LogMessageSimple ]; meta = { @@ -24158,14 +24465,15 @@ with self; { Test2Harness = buildPerlPackage { pname = "Test2-Harness"; - version = "1.000152"; + version = "1.000155"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000152.tar.gz"; - hash = "sha256-iIqWAdvTPuuaSTcdZmK7JE8Ad/QJlM4gvJClvlSRqls="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000155.tar.gz"; + hash = "sha256-Hvi/euDKALaHu24RXzq4yVBI5ICsmuUylzabxpSkc4s="; }; checkPhase = '' patchShebangs ./t ./scripts/yath + export AUTOMATED_TESTING=1 ./scripts/yath test -j $NIX_BUILD_CORES ''; @@ -24225,10 +24533,10 @@ with self; { Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000155"; + version = "0.000156"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000155.tar.gz"; - hash = "sha256-x45rxNabwJeDaXaGM4K1K54MMe4YUGbOYMVL10uq1T0="; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000156.tar.gz"; + hash = "sha256-vzgq5y86k79+02iFEY+uL/qw/xF3Q/WQON8lTv7yyU4="; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -24273,10 +24581,10 @@ with self; { TestAbortable = buildPerlPackage { pname = "Test-Abortable"; - version = "0.002"; + version = "0.003"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; - hash = "sha256-l5C3+bl2mOosUwQ2xgkMJRGcb1vS9w14r8SZIsPwJ20="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.003.tar.gz"; + hash = "sha256-TVPDXvPLf5wXUrqfEdOpeiETt9hMJg6rj5p8G4Aba40="; }; propagatedBuildInputs = [ SubExporter ]; buildInputs = [ TestNeeds ]; @@ -24379,10 +24687,10 @@ with self; { TestClass = buildPerlPackage { pname = "Test-Class"; - version = "0.50"; + version = "0.52"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz"; - hash = "sha256-CZFU7YyvP/l8cSN/q5UiZKwcA9knBzelYHHKvmWZE1A="; + url = "mirror://cpan/authors/id/S/SZ/SZABGAB/Test-Class-0.52.tar.gz"; + hash = "sha256-QMGx04jwqGdHacJ1KfDMNjTKD9nY9ysZbAUxYRk0vII="; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ MROCompat ModuleRuntime TryTiny ]; @@ -24453,10 +24761,10 @@ with self; { TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "2.4.1"; + version = "3.3.1"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.4.1.tar.gz"; - hash = "sha256-VqejRZ213g+SQZApzxtNUcRN0C1GkM/zxO7fZm9tjUY="; + url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v3.3.1.tar.gz"; + hash = "sha256-gIRQ89Ref0GapNZo4pgodonp6jY4hpO/8YDXhwzj5iE="; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { @@ -24510,10 +24818,10 @@ with self; { TestDeep = buildPerlPackage { pname = "Test-Deep"; - version = "1.130"; + version = "1.204"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.130.tar.gz"; - hash = "sha256-QGT0lPX2JYfQrlAcpDkQWCHuWEbGh9xlAyM/VTAKfFY="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.204.tar.gz"; + hash = "sha256-tlkfbM3YU8fvyf88V1Y3BAMhHP/kYEfwgrHNFhGoTl8="; }; meta = { description = "Extremely flexible deep comparison"; @@ -24554,6 +24862,21 @@ with self; { }; }; + TestDiagINC = buildPerlPackage { + pname = "Test-DiagINC"; + version = "0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-DiagINC-0.010.tar.gz"; + hash = "sha256-W8uNNWxQnjWdU9hpwH79qo/uXWz5mJcBi5qRTOshIi4="; + }; + buildInputs = [ CaptureTiny ]; + meta = { + homepage = "https://github.com/dagolden/Test-DiagINC"; + description = "List modules and versions loaded if tests fail"; + license = lib.licenses.asl20; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -24569,10 +24892,10 @@ with self; { TestDifferences = buildPerlPackage { pname = "Test-Differences"; - version = "0.67"; + version = "0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz"; - hash = "sha256-yI27tIuTSwaShIdPM6u6qkOKoxIEqj+nO/wvSurIeNo="; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.70.tar.gz"; + hash = "sha256-vuG1GGqpuif+0r8bBnRSDQvQzQUdkTOH+QhsH5SlaFQ="; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { @@ -24672,10 +24995,10 @@ with self; { TestFatal = buildPerlPackage { pname = "Test-Fatal"; - version = "0.016"; + version = "0.017"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.016.tar.gz"; - hash = "sha256-coPUMPK6IDC4zZea4wOdPxsuw93hoRymrgn5kqZveI8="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.017.tar.gz"; + hash = "sha256-N9//2vuEt2Lv6WsC+yqkHzcCbHPmuDWQ23YilpfzxKY="; }; propagatedBuildInputs = [ TryTiny ]; meta = { @@ -24699,12 +25022,12 @@ with self; { }; }; - TestFileContents = buildPerlModule { + TestFileContents = buildPerlPackage { pname = "Test-File-Contents"; - version = "0.23"; + version = "0.242"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz"; - hash = "sha256-zW+t+5ELNLS1OZH/Ix2tmZKcqIUKvsOtDigQxL17Hz0="; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Test-File-Contents-0.242.tar.gz"; + hash = "sha256-qDisC29uEOiWE7UMphdzzbqbpHh7qC57tl2q9whKpQs="; }; propagatedBuildInputs = [ TextDiff ]; meta = { @@ -24757,6 +25080,20 @@ with self; { }; }; + TestFutureIOImpl = buildPerlModule { + pname = "Test-Future-IO-Impl"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Future-IO-Impl-0.14.tar.gz"; + hash = "sha256-AH22GdPUljQyXFbvvKDh5Vdt0z95RV8t6llb5u344jU="; + }; + propagatedBuildInputs = [ Test2Suite ]; + meta = { + description = "Acceptance tests for C<Future::IO> implementations"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestHarnessStraps = buildPerlModule { pname = "Test-Harness-Straps"; version = "0.30"; @@ -24875,10 +25212,10 @@ with self; { TestLeakTrace = buildPerlPackage { pname = "Test-LeakTrace"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz"; - hash = "sha256-Xwie7ZFfHsjHQ/bSd3w+zQygHfL3ueEAONMWlSWD5AM="; + url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.17.tar.gz"; + hash = "sha256-d31k0pOPXqWGMA7vl+8D6stD1MGFPJw7EJHrMxFGeXA="; }; meta = { description = "Traces memory leaks"; @@ -25016,10 +25353,10 @@ with self; { TestMockModule = buildPerlModule { pname = "Test-MockModule"; - version = "0.175.0"; + version = "0.177.0"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.175.0.tar.gz"; - hash = "sha256-B7KE1xPdgs7RtCxgzLFiGjx3xUshsTuGlKdZRcBF7v4="; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.177.0.tar.gz"; + hash = "sha256-G9p6SdzqdgdtQKe2psPz4V5rGchLYXHfRFNNkROPEEU="; }; propagatedBuildInputs = [ SUPER ]; buildInputs = [ TestWarnings ]; @@ -25118,10 +25455,10 @@ with self; { TestMost = buildPerlPackage { pname = "Test-Most"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.37.tar.gz"; - hash = "sha256-UzNwFB658Yz0rDgPbe0qtXgCpuGEAIqA/SMEv8xHT8c="; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.38.tar.gz"; + hash = "sha256-CJ64lPe6zkw3xjNODikOsgM47hAiOvDILL5ygceDgt8="; }; propagatedBuildInputs = [ ExceptionClass ]; buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; @@ -25150,10 +25487,10 @@ with self; { TestNeeds = buildPerlPackage { pname = "Test-Needs"; - version = "0.002006"; + version = "0.002010"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz"; - hash = "sha256-d/n/8MlsXgnzTQQWs1M8Mxn3zQux9/6PgHKtWfQz8OU="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002010.tar.gz"; + hash = "sha256-kj/9x4/LqWYJdT5LriawugGGiT3kpjzVI24BLHyQ4gg="; }; meta = { description = "Skip tests when modules not available"; @@ -25177,10 +25514,10 @@ with self; { TestNoWarnings = buildPerlPackage { pname = "Test-NoWarnings"; - version = "1.04"; + version = "1.06"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz"; - hash = "sha256-Y4pXZYyxGa8f5bFec9R8JUTc/vhK8Maxsul/CCAraGw="; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-NoWarnings-1.06.tar.gz"; + hash = "sha256-wtxRFDt+tjIxIQ4n3yDSyDk3cuCjM1R+yLeiBe1i9zc="; }; meta = { description = "Make sure you didn't emit any warnings while testing"; @@ -25203,10 +25540,10 @@ with self; { TestOutput = buildPerlPackage { pname = "Test-Output"; - version = "1.031"; + version = "1.034"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz"; - hash = "sha256-+LjzcYVxeHJyfQb2wHj6d9t5RBD68vbaTTewt2UPfqQ="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.034.tar.gz"; + hash = "sha256-zULigBwNK0gtGMn7SwbHVwVIGLy7KCTl378zrXo9aaA="; }; propagatedBuildInputs = [ CaptureTiny ]; meta = { @@ -25246,10 +25583,10 @@ with self; { TestPerlTidy = buildPerlModule rec { pname = "Test-PerlTidy"; - version = "20200930"; + version = "20230226"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-${version}.tar.gz"; - hash = "sha256-n29omXRe17bNtREFsJSUp/ohdVBMxAgWrkYGfUp0V7Y="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20230226.tar.gz"; + hash = "sha256-wOJCEQeVeV1Nu2xEFmzlV09cftuninidG8rnZoXYA8E="; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; buildInputs = [ TestPerlCritic ]; @@ -25406,10 +25743,10 @@ with self; { TestRoutine = buildPerlPackage { pname = "Test-Routine"; - version = "0.027"; + version = "0.031"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz"; - hash = "sha256-utQOEupgikPogy9W5BqLSfNmN7L5wz3pQcdfsUEY01g="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.031.tar.gz"; + hash = "sha256-f9kp7TPyVMoJkCJQGSYInHeU71d7uoYHbn2YFlYPXAc="; }; buildInputs = [ TestAbortable TestFatal ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -25555,10 +25892,10 @@ with self; { TestScript = buildPerlPackage { pname = "Test-Script"; - version = "1.26"; + version = "1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz"; - hash = "sha256-bUIjeuzi8NxB+mZTN5V0Z0BhhI8CCs1NY962uBtac7c="; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.29.tar.gz"; + hash = "sha256-iS5+bB6nsWcQkJlCz1wL2rcO7i79SqnBbqlS4rkPiVA="; }; buildInputs = [ Test2Suite ]; @@ -25658,10 +25995,10 @@ with self; { TestSynopsis = buildPerlPackage { pname = "Test-Synopsis"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz"; - hash = "sha256-GxPsc7z3JGLAYPiBlJFETXRz8+qK60wO2CgmPu0OCSU="; + url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.17.tar.gz"; + hash = "sha256-0mjJizPS+hTbsisg1lYbq0ie6CWH374ZrSd2IMe4tt4="; }; meta = { description = "Test your SYNOPSIS code"; @@ -25730,10 +26067,10 @@ with self; { TestTime = buildPerlPackage { pname = "Test-Time"; - version = "0.08"; + version = "0.092"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz"; - hash = "sha256-uLw7B0uyJH6FiDmcHlXQcfBJz2zhyLQZLDjPPCRVlUg="; + url = "mirror://cpan/authors/id/A/AN/ANATOFUZ/Test-Time-0.092.tar.gz"; + hash = "sha256-MNkPVM6ECJPHuiysKk0e7NTJzfgFkQxZXjronf1kRzg="; }; meta = { description = "Overrides the time() and sleep() core functions for testing"; @@ -25757,11 +26094,12 @@ with self; { TestTrailingSpace = buildPerlModule { pname = "Test-TrailingSpace"; - version = "0.0600"; + version = "0.0601"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0600.tar.gz"; - hash = "sha256-8J0mOt7AZwCkOiTin1SEz20pOZFMYH3sUVkPS7j6WhE="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0601.tar.gz"; + hash = "sha256-q7jOdEg6Y9c/4e9gO3zgptR8mO3nMZVdc1eE+tHcT8w="; }; + buildInputs = [ FileTreeCreate ]; propagatedBuildInputs = [ FileFindObjectRule ]; meta = { description = "Test for trailing space in source files"; @@ -25785,10 +26123,10 @@ with self; { TestWarn = buildPerlPackage { pname = "Test-Warn"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz"; - hash = "sha256-7LyjRtN5zvjTwOSsDI6zsmE9c3/6rq5SJxw41788bNo="; + url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.37.tar.gz"; + hash = "sha256-mMoy5/L16om4v7mgYJl389FT4kLi5RcFEmy5VPGga1c="; }; propagatedBuildInputs = [ SubUplevel ]; meta = { @@ -25799,10 +26137,10 @@ with self; { TestWarnings = buildPerlPackage { pname = "Test-Warnings"; - version = "0.030"; + version = "0.032"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.030.tar.gz"; - hash = "sha256-iaSUfd8VZK4BEiJ1WEQz1/bENwNwvPN2iSLXlpVq4k8="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.032.tar.gz"; + hash = "sha256-Ryfa4kFunwfkHi3DqRQ7pq/8HsV2UhF8mdUAOOMT6dk="; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { @@ -25841,10 +26179,10 @@ with self; { TestWWWMechanize = buildPerlPackage { pname = "Test-WWW-Mechanize"; - version = "1.54"; + version = "1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.54.tar.gz"; - hash = "sha256-3KiLWxdBFL9apseC/58OzFDBRCuDJMEdORd1LqNDmvw="; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.60.tar.gz"; + hash = "sha256-I/1y5+0b553h0CotFfDfCTQV4Oq2/GFf9rtoh0Emhnc="; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; @@ -25902,12 +26240,12 @@ with self; { }; }; - TestXPath = buildPerlModule { + TestXPath = buildPerlPackage { pname = "Test-XPath"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz"; - hash = "sha256-3vzMDBRY569dkrxzAD5oZ8Z+L6SVWqccVLOE5xEiwPM="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.20.tar.gz"; + hash = "sha256-36phHnFGrZyXabW89oiUmXa4Ny3354ekC5M6FI2JIDk="; }; propagatedBuildInputs = [ XMLLibXML ]; meta = { @@ -25979,10 +26317,10 @@ with self; { TextBalanced = buildPerlPackage { pname = "Text-Balanced"; - version = "2.04"; + version = "2.06"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.04.tar.gz"; - hash = "sha256-9JxAi4XIC6dieFQoqHWZvtItwP1rt2XJ+m3fqjLk5+I="; + url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.06.tar.gz"; + hash = "sha256-dz4PDyHAyyz2ZM7muij/cCWbq8yJL5tlD5y9oAvgkq0="; }; meta = { description = "Extract delimited text sequences from strings"; @@ -25992,11 +26330,11 @@ with self; { TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.88"; + version = "0.89"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; - hash = "sha256-sBRYbmi9vK+wos+gQB6woE6l3oxNW8Nt0Pf66ras9Cw="; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz"; + hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY="; }; # libbtparse.so: cannot open shared object file patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ]; @@ -26045,10 +26383,10 @@ with self; { TextCSV = buildPerlPackage { pname = "Text-CSV"; - version = "2.00"; + version = "2.03"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz"; - hash = "sha256-jMvZGVgFIi2ZWEQRTQ5ZW7JM4Yj4UoTb8lYIAxHLssI="; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.03.tar.gz"; + hash = "sha256-SLvOnyNJNaiFlWGOBN0UFigkbWUPKnJgJN8cE34LZfs="; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -26073,10 +26411,10 @@ with self; { TextCSV_XS = buildPerlPackage { pname = "Text-CSV_XS"; - version = "1.44"; + version = "1.52"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.44.tgz"; - hash = "sha256-xIEt3KjiZUc2xEvCzmCyekKKG8TVNksO0frTYJyPm8Q="; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.52.tgz"; + hash = "sha256-5BWqcFut+Es1ncTA8MmC8b9whIHaoUdW8xNufInA5B0="; }; meta = { description = "Comma-Separated Values manipulation routines"; @@ -26214,10 +26552,10 @@ with self; { TestInter = buildPerlPackage { pname = "Test-Inter"; - version = "1.09"; + version = "1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz"; - hash = "sha256-Hp8SnMGgAfuVRJ04UlOzivq/W0ZuOzvTPk5DDyFuF3o="; + url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.10.tar.gz"; + hash = "sha256-cewRXqwm+2aJGb1mQLQcNzInUuvUjBx222a3O679O10="; }; buildInputs = [ FileFindRule TestPod TestPodCoverage ]; meta = { @@ -26253,12 +26591,12 @@ with self; { }; }; - TextLorem = buildPerlModule { + TextLorem = buildPerlPackage { pname = "Text-Lorem"; - version = "0.3"; + version = "0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.3.tar.gz"; - hash = "sha256-ZLtjb7ISExAaZGtBTsvcG1Xt+QXLzcf10kd07FBh/i0="; + url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.34.tar.gz"; + hash = "sha256-DOajwZkXsjI0JKGqdC2YiwY8OUQEJ6MQGkzsbb2EcVc="; }; meta = { description = "Generate random Latin looking text"; @@ -26270,10 +26608,10 @@ with self; { TestManifest = buildPerlPackage { pname = "Test-Manifest"; - version = "2.021"; + version = "2.023"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz"; - hash = "sha256-pHqq1xxYDhbm5j2MA3zd3NkZh2dUvrLJXZqIaC3TMtk="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.023.tar.gz"; + hash = "sha256-0k5SVT58uc2oH5L/6MkrPkNGcY5HEIAaWzW38lGnceI="; }; meta = { description = "Interact with a t/test_manifest file"; @@ -26319,10 +26657,10 @@ with self; { TestMinimumVersion = buildPerlPackage { pname = "Test-MinimumVersion"; - version = "0.101082"; + version = "0.101083"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz"; - hash = "sha256-P7pOj890gGJZqmOb59kOcDRq0ODkuLYZWTSQ43gkGXA="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101083.tar.gz"; + hash = "sha256-MqHrzYA/oQ7vylU7w87dQ1lqdZ3Dl1revSJoiCPDauo="; }; propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { @@ -26347,10 +26685,10 @@ with self; { TextMultiMarkdown = buildPerlPackage { pname = "Text-MultiMarkdown"; - version = "1.000035"; + version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-MultiMarkdown-1.000035.tar.gz"; - hash = "sha256-JGfdE3UdwpedfIgLJOdilSEw/fQqHtPuBP33LUtSZGo="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Text-MultiMarkdown-1.001.tar.gz"; + hash = "sha256-UB1ErH2lSUSZzqhR6bL7UlOAgLDB6TYjDIwm1n4EhDM="; }; buildInputs = [ ListMoreUtils TestException ]; propagatedBuildInputs = [ HTMLParser TextMarkdown ]; @@ -26377,10 +26715,10 @@ with self; { TextParsewords = buildPerlPackage { pname = "Text-ParseWords"; - version = "3.30"; + version = "3.31"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.30.tar.gz"; - hash = "sha256-heAjgXndQ5l+WMZr1RYRGCvH1TNQUCmi2w0yMu2v9eg="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-ParseWords-3.31.tar.gz"; + hash = "sha256-KuVVughNdbK4/u640aAJESdoFa2oa8yxRSI2lk1aL8c="; }; meta = { description = "Parse text into an array of tokens or array of arrays"; @@ -26546,10 +26884,10 @@ with self; { TextTable = buildPerlModule { pname = "Text-Table"; - version = "1.134"; + version = "1.135"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.134.tar.gz"; - hash = "sha256-us9Cmxi3wLIsCIIZBVBj45AnSVMdSI69exfqt3V80Qs="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.135.tar.gz"; + hash = "sha256-/KPBboMSf3xE3ePT9+PHPqUNEJoQVERd6Agv6nlMpdI="; }; propagatedBuildInputs = [ TextAligner ]; meta = { @@ -26574,10 +26912,10 @@ with self; { TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.59"; + version = "1.61"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.59.tar.gz"; - hash = "sha256-HdLHiMBTA+2alw4YgRCWQhUfqT4Cx6gNTHBggna6se4="; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.61.tar.gz"; + hash = "sha256-opXqfR7yQa4mQMH3hktij45vmewU+x2ngbL18haNzwk="; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; meta = { @@ -26602,10 +26940,10 @@ with self; { TestVars = buildPerlModule { pname = "Test-Vars"; - version = "0.014"; + version = "0.015"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz"; - hash = "sha256-p/ehLpdx/SH8HsPePjdSJ6dL/uOye70480WkrCfAKGM="; + url = "mirror://cpan/authors/id/G/GF/GFUJI/Test-Vars-0.015.tar.gz"; + hash = "sha256-4Y3RWCcuTsmTnh37M8dDGrTnXGtAsoDDi16AT9pHGlQ="; }; buildInputs = [ ModuleBuildTiny ]; @@ -26634,10 +26972,10 @@ with self; { TextTrim = buildPerlPackage { pname = "Text-Trim"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz"; - hash = "sha256-oPz8HUbd3sQcCYggdF6DxosG/YKfc5T6NSuw1LdTSU8="; + url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.04.tar.gz"; + hash = "sha256-1YeKkHnTPNF2bParxEzWJb0AoCE9LOjjFD/mlEq6qhE="; }; meta = { description = "Remove leading and/or trailing whitespace from strings"; @@ -26779,10 +27117,10 @@ with self; { Throwable = buildPerlPackage { pname = "Throwable"; - version = "0.200013"; + version = "1.001"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz"; - hash = "sha256-mYfQ3rW93TUqYzDO++ky+ILjbdjIpFZLz9Ny3Dlrj6A="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.001.tar.gz"; + hash = "sha256-0MtenX0G1w8sxW7s+FeoOkXqykOFDc3akdP+tN3eTFE="; }; propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { @@ -26822,10 +27160,10 @@ with self; { TieCycle = buildPerlPackage { pname = "Tie-Cycle"; - version = "1.225"; + version = "1.227"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz"; - hash = "sha256-8zDYIWlK+bJptgg1cNXBDqIubrOyGEEEjOKCUrHAPUU="; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.227.tar.gz"; + hash = "sha256-eDgzV5HnGjszuKGd4wUpSeGJCkgj3vY5eCPJkiL6Hdg="; }; meta = { description = "Cycle through a list of values via a scalar"; @@ -26851,10 +27189,10 @@ with self; { TieFile = buildPerlPackage { pname = "Tie-File"; - version = "1.05"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz"; - hash = "sha256-ipgLV3/0sQ/hEGLtjHdIV/qMmDPFMF8ui/szR69j8Tk="; + url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.07.tar.gz"; + hash = "sha256-S1NUpB/pVBvc6lK0/VMBRPMVME0D8F3Q/vwynYHCawg="; }; meta = { description = "Access the lines of a disk file via a Perl array"; @@ -27012,10 +27350,10 @@ with self; { TimeDurationParse = buildPerlPackage { pname = "Time-Duration-Parse"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz"; - hash = "sha256-YdgUOo5pgcwfepdIBNSSA55eVnFnZ4KdXkvNntdK44E="; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.16.tar.gz"; + hash = "sha256-EISmRj7ieQ+ZIVvXaxNcpFr+K/ppmPpv1UcLaeG6vBI="; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -27028,10 +27366,10 @@ with self; { TimeLocal = buildPerlPackage { pname = "Time-Local"; - version = "1.30"; + version = "1.35"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz"; - hash = "sha256-x3RPaymGuUbT4s8DTfNxvuFs26/lPpRauxpULE+JIMs="; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.35.tar.gz"; + hash = "sha256-HRNrcb0EHL5vZsQxgO555nW3KtWjWWq9akTSEQcq2ik="; }; meta = { description = "Efficiently compute time from local and GMT time"; @@ -27191,10 +27529,10 @@ with self; { TreeDAGNode = buildPerlPackage { pname = "Tree-DAG_Node"; - version = "1.31"; + version = "1.32"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz"; - hash = "sha256-HIuml3JWizdYBUJHCXUSxVDv4xUXwyn7Ze73r8zJ0wQ="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.32.tgz"; + hash = "sha256-ItnePW5vSv2J5tglxmT5SCh4vUninLgTQqcHr0BULT0="; }; propagatedBuildInputs = [ FileSlurpTiny ]; meta = { @@ -27205,10 +27543,10 @@ with self; { TreeSimple = buildPerlPackage { pname = "Tree-Simple"; - version = "1.33"; + version = "1.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz"; - hash = "sha256-2zrXFCjsbDI9DL8JAWkQ5bft2bbTs1RDoorYw8zilqo="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.34.tgz"; + hash = "sha256-t+l5m9Iiu5TP+ZP312WYDL6hts0qql7L6tY1q99H0pw="; }; buildInputs = [ TestException ]; meta = { @@ -27219,10 +27557,10 @@ with self; { TreeSimpleVisitorFactory = buildPerlPackage { pname = "Tree-Simple-VisitorFactory"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz"; - hash = "sha256-Nn6C7OfOPioWbDjc+mYI59xxV4HpTgtTmQcMOr/awhs="; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.16.tgz"; + hash = "sha256-nPU4+qEsVP+0qRQ5lF5IjxhW9iuJrFByqSIRngGIDaY="; }; propagatedBuildInputs = [ TreeSimple ]; buildInputs = [ TestException ]; @@ -27234,10 +27572,10 @@ with self; { TryTiny = buildPerlPackage { pname = "Try-Tiny"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz"; - hash = "sha256-2lvQ1ckDUZu/ELuboMt7ysBWOIK8/kUDruP7FD7d72s="; + url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.31.tar.gz"; + hash = "sha256-MwDTHYpAdbJtj0bOhkodkT4OhGfO66ZlXV0rLiBsEb4="; }; buildInputs = [ CPANMetaCheck CaptureTiny ]; meta = { @@ -27263,10 +27601,10 @@ with self; { Twiggy = buildPerlPackage { pname = "Twiggy"; - version = "0.1025"; + version = "0.1026"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; - hash = "sha256-11rfljqoFclx8PFxxpTtAI2mAWszfA0/zYdZz5edp6g="; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1026.tar.gz"; + hash = "sha256-TZHqbtmumo70MU3Cp89S6wJrNlvmg4azXqaGTfrFf54="; }; propagatedBuildInputs = [ AnyEvent Plack ]; buildInputs = [ TestRequires TestSharedFork TestTCP ]; @@ -27280,10 +27618,10 @@ with self; { TypeTiny = buildPerlPackage { pname = "Type-Tiny"; - version = "1.012000"; + version = "2.004000"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.012000.tar.gz"; - hash = "sha256-09sSIBYcKuprC4oiJcT+9Sbo275WtL/+naq8A+Lv6pA="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-2.004000.tar.gz"; + hash = "sha256-aX5/d17fyF9M8HeS0E/RmwnCUoX5j1k46O/E90UHoSg="; }; propagatedBuildInputs = [ ExporterTiny ]; buildInputs = [ TestMemoryCycle ]; @@ -27296,10 +27634,10 @@ with self; { TypeTinyXS = buildPerlPackage { pname = "Type-Tiny-XS"; - version = "0.022"; + version = "0.025"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; - hash = "sha256-vMNKMffcHTDMgDiJtcj5Dkdztztb7L2zhg9avn4i/wA="; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.025.tar.gz"; + hash = "sha256-mmFFDdqQKU9gbNej+kTzsaNmvNiKQZkXsFTuXiPRSL0="; }; meta = { description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; @@ -27352,10 +27690,10 @@ with self; { UNIVERSALrequire = buildPerlPackage { pname = "UNIVERSAL-require"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz"; - hash = "sha256-sqc2qHlnoUPatYyKEQUB1SNbzdLIsqO//808C9BrOO0="; + url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.19.tar.gz"; + hash = "sha256-1GfNJuBsjDsgP9O8B5aubIN6xeMQCTyCJn/134UPGgM="; }; meta = { description = "Require() modules from a variable [deprecated]"; @@ -27464,12 +27802,12 @@ with self; { URI = buildPerlPackage { pname = "URI"; - version = "5.05"; + version = "5.21"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-5.05.tar.gz"; - hash = "sha256-pcET0tAnBtn73KaobykMWwWy+Gg21Of+FEfwYyYbeew="; + url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-5.21.tar.gz"; + hash = "sha256-liZYYM1hveFuhBXc+/EIBW3hYsqgrDf4HraVydLgq3c="; }; - buildInputs = [ TestNeeds ]; + buildInputs = [ TestFatal TestNeeds TestWarnings ]; meta = { description = "Uniform Resource Identifiers (absolute and relative)"; homepage = "https://github.com/libwww-perl/URI"; @@ -27479,10 +27817,10 @@ with self; { URIdb = buildPerlModule { pname = "URI-db"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.20.tar.gz"; - hash = "sha256-FMjaFawgljG445/BJFHJsTEa0LXKX5Aye9+peLfRPxQ="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.21.tar.gz"; + hash = "sha256-pkM9wVF6kH4YmRKkx2td/HYzLj/X/Is4oTfkAZx4CzQ="; }; propagatedBuildInputs = [ URINested ]; meta = { @@ -27540,11 +27878,12 @@ with self; { UserIdentity = buildPerlPackage { pname = "User-Identity"; - version = "1.00"; + version = "1.02"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz"; - hash = "sha256-khm0Jxz+tyYzDpVkWJ6jp9tLbdb29EI3RgSN8aCOn0o="; + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.02.tar.gz"; + hash = "sha256-OySu5/UnjGXD8EEVsHyG5kaTTpnqQJJANj8wiZE+uJk="; }; + propagatedBuildInputs = [ HashOrdered ]; meta = { description = "Collect information about a user"; homepage = "http://perl.overmeer.net/CPAN"; @@ -27612,10 +27951,10 @@ with self; { URIcpan = buildPerlPackage { pname = "URI-cpan"; - version = "1.007"; + version = "1.009"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/URI-cpan-1.007.tar.gz"; - hash = "sha256-EloTlGYuCkXiaWl3SWwdAnsUOH/245tgwH4PlurhUtM="; + url = "mirror://cpan/authors/id/R/RJ/RJBS/URI-cpan-1.009.tar.gz"; + hash = "sha256-JFV5sCW2P1d8cndDARmEcjhxykDcNezsjq05riSkjhI="; }; propagatedBuildInputs = [ CPANDistnameInfo URI ]; meta = { @@ -27642,10 +27981,10 @@ with self; { UUID4Tiny = buildPerlPackage { pname = "UUID4-Tiny"; - version = "0.002"; + version = "0.003"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz"; - hash = "sha256-51NbMeOG1DLex63eIUNIOJ4dXPdT5+0H8a4ExDYIQM8="; + url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.003.tar.gz"; + hash = "sha256-4S9sgrg1dcORd3O0HA+1HPeDx8bPcuDJkWks4u8Hg2I="; }; postPatch = lib.optionalString (stdenv.isAarch64) '' # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h @@ -27704,10 +28043,10 @@ with self; { Version = buildPerlPackage { pname = "version"; - version = "0.9928"; + version = "0.9930"; src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9928.tar.gz"; - hash = "sha256-JA4Ujct24WVH7/hcflx/fuBBZLgbiiOhppzDfABdqo4="; + url = "mirror://cpan/authors/id/L/LE/LEONT/version-0.9930.tar.gz"; + hash = "sha256-YduVX7yzn1kC+myLlXrrJ0HiPUhA+Eq/hGrx9nCu7jA="; }; meta = { description = "Structured version objects"; @@ -27717,10 +28056,10 @@ with self; { vidir = buildPerlPackage { pname = "App-vidir"; - version = "0.050"; + version = "0.052"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.050.tar.gz"; - hash = "sha256-cEYIQDTAkYMTQ/S7UJMQ4pEaMl0NUG8vUlj1uZbaQ/U="; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.052.tar.gz"; + hash = "sha256-GSKQdqXxPvGe1sEbu5Bcrc4iYH+pDoXJrxqqKbWsFQo="; }; outputs = [ "out" ]; meta = { @@ -27762,10 +28101,10 @@ with self; { W3CLinkChecker = buildPerlPackage { pname = "W3C-LinkChecker"; - version = "4.81"; + version = "5.0.0"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz"; - hash = "sha256-Yjn2GyDZHc57IeTU9iark6jx4vIH2lAVWQ1QjPbGamU="; + url = "mirror://cpan/authors/id/D/DH/DHM/W3C-LinkChecker-5.0.0.tar.gz"; + hash = "sha256-CvdY0ZUMswTdqvqnoDmHaHTYjC/teL2KYx6zkG5U+6Y="; }; outputs = [ "out" ]; propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP LocaleCodes NetIP TermReadKey ]; @@ -27786,9 +28125,9 @@ with self; { }; patches = [ (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/curl-7.71.0.patch?h=perl-www-curl&id=261d84887d736cc097abef61164339216fb79180"; - hash = "sha256-2lHV8qKZPdM/WnuvNYphCGRAq7UOTdPKH0k56iYtPMI="; - name = "WWWCurl-curl-7.71.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/makefile.patch?h=perl-www-curl&id=7e004bb8c5dc49c903a5d5fa5ff28c30a58e2595"; + hash = "sha256-8JZbe4IMfRZyLa118AAH/wsXrazOFy79OoH3Nuy57A4="; + name = "perl-www-curl-makefile.patch"; }) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; @@ -27816,10 +28155,10 @@ with self; { WWWMechanize = buildPerlPackage { pname = "WWW-Mechanize"; - version = "2.03"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-2.03.tar.gz"; - hash = "sha256-Px3XTfYdYVIsAnDxluzG6AxAj4xNGDW5nh/OCg2ThF4="; + url = "mirror://cpan/authors/id/S/SI/SIMBABQUE/WWW-Mechanize-2.17.tar.gz"; + hash = "sha256-nAIAPoRiHeoSyYDEEB555PjK5OOCzT2iOfqovRmPBjo="; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -27908,15 +28247,15 @@ with self; { }; }; - Workflow = buildPerlModule { + Workflow = buildPerlPackage { pname = "Workflow"; - version = "1.48"; + version = "1.62"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz"; - hash = "sha256-TgSwvHYuWYzMCwzD1N9qYfWkWzTIVQRnLPD5mmh85i8="; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.62.tar.gz"; + hash = "sha256-WNNokAm4j+Gp2DcWfTKaoe4xTzFZeeVik2OGVFs80pU="; }; - buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; - propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; + buildInputs = [ DBDMock ListMoreUtils MockMonkeyPatch PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; + propagatedBuildInputs = [ ClassAccessor ClassFactory DateTime DBI DataUUID DateTimeFormatStrptime ExceptionClass FileSlurp LogLog4perl Readonly XMLSimple ]; meta = { description = "Simple, flexible system to implement workflows"; homepage = "https://github.com/jonasbn/perl-workflow"; @@ -28040,18 +28379,11 @@ with self; { X11XCB = buildPerlPackage { pname = "X11-XCB"; - version = "0.18"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz"; - hash = "sha256-rtvML3GhEeEVcqJ8nu0qfwoh6venLQoEn0xZdjh8V7I="; + url = "mirror://cpan/authors/id/Z/ZH/ZHMYLOVE/X11-XCB-0.20.tar.gz"; + hash = "sha256-rVY5Yd4gIlVOdZHvXLjZY0ngxzdxIYXkeFBViMZ6L9I="; }; - patches = [ - # Pull upstream fix for parallel build failure - (fetchpatch { - url = "https://github.com/stapelberg/X11-XCB/commit/813608dacdae1ae35c9eb0f171a958617e014520.patch"; - hash = "sha256-gxxY8549/ebS3QORjSs8IgdBs2aD05Tu+9Bn70gu7gQ="; - }) - ]; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; @@ -28240,14 +28572,17 @@ with self; { XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0208"; + version = "2.0209"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0208.tar.gz"; - hash = "sha256-DABrA7+NDrUx+1a9o64VdUylbYiN17noBauesZ1f1lM="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0209.tar.gz"; + hash = "sha256-tKWrvNaJqi+7yLe0UznpYcSYTkgQhJTrbCgrR0giJCU="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); + patches = [ + ../development/perl-modules/XML-LibXML-clang16.patch + ]; # Remove test that fails after LibXML 2.11 upgrade postPatch = '' rm t/35huge_mode.t @@ -28275,10 +28610,10 @@ with self; { XMLLibXSLT = buildPerlPackage { pname = "XML-LibXSLT"; - version = "1.99"; + version = "2.002001"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; - hash = "sha256-En4XqHf7YeR7nouHv42q0xM5pioAEh+XUdUitDiw9/A="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-2.002001.tar.gz"; + hash = "sha256-34knxP8ZSfYlgNHB5vAPDNVrU9OpV+5LFxtZv/pjssA="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; @@ -28352,10 +28687,10 @@ with self; { XMLXPath = buildPerlPackage { pname = "XML-XPath"; - version = "1.44"; + version = "1.48"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz"; - hash = "sha256-HMkRBwUWXcCd0Jl03XwLZwnJNR1raxzvWnEQVfiR3Q8="; + url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.48.tar.gz"; + hash = "sha256-e8db42sjnlsucAqVcNK1O0MJPUZ/Kr5qdD+f+Qk3kM0="; }; buildInputs = [ PathTiny ]; propagatedBuildInputs = [ XMLParser ]; @@ -28619,10 +28954,10 @@ with self; { XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.34"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.34.tar.gz"; - hash = "sha256-EDPdtAmSTZ1Cs4MEodeXRaBDSrxrBJHrErbIu5bx1sE="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.38.tar.gz"; + hash = "sha256-JQDEeGnPXKjGHdI8Z7rav2a48e+14nkgdlfBzmk+IR4="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -28635,12 +28970,12 @@ with self; { XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.16"; + version = "0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.16.tar.gz"; - hash = "sha256-IV5AmzmFgdJfDv8DeFBjvCUTu4YbrL6Z/m1VNTRvZt8="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.20.tar.gz"; + hash = "sha256-Wn0myqMroqQQUZwMJLHYCznvMgdRN224vbef2u/pms0="; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Test2Suite ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; @@ -28651,10 +28986,10 @@ with self; { XXX = buildPerlPackage { pname = "XXX"; - version = "0.35"; + version = "0.38"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz"; - hash = "sha256-pmY2DEl9zgf0HL5FtfjExW24G8iPDHU/Qaxv0QYU86s="; + url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.38.tar.gz"; + hash = "sha256-0QUQ6gD2Gav0erKZ8Ui9WzYM+gfcDtUYE4t87HJpLSo="; }; propagatedBuildInputs = [ YAMLPP ]; meta = { @@ -28713,10 +29048,10 @@ with self; { YAMLTiny = buildPerlPackage { pname = "YAML-Tiny"; - version = "1.73"; + version = "1.74"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz"; - hash = "sha256-vDFfoS6PHj7l4vQw2Qtwil3H5HyGfbqNzjprj74ld0Q="; + url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.74.tar.gz"; + hash = "sha256-ezjKn1084kIwpri9wfR/Wy2zSOf3+WZsJvWVVjbjPWw="; }; meta = { description = "Read/Write YAML files with as little code as possible"; @@ -28726,10 +29061,10 @@ with self; { YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.83"; + version = "0.88"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.83.tar.gz"; - hash = "sha256-tHF1tP85etdaT3eB09g8CGN9pv8LrjJq87OJ2FS+xJA="; + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.88.tar.gz"; + hash = "sha256-qKJzjMzDMqj3VJxMJ/PgCQyasR7vD2yFZEUXc5gTVng="; }; meta = { description = "Perl YAML Serialization using XS and libyaml"; @@ -28739,10 +29074,10 @@ with self; { YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.026"; + version = "0.036"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.026.tar.gz"; - hash = "sha256-S4WOZxzz6WbsxUQI6AMXQMLyj4fClO6WefsC4C1aRes="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.036.tar.gz"; + hash = "sha256-yLTlBYSt+S73Vz9rsB1u1Y5iF2MsV0J7cnTPp8pG/Bs="; }; buildInputs = [ TestDeep TestWarn ]; meta = { @@ -28831,10 +29166,10 @@ with self; { ZonemasterCLI = buildPerlPackage { pname = "Zonemaster-CLI"; - version = "5.0.1"; + version = "6.000003"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v5.0.1.tar.gz"; - hash = "sha256-a/PPgavkaw9gCW44rj7+6AjOOSHKglg4H3kr6jXuRE4="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-CLI-v6.0.3.tar.gz"; + hash = "sha256-oYDBYVygvPUZ9vrGX/y5A0MAQ6zgSsrf6AtUdFcZG4Q="; }; propagatedBuildInputs = [ JSONXS @@ -28874,10 +29209,10 @@ with self; { ZonemasterLDNS = buildPerlPackage { pname = "Zonemaster-LDNS"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.1.0.tar.gz"; - hash = "sha256-Rr4uoQg5g9/ZLVnFQiLAz5MB+Uj39U24YWEa+o2+9HE="; + url = "mirror://cpan/authors/id/Z/ZN/ZNMSTR/Zonemaster-LDNS-3.2.0.tar.gz"; + hash = "sha256-BpsWQRcpX6gtJSlAocqLMIrYsfPocjvk6CaqqX9wbWw="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include -I${pkgs.libidn2}.dev}/include"; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; @@ -28885,7 +29220,7 @@ with self; { makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl.dev}" ]; nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal TestDifferences pkgs.ldns pkgs.libidn2 pkgs.openssl ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3810390f7862f..20e39d98fb42a 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -30,6 +30,7 @@ , openldap , openssl_1_1 , openssl +, overrideSDK , pam , pcre2 , postgresql @@ -239,6 +240,9 @@ lib.makeScope pkgs.newScope (self: with self; { couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { + buildPecl = buildPecl.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; inherit (pkgs) darwin; }; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4578b0f92b255..50eae9ac572dd 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -773,11 +773,6 @@ "ruby_2_7" ] }, - "ruby-3.0": { - "attrPath": [ - "ruby_3_0" - ] - }, "ruby-3.1": { "attrPath": [ "ruby_3_1" diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 24ffa5b35136e..94898d9db8929 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 + adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute."; # Added 2023-11-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 @@ -349,6 +350,7 @@ mapAliases ({ python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05 python-igraph = igraph; # added 2021-11-11 python_docs_theme = python-docs-theme; # added 2023-11-04 + python_fedora = python-fedora; # added 2023-11-15 python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16 python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 @@ -410,7 +412,9 @@ mapAliases ({ sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24 sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 - sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28 + sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28 + sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20 + sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3be0b4503ed5b..4ce388234b5e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28,6 +28,8 @@ self: super: with self; { aardwolf = callPackage ../development/python-modules/aardwolf { }; + abjad = callPackage ../development/python-modules/abjad { }; + about-time = callPackage ../development/python-modules/about-time { }; absl-py = callPackage ../development/python-modules/absl-py { }; @@ -54,8 +56,6 @@ self: super: with self; { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; - adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; - adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; @@ -634,6 +634,8 @@ self: super: with self; { appthreat-vulnerability-db = callPackage ../development/python-modules/appthreat-vulnerability-db { }; + apricot-select = callPackage ../development/python-modules/apricot-select { }; + aprslib = callPackage ../development/python-modules/aprslib { }; apscheduler = callPackage ../development/python-modules/apscheduler { }; @@ -2492,10 +2494,10 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.2"; + version = "3.0.3"; src = old.src.override { inherit version; - hash = "sha256-lZSBjcqLsirmWAxSItorxcwyM0NQvS0pSgDYZpvMYbU="; + hash = "sha256-MnMJMBsB9ynxc6lFEcsigMh7oDyJ7UKOiPkT93gkUDA="; }; patches = [ ]; }); @@ -2632,6 +2634,8 @@ self: super: with self; { dbt-redshift = callPackage ../development/python-modules/dbt-redshift { }; + dbt-semantic-interfaces = callPackage ../development/python-modules/dbt-semantic-interfaces { }; + dbt-snowflake = callPackage ../development/python-modules/dbt-snowflake { }; dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { }; @@ -3441,6 +3445,8 @@ self: super: with self; { ecdsa = callPackage ../development/python-modules/ecdsa { }; + echo = callPackage ../development/python-modules/echo { }; + ecoaliface = callPackage ../development/python-modules/ecoaliface { }; ecos = callPackage ../development/python-modules/ecos { }; @@ -3657,6 +3663,8 @@ self: super: with self; { et-xmlfile = callPackage ../development/python-modules/et-xmlfile { }; + euclid3 = callPackage ../development/python-modules/euclid3 { }; + eufylife-ble-client = callPackage ../development/python-modules/eufylife-ble-client { }; evaluate = callPackage ../development/python-modules/evaluate { }; @@ -3801,6 +3809,8 @@ self: super: with self; { fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; + fast-histogram = callPackage ../development/python-modules/fast-histogram { }; + fastavro = callPackage ../development/python-modules/fastavro { }; fastbencode = callPackage ../development/python-modules/fastbencode { }; @@ -4506,6 +4516,8 @@ self: super: with self; { glom = callPackage ../development/python-modules/glom { }; + glueviz = callPackage ../development/python-modules/glueviz { }; + glymur = callPackage ../development/python-modules/glymur { }; gmpy2 = callPackage ../development/python-modules/gmpy2 { }; @@ -5148,6 +5160,8 @@ self: super: with self; { httpx = callPackage ../development/python-modules/httpx { }; + httpx-auth = callPackage ../development/python-modules/httpx-auth { }; + httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { }; httpx-socks = callPackage ../development/python-modules/httpx-socks { }; @@ -5322,6 +5336,8 @@ self: super: with self; { imgsize = callPackage ../development/python-modules/imgsize { }; + imgtool = callPackage ../development/python-modules/imgtool { }; + iminuit = callPackage ../development/python-modules/iminuit { }; immutabledict = callPackage ../development/python-modules/immutabledict { }; @@ -6138,13 +6154,15 @@ self: super: with self; { }; libarcus = callPackage ../development/python-modules/libarcus { - protobuf = pkgs.protobuf3_21; + protobuf = pkgs.protobuf_21; }; libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; + libclang = callPackage ../development/python-modules/libclang { }; + libcloud = callPackage ../development/python-modules/libcloud { }; libcst = callPackage ../development/python-modules/libcst { }; @@ -6350,6 +6368,8 @@ self: super: with self; { linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; + linknlink = callPackage ../development/python-modules/linknlink { }; + linode-api = callPackage ../development/python-modules/linode-api { }; linode = callPackage ../development/python-modules/linode { }; @@ -6386,6 +6406,8 @@ self: super: with self; { inherit (pkgs) fuse; }; + llm = callPackage ../development/python-modules/llm { }; + llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. llvm = pkgs.llvm_14; @@ -6707,6 +6729,8 @@ self: super: with self; { mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + mdtraj = callPackage ../development/python-modules/mdtraj { }; + mdurl = callPackage ../development/python-modules/mdurl { }; mdutils = callPackage ../development/python-modules/mdutils { }; @@ -6879,6 +6903,8 @@ self: super: with self; { mitmproxy = callPackage ../development/python-modules/mitmproxy { }; + mitmproxy-macos = callPackage ../development/python-modules/mitmproxy-macos { }; + mitmproxy-rs = callPackage ../development/python-modules/mitmproxy-rs { }; mitmproxy-wireguard = callPackage ../development/python-modules/mitmproxy-wireguard { }; @@ -6955,7 +6981,9 @@ self: super: with self; { mobly = callPackage ../development/python-modules/mobly { }; - mocket = callPackage ../development/python-modules/mocket { }; + mocket = callPackage ../development/python-modules/mocket { + redis-server = pkgs.redis; + }; mock = callPackage ../development/python-modules/mock { }; @@ -7062,6 +7090,8 @@ self: super: with self; { mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + mpl-scatter-density = callPackage ../development/python-modules/mpl-scatter-density { }; + mpmath = callPackage ../development/python-modules/mpmath { }; mpris-server = callPackage ../development/python-modules/mpris-server { }; @@ -8405,12 +8435,7 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { - # in linux c++ defaults to 17 - # on darwin clang is on an old version so c++ defaults to 11 - abseil-cpp = if stdenv.isLinux then - pkgs.abseil-cpp_202301 - else - pkgs.abseil-cpp_202301.override { cxxStandard = "14"; }; + abseil-cpp = pkgs.abseil-cpp_202301; }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { @@ -8453,10 +8478,7 @@ self: super: with self; { openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { }; - openai-whisper = callPackage ../development/python-modules/openai-whisper { - inherit (pkgs.config) cudaSupport; - openai-triton = self.openai-triton-cuda; - }; + openai-whisper = callPackage ../development/python-modules/openai-whisper { }; openant = callPackage ../development/python-modules/openant { }; @@ -8843,6 +8865,8 @@ self: super: with self; { inherit (pkgs) libpcap; # Avoid confusion with python package of the same name }; + pcbnew-transition = callPackage ../development/python-modules/pcbnew-transition { }; + pcodedmp = callPackage ../development/python-modules/pcodedmp { }; pcpp = callPackage ../development/python-modules/pcpp { }; @@ -9009,6 +9033,10 @@ self: super: with self; { psrpcore = callPackage ../development/python-modules/psrpcore { }; + pybars3 = callPackage ../development/python-modules/pybars3 { }; + + pymeta3 = callPackage ../development/python-modules/pymeta3 { }; + pypemicro = callPackage ../development/python-modules/pypemicro { }; pyprecice = callPackage ../development/python-modules/pyprecice { }; @@ -9112,6 +9140,8 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pixel-ring = callPackage ../development/python-modules/pixel-ring { }; + pjsua2 = (toPythonModule (pkgs.pjsip.override { pythonSupport = true; python3 = self.python; @@ -9264,6 +9294,8 @@ self: super: with self; { pysubs2 = callPackage ../development/python-modules/pysubs2 { }; + pysuez = callPackage ../development/python-modules/pysuez { }; + pysqlitecipher = callPackage ../development/python-modules/pysqlitecipher { }; pysyncthru = callPackage ../development/python-modules/pysyncthru { }; @@ -9580,11 +9612,11 @@ self: super: with self; { # Protobuf 4.x protobuf = callPackage ../development/python-modules/protobuf { # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - inherit (pkgs) protobuf; + protobuf = pkgs.protobuf; }; # Protobuf 3.x - protobuf3 = callPackage ../development/python-modules/protobuf { + protobuf3 = callPackage ../development/python-modules/protobuf/3.nix { protobuf = pkgs.protobuf3_20; }; @@ -9613,6 +9645,7 @@ self: super: with self; { psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -9678,6 +9711,8 @@ self: super: with self; { pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + pvextractor = callPackage ../development/python-modules/pvextractor { }; + pvlib = callPackage ../development/python-modules/pvlib { }; pvo = callPackage ../development/python-modules/pvo { }; @@ -9942,6 +9977,18 @@ self: super: with self; { pycxx = callPackage ../development/python-modules/pycxx { }; + pycyphal = callPackage ../development/python-modules/pycyphal { + # Does not yet support nunavut 2+, use latest 1.X version instead + # https://github.com/OpenCyphal/pycyphal/issues/277 + nunavut = self.nunavut.overridePythonAttrs (prev: rec { + version = "1.9.0"; + src = prev.src.override { + inherit version; + hash = "sha256-KhgijXJ908uxM7VZdXo1WU/RGU0cfqctBCbpF2wOcy8="; + }; + }); + }; + pydaikin = callPackage ../development/python-modules/pydaikin { }; pydal = callPackage ../development/python-modules/pydal { }; @@ -11410,7 +11457,7 @@ self: super: with self; { python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { }; - python_fedora = callPackage ../development/python-modules/python_fedora { }; + python-fedora = callPackage ../development/python-modules/python-fedora { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; @@ -12644,7 +12691,9 @@ self: super: with self; { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { }; + scs = callPackage ../development/python-modules/scs { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate; + }; sdds = callPackage ../development/python-modules/sdds { }; @@ -12811,7 +12860,7 @@ self: super: with self; { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake llvmPackages qt5; + inherit (pkgs) cmake llvmPackages_15 qt5; }); shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 { @@ -13234,7 +13283,7 @@ self: super: with self; { sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; - sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { }; sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { }; @@ -13250,7 +13299,7 @@ self: super: with self; { sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; - sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; + sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; @@ -13730,7 +13779,7 @@ self: super: with self; { tensorflow-build = let compat = rec { - protobufTF = pkgs.protobuf3_21.override { + protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp; }; grpcTF = (pkgs.grpc.overrideAttrs ( @@ -13850,6 +13899,8 @@ self: super: with self; { textual = callPackage ../development/python-modules/textual { }; + textual-dev = callPackage ../development/python-modules/textual-dev { }; + textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; testbook = callPackage ../development/python-modules/testbook { }; @@ -14072,7 +14123,6 @@ self: super: with self; { toposort = callPackage ../development/python-modules/toposort { }; torch = callPackage ../development/python-modules/torch { - inherit (pkgs.config) cudaSupport; magma = if pkgs.config.cudaSupport then pkgs.magma-cuda-static @@ -15303,6 +15353,8 @@ self: super: with self; { uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; + uqbar = callPackage ../development/python-modules/uqbar { }; + uranium = callPackage ../development/python-modules/uranium { }; uritemplate = callPackage ../development/python-modules/uritemplate { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d675c86797dbd..a9e25eb54a8ea 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -10,11 +10,15 @@ , __splicedPackages , makeScopeWithSplicing' , generateSplicesForMkScope +, pkgsHostTarget }: let pkgs = __splicedPackages; - qt5 = __splicedPackages.qt5; + # qt5 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set + # 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase' should not have a `__spliced` but if qt5 is pre-spliced then it will have one. + # pkgsHostTarget == pkgs + qt5 = pkgsHostTarget.qt5; in makeScopeWithSplicing' { @@ -136,7 +140,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; @@ -186,7 +192,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - qca-qt5 = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca-qt5 { + qca-qt5 = callPackage ../development/libraries/qca-qt5 { + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (libsForQt5) qtbase; }; @@ -217,8 +224,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; qtmpris = callPackage ../development/libraries/qtmpris { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4da9f03952af0..39ea843bcea28 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -487,7 +487,7 @@ let cabal-install = lib.subtractLists [ compilerNames.ghc981 ] released; - Cabal_3_10_2_0 = lib.subtractLists [ + Cabal_3_10_2_1 = lib.subtractLists [ compilerNames.ghc981 ] released; Cabal-syntax_3_10_1_0 = lib.subtractLists [ diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 034dccdcd475c..9b5c601415202 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -34,7 +34,6 @@ # and it will be too much painful for our users to recompile them # for no real reason. # Remove them for 23.11. - "nodejs-16.20.2" "openssl-1.1.1w" ]; }; } @@ -143,10 +142,12 @@ let jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-linux jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-linux jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux + jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux @@ -243,6 +244,18 @@ let (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; + # Build selected packages (HLS) for multiple Haskell compilers to rebuild + # the cache after a staging merge + haskell.packages = lib.genAttrs [ + # TODO: share this list between release.nix and release-haskell.nix + "ghc90" + "ghc92" + "ghc94" + "ghc96" + ] (compilerName: { + inherit (packagePlatforms pkgs.haskell.packages.${compilerName}) + haskell-language-server; + }); idrisPackages = packagePlatforms pkgs.idrisPackages; agdaPackages = packagePlatforms pkgs.agdaPackages; |